diff options
| author | Parichay Kapoor <pk.kapoor@samsung.com> | 2020-07-16 18:01:46 +0900 |
|---|---|---|
| committer | Parichay Kapoor <pk.kapoor@samsung.com> | 2020-07-16 18:20:21 +0900 |
| commit | 1438ea1df3d2db99907a1049c0603e888c5d83ce (patch) | |
| tree | fd6a1c5683c7e2046e00d28c16704f9badf0f0e9 | |
| parent | 7947241e6ade1f58f64e0f380551afecf423e1ff (diff) | |
| download | pytorch-1438ea1df3d2db99907a1049c0603e888c5d83ce.tar.gz pytorch-1438ea1df3d2db99907a1049c0603e888c5d83ce.tar.bz2 pytorch-1438ea1df3d2db99907a1049c0603e888c5d83ce.zip | |
[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 <pk.kapoor@samsung.com>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | caffe2.pc | 4 | ||||
| -rw-r--r-- | cmake/Dependencies.cmake | 8 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rwxr-xr-x | debian/rules | 28 | ||||
| -rw-r--r-- | packaging/FP16.tar.gz | bin | 69676 -> 69452 bytes | |||
| -rw-r--r-- | packaging/FXdiv.tar.gz | bin | 8681 -> 8459 bytes | |||
| -rw-r--r-- | packaging/NNPACK.tar.gz | bin | 226531 -> 226319 bytes | |||
| -rw-r--r-- | packaging/QNNPACK.tar.gz | bin | 208122 -> 214570 bytes | |||
| -rw-r--r-- | packaging/XNNPACK.tar.gz | bin | 0 -> 1770691 bytes | |||
| -rw-r--r-- | packaging/benchmark.tar.gz | bin | 132847 -> 132288 bytes | |||
| -rw-r--r-- | packaging/cpuinfo.tar.gz | bin | 3461649 -> 3464399 bytes | |||
| -rw-r--r-- | packaging/cub.tar.gz | bin | 396379 -> 396349 bytes | |||
| -rw-r--r-- | packaging/eigen.tar.gz | bin | 2495694 -> 2518643 bytes | |||
| -rw-r--r-- | packaging/fbgemm.tar.gz | bin | 139485 -> 5274508 bytes | |||
| -rw-r--r-- | packaging/fmt.tar.gz | bin | 0 -> 735038 bytes | |||
| -rw-r--r-- | packaging/foxi.tar.gz | bin | 28409 -> 29685 bytes | |||
| -rw-r--r-- | packaging/gemmlowp.tar.gz | bin | 834533 -> 834763 bytes | |||
| -rw-r--r-- | packaging/gloo.tar.gz | bin | 328867 -> 226121 bytes | |||
| -rw-r--r-- | packaging/googletest.tar.gz | bin | 1002239 -> 1001876 bytes | |||
| -rw-r--r-- | packaging/ideep.tar.gz | bin | 4552766 -> 5654790 bytes | |||
| -rw-r--r-- | packaging/ios-cmake.tar.gz | bin | 14736 -> 14668 bytes | |||
| -rw-r--r-- | packaging/miniz-2.0.8.tar.gz | bin | 0 -> 89635 bytes | |||
| -rw-r--r-- | packaging/nccl.tar.gz | bin | 105698 -> 109612 bytes | |||
| -rw-r--r-- | packaging/neon2sse.tar.gz | bin | 101513 -> 101338 bytes | |||
| -rw-r--r-- | packaging/onnx-tensorrt.tar.gz | bin | 3375594 -> 3375201 bytes | |||
| -rw-r--r-- | packaging/onnx.tar.gz | bin | 3306001 -> 5965945 bytes | |||
| -rw-r--r-- | packaging/protobuf.tar.gz | bin | 5624721 -> 70526126 bytes | |||
| -rw-r--r-- | packaging/psimd.tar.gz | bin | 6248 -> 6647 bytes | |||
| -rw-r--r-- | packaging/pthreadpool.tar.gz | bin | 12950 -> 21030 bytes | |||
| -rw-r--r-- | packaging/pybind11.tar.gz | bin | 594240 -> 593832 bytes | |||
| -rw-r--r-- | packaging/python-enum.tar.gz | bin | 41195 -> 40968 bytes | |||
| -rw-r--r-- | packaging/python-peachpy.tar.gz | bin | 418891 -> 401881 bytes | |||
| -rw-r--r-- | packaging/python-six.tar.gz | bin | 32489 -> 32307 bytes | |||
| -rw-r--r-- | packaging/pytorch.spec | 27 | ||||
| -rw-r--r-- | packaging/sleef.tar.gz | bin | 687764 -> 1192167 bytes | |||
| -rw-r--r-- | packaging/tbb.tar.gz | bin | 0 -> 3044621 bytes | |||
| -rw-r--r-- | packaging/tensorpipe.tar.gz | bin | 0 -> 1990028 bytes | |||
| -rw-r--r-- | packaging/zstd.tar.gz | bin | 1866446 -> 1866241 bytes | |||
| -rw-r--r-- | pytorch.pc | 4 |
41 files changed, 53 insertions, 32 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 140a192339..b706780d57 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]") @@ -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 3bcb5cae68..daef6bbc66 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 2d5d24203b..15eb626556 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pytorch (1.6.0-rc1) xenial; urgency=medium + + * Version update + + -- Parichay Kapoor <pk.kapoor@samsung.com> 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 88f1d26416..71e6431feb 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 <pk.kapoor@samsung.com> 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 190e84e8cc..502c8bb856 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 Binary files differindex f7e101f074..448a93b496 100644 --- a/packaging/FP16.tar.gz +++ b/packaging/FP16.tar.gz diff --git a/packaging/FXdiv.tar.gz b/packaging/FXdiv.tar.gz Binary files differindex e3f4615a7d..9d8c9ee64e 100644 --- a/packaging/FXdiv.tar.gz +++ b/packaging/FXdiv.tar.gz diff --git a/packaging/NNPACK.tar.gz b/packaging/NNPACK.tar.gz Binary files differindex b50c0f0d05..f53e289f51 100644 --- a/packaging/NNPACK.tar.gz +++ b/packaging/NNPACK.tar.gz diff --git a/packaging/QNNPACK.tar.gz b/packaging/QNNPACK.tar.gz Binary files differindex 84e39ff8d0..d394b4309d 100644 --- a/packaging/QNNPACK.tar.gz +++ b/packaging/QNNPACK.tar.gz diff --git a/packaging/XNNPACK.tar.gz b/packaging/XNNPACK.tar.gz Binary files differnew file mode 100644 index 0000000000..8d83755e1f --- /dev/null +++ b/packaging/XNNPACK.tar.gz diff --git a/packaging/benchmark.tar.gz b/packaging/benchmark.tar.gz Binary files differindex e2d8d7538b..f9b60c645a 100644 --- a/packaging/benchmark.tar.gz +++ b/packaging/benchmark.tar.gz diff --git a/packaging/cpuinfo.tar.gz b/packaging/cpuinfo.tar.gz Binary files differindex 280176c80a..18d45711a4 100644 --- a/packaging/cpuinfo.tar.gz +++ b/packaging/cpuinfo.tar.gz diff --git a/packaging/cub.tar.gz b/packaging/cub.tar.gz Binary files differindex 776e4c7035..39a63253d8 100644 --- a/packaging/cub.tar.gz +++ b/packaging/cub.tar.gz diff --git a/packaging/eigen.tar.gz b/packaging/eigen.tar.gz Binary files differindex 84702f621a..5b37554f9d 100644 --- a/packaging/eigen.tar.gz +++ b/packaging/eigen.tar.gz diff --git a/packaging/fbgemm.tar.gz b/packaging/fbgemm.tar.gz Binary files differindex cf905f00d2..43e13699a2 100644 --- a/packaging/fbgemm.tar.gz +++ b/packaging/fbgemm.tar.gz diff --git a/packaging/fmt.tar.gz b/packaging/fmt.tar.gz Binary files differnew file mode 100644 index 0000000000..3448d43b48 --- /dev/null +++ b/packaging/fmt.tar.gz diff --git a/packaging/foxi.tar.gz b/packaging/foxi.tar.gz Binary files differindex f0d2be028a..24b88a53e4 100644 --- a/packaging/foxi.tar.gz +++ b/packaging/foxi.tar.gz diff --git a/packaging/gemmlowp.tar.gz b/packaging/gemmlowp.tar.gz Binary files differindex a1d04aef65..eedd9c55bf 100644 --- a/packaging/gemmlowp.tar.gz +++ b/packaging/gemmlowp.tar.gz diff --git a/packaging/gloo.tar.gz b/packaging/gloo.tar.gz Binary files differindex 88be77e549..ce94245e59 100644 --- a/packaging/gloo.tar.gz +++ b/packaging/gloo.tar.gz diff --git a/packaging/googletest.tar.gz b/packaging/googletest.tar.gz Binary files differindex 9c8ed7b215..0a2b40bead 100644 --- a/packaging/googletest.tar.gz +++ b/packaging/googletest.tar.gz diff --git a/packaging/ideep.tar.gz b/packaging/ideep.tar.gz Binary files differindex 69dce69c78..a0026e7da7 100644 --- a/packaging/ideep.tar.gz +++ b/packaging/ideep.tar.gz diff --git a/packaging/ios-cmake.tar.gz b/packaging/ios-cmake.tar.gz Binary files differindex 23cb1b2f2a..b07e5a0d7c 100644 --- a/packaging/ios-cmake.tar.gz +++ b/packaging/ios-cmake.tar.gz diff --git a/packaging/miniz-2.0.8.tar.gz b/packaging/miniz-2.0.8.tar.gz Binary files differnew file mode 100644 index 0000000000..0f7d6543d5 --- /dev/null +++ b/packaging/miniz-2.0.8.tar.gz diff --git a/packaging/nccl.tar.gz b/packaging/nccl.tar.gz Binary files differindex 476aa7b581..50d3c61725 100644 --- a/packaging/nccl.tar.gz +++ b/packaging/nccl.tar.gz diff --git a/packaging/neon2sse.tar.gz b/packaging/neon2sse.tar.gz Binary files differindex 94e3b0a1b5..df2f16269d 100644 --- a/packaging/neon2sse.tar.gz +++ b/packaging/neon2sse.tar.gz diff --git a/packaging/onnx-tensorrt.tar.gz b/packaging/onnx-tensorrt.tar.gz Binary files differindex f017920169..758d5c621d 100644 --- a/packaging/onnx-tensorrt.tar.gz +++ b/packaging/onnx-tensorrt.tar.gz diff --git a/packaging/onnx.tar.gz b/packaging/onnx.tar.gz Binary files differindex eb0117c5f7..bc56dfb0ae 100644 --- a/packaging/onnx.tar.gz +++ b/packaging/onnx.tar.gz diff --git a/packaging/protobuf.tar.gz b/packaging/protobuf.tar.gz Binary files differindex 8d7b855e4b..23cce8a7c2 100644 --- a/packaging/protobuf.tar.gz +++ b/packaging/protobuf.tar.gz diff --git a/packaging/psimd.tar.gz b/packaging/psimd.tar.gz Binary files differindex 90dd8448c3..0f59cd5f56 100644 --- a/packaging/psimd.tar.gz +++ b/packaging/psimd.tar.gz diff --git a/packaging/pthreadpool.tar.gz b/packaging/pthreadpool.tar.gz Binary files differindex e78bf7b5a8..1cf6f935e2 100644 --- a/packaging/pthreadpool.tar.gz +++ b/packaging/pthreadpool.tar.gz diff --git a/packaging/pybind11.tar.gz b/packaging/pybind11.tar.gz Binary files differindex 2ebdf47708..1103d7b3c8 100644 --- a/packaging/pybind11.tar.gz +++ b/packaging/pybind11.tar.gz diff --git a/packaging/python-enum.tar.gz b/packaging/python-enum.tar.gz Binary files differindex 39976aaab6..1fc14f7378 100644 --- a/packaging/python-enum.tar.gz +++ b/packaging/python-enum.tar.gz diff --git a/packaging/python-peachpy.tar.gz b/packaging/python-peachpy.tar.gz Binary files differindex bcbc84ad9b..95069b53b9 100644 --- a/packaging/python-peachpy.tar.gz +++ b/packaging/python-peachpy.tar.gz diff --git a/packaging/python-six.tar.gz b/packaging/python-six.tar.gz Binary files differindex 3518adc002..96064b8450 100644 --- a/packaging/python-six.tar.gz +++ b/packaging/python-six.tar.gz diff --git a/packaging/pytorch.spec b/packaging/pytorch.spec index 635fe4e128..43134afc61 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 Binary files differindex b4eaae8e56..2dde0919be 100644 --- a/packaging/sleef.tar.gz +++ b/packaging/sleef.tar.gz diff --git a/packaging/tbb.tar.gz b/packaging/tbb.tar.gz Binary files differnew file mode 100644 index 0000000000..1e9e01a930 --- /dev/null +++ b/packaging/tbb.tar.gz diff --git a/packaging/tensorpipe.tar.gz b/packaging/tensorpipe.tar.gz Binary files differnew file mode 100644 index 0000000000..1640d3eb4f --- /dev/null +++ b/packaging/tensorpipe.tar.gz diff --git a/packaging/zstd.tar.gz b/packaging/zstd.tar.gz Binary files differindex ee2c1a35b8..009df26d85 100644 --- a/packaging/zstd.tar.gz +++ b/packaging/zstd.tar.gz diff --git a/pytorch.pc b/pytorch.pc index 66a9399dfa..8f0eb46e26 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 |