From 941250296fde3d391af3064dfa16dbfb31abf114 Mon Sep 17 00:00:00 2001 From: zhangzikang1992 Date: Wed, 22 May 2024 09:17:54 +0800 Subject: [PATCH] Fix build error for loongarch64 (cherry picked from commit 2911910129781a74b34b46cdf14ee5f97afe67b0) --- ...-loongarch64-support-for-third_party.patch | 81 +++++++++++++++++++ pytorch.spec | 9 ++- 2 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 0003-Add-loongarch64-support-for-third_party.patch diff --git a/0003-Add-loongarch64-support-for-third_party.patch b/0003-Add-loongarch64-support-for-third_party.patch new file mode 100644 index 0000000..1194431 --- /dev/null +++ b/0003-Add-loongarch64-support-for-third_party.patch @@ -0,0 +1,81 @@ +From cba0eb7a9a7504847f48366c2efc901d3f3652ec Mon Sep 17 00:00:00 2001 +From: zhangzikang +Date: Tue, 21 May 2024 15:28:14 +0800 +Subject: [PATCH] Add loongarch64 support for third_party + +--- + third_party/benchmark/src/cycleclock.h | 2 +- + .../third_party/onnx/third_party/benchmark/src/cycleclock.h | 2 +- + third_party/onnx/third_party/benchmark/src/cycleclock.h | 2 +- + third_party/protobuf/third_party/benchmark/src/cycleclock.h | 2 +- + third_party/sleef/src/arch/helperpurec_scalar.h | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/third_party/benchmark/src/cycleclock.h b/third_party/benchmark/src/cycleclock.h +index d65d32a3..4efaf582 100644 +--- a/third_party/benchmark/src/cycleclock.h ++++ b/third_party/benchmark/src/cycleclock.h +@@ -208,7 +208,7 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() { + asm volatile("rdcycle %0" : "=r"(cycles)); + return cycles; + #endif +-#elif defined(__e2k__) || defined(__elbrus__) ++#elif defined(__e2k__) || defined(__elbrus__) || defined(__loongarch64) + struct timeval tv; + gettimeofday(&tv, nullptr); + return static_cast(tv.tv_sec) * 1000000 + tv.tv_usec; +diff --git a/third_party/onnx-tensorrt/third_party/onnx/third_party/benchmark/src/cycleclock.h b/third_party/onnx-tensorrt/third_party/onnx/third_party/benchmark/src/cycleclock.h +index 3b376ac5..b0a3c0cb 100644 +--- a/third_party/onnx-tensorrt/third_party/onnx/third_party/benchmark/src/cycleclock.h ++++ b/third_party/onnx-tensorrt/third_party/onnx/third_party/benchmark/src/cycleclock.h +@@ -153,7 +153,7 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() { + struct timeval tv; + gettimeofday(&tv, nullptr); + return static_cast(tv.tv_sec) * 1000000 + tv.tv_usec; +-#elif defined(__mips__) ++#elif defined(__mips__) || defined(__loongarch64) + // mips apparently only allows rdtsc for superusers, so we fall + // back to gettimeofday. It's possible clock_gettime would be better. + struct timeval tv; +diff --git a/third_party/onnx/third_party/benchmark/src/cycleclock.h b/third_party/onnx/third_party/benchmark/src/cycleclock.h +index d65d32a3..4efaf582 100644 +--- a/third_party/onnx/third_party/benchmark/src/cycleclock.h ++++ b/third_party/onnx/third_party/benchmark/src/cycleclock.h +@@ -208,7 +208,7 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() { + asm volatile("rdcycle %0" : "=r"(cycles)); + return cycles; + #endif +-#elif defined(__e2k__) || defined(__elbrus__) ++#elif defined(__e2k__) || defined(__elbrus__) || defined(__loongarch64) + struct timeval tv; + gettimeofday(&tv, nullptr); + return static_cast(tv.tv_sec) * 1000000 + tv.tv_usec; +diff --git a/third_party/protobuf/third_party/benchmark/src/cycleclock.h b/third_party/protobuf/third_party/benchmark/src/cycleclock.h +index 4251fe4c..694e03dc 100644 +--- a/third_party/protobuf/third_party/benchmark/src/cycleclock.h ++++ b/third_party/protobuf/third_party/benchmark/src/cycleclock.h +@@ -153,7 +153,7 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() { + struct timeval tv; + gettimeofday(&tv, nullptr); + return static_cast(tv.tv_sec) * 1000000 + tv.tv_usec; +-#elif defined(__mips__) ++#elif defined(__mips__) || defined(__loongarch64) + // mips apparently only allows rdtsc for superusers, so we fall + // back to gettimeofday. It's possible clock_gettime would be better. + struct timeval tv; +diff --git a/third_party/sleef/src/arch/helperpurec_scalar.h b/third_party/sleef/src/arch/helperpurec_scalar.h +index e77e518f..a8c96e3b 100644 +--- a/third_party/sleef/src/arch/helperpurec_scalar.h ++++ b/third_party/sleef/src/arch/helperpurec_scalar.h +@@ -54,7 +54,7 @@ + #define ENABLE_FMA_SP + //@#define ENABLE_FMA_SP + +-#if defined(__AVX2__) || defined(__aarch64__) || defined(__arm__) || defined(__powerpc64__) || defined(__zarch__) || CONFIG == 3 ++#if defined(__AVX2__) || defined(__aarch64__) || defined(__arm__) || defined(__powerpc64__) || defined(__zarch__) || defined(__loongarch64) || CONFIG == 3 + #ifndef FP_FAST_FMA + #define FP_FAST_FMA + //@#define FP_FAST_FMA +-- +2.33.0 + diff --git a/pytorch.spec b/pytorch.spec index 949061c..f482014 100644 --- a/pytorch.spec +++ b/pytorch.spec @@ -1,7 +1,7 @@ %global _empty_manifest_terminate_build 0 Name: pytorch Version: 2.1.2 -Release: 3 +Release: 4 Summary: Tensors and Dynamic neural networks in Python with strong GPU acceleration License: BSD-3-Clause URL: https://pytorch.org/ @@ -9,6 +9,10 @@ Source0: https://github.com/pytorch/pytorch/releases/download/v%{version}/pytorc Patch1: 0001-add-Wno-error-nonnull-for-test-cpp-api.patch Patch2: 0001-Fix-for-PyTorch-mobile-flatbuffer-loader-out-of-bounds-reads.patch +%ifarch loongarch64 +Patch3: 0003-Add-loongarch64-support-for-third_party.patch +%endif + BuildRequires: g++ Requires: python3-future Requires: python3-numpy @@ -87,6 +91,9 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Wed May 22 2024 zhangzikang - 2.1.2-4 +- Fix build error for loongarch64 + * Mon Apr 22 2024 wangxiaomeng - 2.1.2-3 - Fix CVE-2024-31584 -- Gitee