From: Parichay Kapoor Date: Thu, 16 Jul 2020 09:01:46 +0000 (+0900) Subject: [Dist/Tizen/Debian] Update packaging with version update X-Git-Tag: accepted/tizen/6.5/unified/20211028.231830~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1438ea1df3d2db99907a1049c0603e888c5d83ce;p=platform%2Fupstream%2Fpytorch.git [Dist/Tizen/Debian] Update packaging with version update Updated packaging based on update in version of the pytorch to 1.6.0-rc1 Change-Id: I1efdc90ce07cb647a0a7d91ab112b44e222d33c5 Signed-off-by: Parichay Kapoor --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 140a192..b706780 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -327,7 +327,7 @@ if(MSVC) endif() endforeach(flag_var) - foreach(flag_var + foreach(flag_var CMAKE_C_FLAGS CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL) if(${flag_var} MATCHES "/Z[iI7]") diff --git a/caffe2.pc b/caffe2.pc index eb3f1e5..f248676 100644 --- a/caffe2.pc +++ b/caffe2.pc @@ -6,6 +6,6 @@ sharedlibdir=${prefix}/share Name: caffe2 Description: caffe2 static library -Version: 1.1.0 -Libs: -L${libdir} -L${sharedlibdir} -lc10 -lcaffe2 -ltorch +Version: 1.6.0-rc1 +Libs: -L${libdir} -L${sharedlibdir} -lc10 -ltorch -ltorch_cpu Cflags: -I${includedir}/torch diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 3bcb5ca..daef6bb 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -46,7 +46,7 @@ endif() # 3. If MSVC_Z7_OVERRIDE is ON, then /Zi and /ZI will be replaced with /Z7 # for Debug and RelWithDebInfo builds if(MSVC) - foreach(flag_var + foreach(flag_var CMAKE_C_FLAGS CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL) if(${flag_var} MATCHES "/Z[iI7]") @@ -868,9 +868,9 @@ if(BUILD_PYTHON) # These should fill in the rest of the variables, like versions, but resepct # the variables we set above - set(Python_ADDITIONAL_VERSIONS ${PYTHON_VERSION} 3.8 3.7 3.6 3.5) - find_package(PythonInterp 3.0) - find_package(PythonLibs 3.0) + set(Python_ADDITIONAL_VERSIONS ${PYTHON_VERSION} 3.8 3.7 3.6) + find_package(PythonInterp 3.6 REQUIRED) + find_package(PythonLibs 3.6) if(${PYTHONLIBS_VERSION_STRING} VERSION_LESS 3) message(FATAL_ERROR diff --git a/debian/changelog b/debian/changelog index 2d5d242..15eb626 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pytorch (1.6.0-rc1) xenial; urgency=medium + + * Version update + + -- Parichay Kapoor Tue, 14 Jul 2020 19:40:34 +0900 + pytorch (1.3.1) xenial; urgency=medium * Version updates (version number was incorrectly written previously). diff --git a/debian/control b/debian/control index 88f1d26..71e6431 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: pytorch Section: devel Homepage: https://pytorch.org/ Priority: optional -Standards-Version: 1.1.0 +Standards-Version: 1.6.0-rc1 Maintainer: Parichay Kapoor Build-Depends: cmake, @@ -11,8 +11,6 @@ Build-Depends: git, libasio-dev, libblas-dev | libblas.so, - python, - python-yaml, python3-all, python3-all-dev, python3-cffi, @@ -24,7 +22,7 @@ Package: pytorch Architecture: any Multi-Arch: foreign Depends: - python3 (>= 3.5), + python3 (>= 3.6), python3-cffi, python3-numpy, ${misc:Depends}, diff --git a/debian/rules b/debian/rules index 190e84e..502c8bb 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,22 @@ #!/usr/bin/make -f export PYBUILD_NAME=pytorch export PYBUILD_DISABLE_python2=1 # No more Python2 Packages -export USE_FBGEMM=0 -export BUILD_TEST=0 -export BUILD_BINARY=1 -export NO_CUDA=1 export PYBUILD_DISABLE=test + export DEB_BUILD_OPTIONS+=nocheck export DEB_BUILD_OPTIONS+=noddebs +export USE_FBGEMM=0 +export USE_CUDA=0 +export USE_CUDNN=0 +export USE_NUMPY=0 +export USE_NCCL=0 +export BUILD_DOCS=0 +export BUILD_TEST=0 +# Enable necessary items +export BUILD_CAFFE2_OPS=1 +export BUILD_BINARY=1 + name = ${PYBUILD_NAME} topdir = $(shell pwd) buildroot = ${topdir}/debian/tmp @@ -44,7 +52,12 @@ THP24=gemmlowp.tar.gz THP25=QNNPACK.tar.gz THP26=neon2sse.tar.gz THP27=fbgemm.tar.gz -THP28=foxi.tar.gz +THP28=fmt.tar.gz +THP29=miniz-2.0.8.tar.gz +THP30=tbb.tar.gz +THP31=tensorpipe.tar.gz +THP32=XNNPACK.tar.gz +THP33=foxi.tar.gz %: dh $@ --with python3 --buildsystem=pybuild @@ -93,5 +106,10 @@ override_dh_auto_configure: tar -xf ${packagingdir}/${THP26} -C ${topdir}/third_party/ tar -xf ${packagingdir}/${THP27} -C ${topdir}/third_party/ tar -xf ${packagingdir}/${THP28} -C ${topdir}/third_party/ + tar -xf ${packagingdir}/${THP29} -C ${topdir}/third_party/ + tar -xf ${packagingdir}/${THP30} -C ${topdir}/third_party/ + tar -xf ${packagingdir}/${THP31} -C ${topdir}/third_party/ + tar -xf ${packagingdir}/${THP32} -C ${topdir}/third_party/ + tar -xf ${packagingdir}/${THP33} -C ${topdir}/third_party/ dh_testdir dh_auto_configure diff --git a/packaging/FP16.tar.gz b/packaging/FP16.tar.gz index f7e101f..448a93b 100644 Binary files a/packaging/FP16.tar.gz and b/packaging/FP16.tar.gz differ diff --git a/packaging/FXdiv.tar.gz b/packaging/FXdiv.tar.gz index e3f4615..9d8c9ee 100644 Binary files a/packaging/FXdiv.tar.gz and b/packaging/FXdiv.tar.gz differ diff --git a/packaging/NNPACK.tar.gz b/packaging/NNPACK.tar.gz index b50c0f0..f53e289 100644 Binary files a/packaging/NNPACK.tar.gz and b/packaging/NNPACK.tar.gz differ diff --git a/packaging/QNNPACK.tar.gz b/packaging/QNNPACK.tar.gz index 84e39ff..d394b43 100644 Binary files a/packaging/QNNPACK.tar.gz and b/packaging/QNNPACK.tar.gz differ diff --git a/packaging/XNNPACK.tar.gz b/packaging/XNNPACK.tar.gz new file mode 100644 index 0000000..8d83755 Binary files /dev/null and b/packaging/XNNPACK.tar.gz differ diff --git a/packaging/benchmark.tar.gz b/packaging/benchmark.tar.gz index e2d8d75..f9b60c6 100644 Binary files a/packaging/benchmark.tar.gz and b/packaging/benchmark.tar.gz differ diff --git a/packaging/cpuinfo.tar.gz b/packaging/cpuinfo.tar.gz index 280176c..18d4571 100644 Binary files a/packaging/cpuinfo.tar.gz and b/packaging/cpuinfo.tar.gz differ diff --git a/packaging/cub.tar.gz b/packaging/cub.tar.gz index 776e4c7..39a6325 100644 Binary files a/packaging/cub.tar.gz and b/packaging/cub.tar.gz differ diff --git a/packaging/eigen.tar.gz b/packaging/eigen.tar.gz index 84702f6..5b37554 100644 Binary files a/packaging/eigen.tar.gz and b/packaging/eigen.tar.gz differ diff --git a/packaging/fbgemm.tar.gz b/packaging/fbgemm.tar.gz index cf905f0..43e1369 100644 Binary files a/packaging/fbgemm.tar.gz and b/packaging/fbgemm.tar.gz differ diff --git a/packaging/fmt.tar.gz b/packaging/fmt.tar.gz new file mode 100644 index 0000000..3448d43 Binary files /dev/null and b/packaging/fmt.tar.gz differ diff --git a/packaging/foxi.tar.gz b/packaging/foxi.tar.gz index f0d2be0..24b88a5 100644 Binary files a/packaging/foxi.tar.gz and b/packaging/foxi.tar.gz differ diff --git a/packaging/gemmlowp.tar.gz b/packaging/gemmlowp.tar.gz index a1d04ae..eedd9c5 100644 Binary files a/packaging/gemmlowp.tar.gz and b/packaging/gemmlowp.tar.gz differ diff --git a/packaging/gloo.tar.gz b/packaging/gloo.tar.gz index 88be77e..ce94245 100644 Binary files a/packaging/gloo.tar.gz and b/packaging/gloo.tar.gz differ diff --git a/packaging/googletest.tar.gz b/packaging/googletest.tar.gz index 9c8ed7b..0a2b40b 100644 Binary files a/packaging/googletest.tar.gz and b/packaging/googletest.tar.gz differ diff --git a/packaging/ideep.tar.gz b/packaging/ideep.tar.gz index 69dce69..a0026e7 100644 Binary files a/packaging/ideep.tar.gz and b/packaging/ideep.tar.gz differ diff --git a/packaging/ios-cmake.tar.gz b/packaging/ios-cmake.tar.gz index 23cb1b2..b07e5a0 100644 Binary files a/packaging/ios-cmake.tar.gz and b/packaging/ios-cmake.tar.gz differ diff --git a/packaging/miniz-2.0.8.tar.gz b/packaging/miniz-2.0.8.tar.gz new file mode 100644 index 0000000..0f7d654 Binary files /dev/null and b/packaging/miniz-2.0.8.tar.gz differ diff --git a/packaging/nccl.tar.gz b/packaging/nccl.tar.gz index 476aa7b..50d3c61 100644 Binary files a/packaging/nccl.tar.gz and b/packaging/nccl.tar.gz differ diff --git a/packaging/neon2sse.tar.gz b/packaging/neon2sse.tar.gz index 94e3b0a..df2f162 100644 Binary files a/packaging/neon2sse.tar.gz and b/packaging/neon2sse.tar.gz differ diff --git a/packaging/onnx-tensorrt.tar.gz b/packaging/onnx-tensorrt.tar.gz index f017920..758d5c6 100644 Binary files a/packaging/onnx-tensorrt.tar.gz and b/packaging/onnx-tensorrt.tar.gz differ diff --git a/packaging/onnx.tar.gz b/packaging/onnx.tar.gz index eb0117c..bc56dfb 100644 Binary files a/packaging/onnx.tar.gz and b/packaging/onnx.tar.gz differ diff --git a/packaging/protobuf.tar.gz b/packaging/protobuf.tar.gz index 8d7b855..23cce8a 100644 Binary files a/packaging/protobuf.tar.gz and b/packaging/protobuf.tar.gz differ diff --git a/packaging/psimd.tar.gz b/packaging/psimd.tar.gz index 90dd844..0f59cd5 100644 Binary files a/packaging/psimd.tar.gz and b/packaging/psimd.tar.gz differ diff --git a/packaging/pthreadpool.tar.gz b/packaging/pthreadpool.tar.gz index e78bf7b..1cf6f93 100644 Binary files a/packaging/pthreadpool.tar.gz and b/packaging/pthreadpool.tar.gz differ diff --git a/packaging/pybind11.tar.gz b/packaging/pybind11.tar.gz index 2ebdf47..1103d7b 100644 Binary files a/packaging/pybind11.tar.gz and b/packaging/pybind11.tar.gz differ diff --git a/packaging/python-enum.tar.gz b/packaging/python-enum.tar.gz index 39976aa..1fc14f7 100644 Binary files a/packaging/python-enum.tar.gz and b/packaging/python-enum.tar.gz differ diff --git a/packaging/python-peachpy.tar.gz b/packaging/python-peachpy.tar.gz index bcbc84a..95069b5 100644 Binary files a/packaging/python-peachpy.tar.gz and b/packaging/python-peachpy.tar.gz differ diff --git a/packaging/python-six.tar.gz b/packaging/python-six.tar.gz index 3518adc..96064b8 100644 Binary files a/packaging/python-six.tar.gz and b/packaging/python-six.tar.gz differ diff --git a/packaging/pytorch.spec b/packaging/pytorch.spec index 635fe4e..43134af 100644 --- a/packaging/pytorch.spec +++ b/packaging/pytorch.spec @@ -1,6 +1,6 @@ Name: pytorch Summary: PyTorch -Version: 1.3.1 +Version: 1.6.0_rc1 Release: 0 License: BSD-3-Clause and Apache-2.0 Provides: caffe2 = %{version}-%{release} @@ -35,15 +35,18 @@ Source10024: gemmlowp.tar.gz Source10025: QNNPACK.tar.gz Source10026: neon2sse.tar.gz Source10027: fbgemm.tar.gz -Source10028: foxi.tar.gz - +Source10028: fmt.tar.gz +Source10029: miniz-2.0.8.tar.gz +Source10030: tbb.tar.gz +Source10031: tensorpipe.tar.gz +Source10032: XNNPACK.tar.gz +Source10033: foxi.tar.gz BuildRequires: cmake BuildRequires: openblas-devel BuildRequires: python3 BuildRequires: python3-PyYAML BuildRequires: protobuf-devel -BuildRequires: python3-PyYAML BuildRequires: libyaml-devel # Appears to support 64bit only @@ -88,19 +91,20 @@ tar -xf %SOURCE10025 -C third_party/ tar -xf %SOURCE10026 -C third_party/ tar -xf %SOURCE10027 -C third_party/ tar -xf %SOURCE10028 -C third_party/ - +tar -xf %SOURCE10029 -C third_party/ +tar -xf %SOURCE10030 -C third_party/ +tar -xf %SOURCE10031 -C third_party/ +tar -xf %SOURCE10032 -C third_party/ +tar -xf %SOURCE10033 -C third_party/ %build -export USE_CUDA=0 -export NO_CUDA=1 -export USE_FBGEMM=0 export PYTHON_EXECUTABLE=/usr/bin/python3 mkdir -p build pushd build alias python=python3 -%cmake .. -DATEN_NO_TEST=ON -DBUILD_BINARY=ON -DBUILD_CUSTOM_PROTOBUF=OFF -DBUILD_PYTHON=OFF -DUSE_CUDA=OFF -DUSE_MPI=OFF -DUSE_NCCL=OFF -DUSE_METAL=OFF -DUSE_NUMA=OFF -DPYTHON_EXECUTABLE=/usr/bin/python3 +%cmake .. -DATEN_NO_TEST=ON -DBUILD_BINARY=ON -DBUILD_CUSTOM_PROTOBUF=OFF -DBUILD_PYTHON=OFF -DUSE_CUDA=OFF -DUSE_MPI=OFF -DUSE_NCCL=OFF -DUSE_METAL=OFF -DUSE_NUMA=OFF -DPYTHON_EXECUTABLE=/usr/bin/python3 -DUSE_NUMPY=OFF -DUSE_MKLDNN=OFF -DUSE_FBGEMM=OFF -DUSE_DISTRIBUTED=OFF make %{?_smp_mflags} popd @@ -121,11 +125,6 @@ mkdir -p %{buildroot}%{_libdir}/pkgconfig install -m0644 -p caffe2.pc %{buildroot}%{_libdir}/pkgconfig/ install -m0644 -p pytorch.pc %{buildroot}%{_libdir}/pkgconfig/ -## CMAKE script of pytorch installs headers incorrectly -pushd %{buildroot} -mv torch %{buildroot}%{_includedir} -popd - %post -p %{_sbindir}/ldconfig %postun -p %{_sbindir}/ldconfig diff --git a/packaging/sleef.tar.gz b/packaging/sleef.tar.gz index b4eaae8..2dde091 100644 Binary files a/packaging/sleef.tar.gz and b/packaging/sleef.tar.gz differ diff --git a/packaging/tbb.tar.gz b/packaging/tbb.tar.gz new file mode 100644 index 0000000..1e9e01a Binary files /dev/null and b/packaging/tbb.tar.gz differ diff --git a/packaging/tensorpipe.tar.gz b/packaging/tensorpipe.tar.gz new file mode 100644 index 0000000..1640d3e Binary files /dev/null and b/packaging/tensorpipe.tar.gz differ diff --git a/packaging/zstd.tar.gz b/packaging/zstd.tar.gz index ee2c1a3..009df26 100644 Binary files a/packaging/zstd.tar.gz and b/packaging/zstd.tar.gz differ diff --git a/pytorch.pc b/pytorch.pc index 66a9399..8f0eb46 100644 --- a/pytorch.pc +++ b/pytorch.pc @@ -6,6 +6,6 @@ sharedlibdir=${prefix}/share Name: pytorch Description: pytorch static library -Version: 1.1.0 -Libs: -L${libdir} -L${sharedlibdir} -lc10 -lcaffe2 -ltorch +Version: 1.6.0-rc1 +Libs: -L${libdir} -L${sharedlibdir} -lc10 -ltorch -ltorch_cpu Cflags: -I${includedir}/torch