summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2024-03-30 07:08:58 +0000
committerCoprDistGit <infra@openeuler.org>2024-03-30 07:08:58 +0000
commit9edc0fa8c1f0960c0a0825d6970534c270163b34 (patch)
tree5a73d1312f2520ba3df255170b9d036414f856d3
parentaa5eba76df4a376164457366e941e261aaae2d9c (diff)
automatic import of pytorch
-rw-r--r--0001-add-Wno-error-nonnull-for-test-cpp-api.patch29
-rw-r--r--pytorch.spec14
2 files changed, 39 insertions, 4 deletions
diff --git a/0001-add-Wno-error-nonnull-for-test-cpp-api.patch b/0001-add-Wno-error-nonnull-for-test-cpp-api.patch
new file mode 100644
index 0000000..b498726
--- /dev/null
+++ b/0001-add-Wno-error-nonnull-for-test-cpp-api.patch
@@ -0,0 +1,29 @@
+From 367387bab836c73c23719f97d929572c8b4e0fad Mon Sep 17 00:00:00 2001
+From: Nick Rossenbach <rossenbach@cs.rwth-aachen.de>
+Date: Tue, 18 Apr 2023 23:31:51 +0200
+Subject: [PATCH] Add -Wno-error=nonnull for test/cpp/api/
+
+On some platforms the build might fail due to the nonnull error
+being triggered by different compiler behavior.
+
+Fix for #99278.
+---
+ test/cpp/api/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/test/cpp/api/CMakeLists.txt b/test/cpp/api/CMakeLists.txt
+index 6b801a073182794..181139b01360c30 100644
+--- a/test/cpp/api/CMakeLists.txt
++++ b/test/cpp/api/CMakeLists.txt
+@@ -80,6 +80,11 @@ if(NOT MSVC)
+ target_compile_options_if_supported(test_api "-Wno-maybe-uninitialized")
+ # gcc gives nonsensical warnings about variadic.h
+ target_compile_options_if_supported(test_api "-Wno-unused-but-set-parameter")
++ # the nonnull check might trigger for some build configurations,
++ # probably happening due to different code optimization
++ # (see e.g. https://rkoucha.fr/tech_corner/nonnull_gcc_attribute.html)
++ # this happened for a riscv build: https://github.com/pytorch/pytorch/issues/99278
++ target_compile_options_if_supported(test_api "-Wno-error=nonnull")
+ endif()
+
+ if(INSTALL_TEST)
diff --git a/pytorch.spec b/pytorch.spec
index 7d83659..73c7523 100644
--- a/pytorch.spec
+++ b/pytorch.spec
@@ -1,12 +1,13 @@
%global _empty_manifest_terminate_build 0
Name: pytorch
Version: 2.1.2
-Release: 1
+Release: 2
Summary: Tensors and Dynamic neural networks in Python with strong GPU acceleration
-License: BSD-3
+License: BSD-3-Clause
URL: https://pytorch.org/
Source0: https://github.com/pytorch/pytorch/releases/download/v%{version}/pytorch-v%{version}.tar.gz
+Patch1: 0001-add-Wno-error-nonnull-for-test-cpp-api.patch
BuildRequires: g++
Requires: python3-future
Requires: python3-numpy
@@ -26,7 +27,7 @@ BuildRequires: python3-setuptools_scm
BuildRequires: python3-pbr
BuildRequires: python3-pip
BuildRequires: python3-wheel
-# BuildRequires: python3-hatchling
+BuildRequires: python3-hatchling
BuildRequires: python3-astunparse
BuildRequires: python3-numpy
@@ -54,7 +55,6 @@ You can reuse your favorite Python packages such as NumPy, SciPy and Cython to e
%autosetup -p1 -n %{name}-v%{version}
%build
-pip install hatchling
export CFLAGS+=" -Wno-error=maybe-uninitialized -Wno-error=uninitialized -Wno-error=restrict -fPIC"
export CXXFLAGS+=" -Wno-error=maybe-uninitialized -Wno-error=uninitialized -Wno-error=restrict -fPIC"
%pyproject_build
@@ -86,6 +86,12 @@ mv %{buildroot}/doclist.lst .
%{_docdir}/*
%changelog
+* Thu Jan 11 2024 Dongxing Wang <dongxing.wang_a@thundersoft.com> - 2.1.2-2
+- Patch: Add -Wno-error=nonnull for test/cpp/api/
+
+* Thu Dec 28 2023 Dongxing Wang <dongxing.wang_a@thundersoft.com> - 2.1.2-1
+- upgrade to 2.1.2
+
* Thu Aug 17 2023 Dongxing Wang <dxwangk@isoftstone.com> - 2.0.1-2
- Fix the EulerMaker failure for verion 2.0.1