Guillaume GARDET 2022-05-24 05:53:14 +00:00 committed by Git OBS Bridge
parent 6fcfa35b32
commit 73b1680af3
35 changed files with 4475 additions and 668 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:90f20492621d5ed80b442aa682ff92d7ccf333ac8fac4a10e7e02afb159f3c13
size 71301

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3e71681e0a67cd28552aa0bbb78ec6a6bd238216df15336dc1326280f7958de2
size 71108

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9ccf554541666b5c089ad5dd465141d671c99971f36d72f313652f5c49ffce14
size 9652

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:07625551202a1f35fe5e826669ad495962b26f6a139290e90b321c5996f002ef
size 8567

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9fb642251296dad566b69c056948fd31daafae9c914ce6c9ee45ffc304dc09f1
size 2833072

View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<constraints> <constraints>
<hardware> <hardware>
<memory> <memory>
@ -6,5 +7,8 @@
<disk> <disk>
<size unit="G">8</size> <size unit="G">8</size>
</disk> </disk>
<memoryperjob>
<size unit="M">2000</size>
</memoryperjob>
</hardware> </hardware>
</constraints> </constraints>

3
_multibuild Normal file
View File

@ -0,0 +1,3 @@
<multibuild>
<package>standard</package>
</multibuild>

181
_service Normal file
View File

@ -0,0 +1,181 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/pytorch/cpuinfo</param>
<param name="scm">git</param>
<param name="filename">cpuinfo</param>
<param name="versionformat">5916273f79a21551890fd3d56fc5375a78d1598d</param>
<param name="revision">5916273f79a21551890fd3d56fc5375a78d1598d</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*cpuinfo*.tar</param>
<param name="compression">gz</param>
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/NVlabs/cub</param>
<param name="scm">git</param>
<param name="filename">cub</param>
<param name="versionformat">d106ddb991a56c3df1b6d51b2409e36ba8181ce4</param>
<param name="revision">d106ddb991a56c3df1b6d51b2409e36ba8181ce4</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*cub*.tar</param>
<param name="compression">gz</param>
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/fmtlib/fmt</param>
<param name="scm">git</param>
<param name="filename">fmt</param>
<param name="versionformat">cd4af11efc9c622896a3e4cb599fa28668ca3d05</param>
<param name="revision">cd4af11efc9c622896a3e4cb599fa28668ca3d05</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*fmt*.tar</param>
<param name="compression">gz</param>
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/houseroad/foxi</param>
<param name="scm">git</param>
<param name="filename">foxi</param>
<param name="versionformat">bd6feb6d0d3fc903df42b4feb82a602a5fcb1fd5</param>
<param name="revision">bd6feb6d0d3fc903df42b4feb82a602a5fcb1fd5</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*foxi*.tar</param>
<param name="compression">gz</param>
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/Maratyszcza/FP16</param>
<param name="scm">git</param>
<param name="filename">FP16</param>
<param name="versionformat">4dfe081cf6bcd15db339cf2680b9281b8451eeb3</param>
<param name="revision">4dfe081cf6bcd15db339cf2680b9281b8451eeb3</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*FP16*.tar</param>
<param name="compression">gz</param>
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/Maratyszcza/FXdiv</param>
<param name="scm">git</param>
<param name="filename">FXdiv</param>
<param name="versionformat">b408327ac2a15ec3e43352421954f5b1967701d1</param>
<param name="revision">b408327ac2a15ec3e43352421954f5b1967701d1</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*FXdiv*.tar</param>
<param name="compression">gz</param>
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/google/gemmlowp</param>
<param name="scm">git</param>
<param name="filename">gemmlowp</param>
<param name="versionformat">3fb5c176c17c765a3492cd2f0321b0dab712f350</param>
<param name="revision">3fb5c176c17c765a3492cd2f0321b0dab712f350</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*gemmlowp*.tar</param>
<param name="compression">gz</param>
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/facebookincubator/gloo</param>
<param name="scm">git</param>
<param name="filename">gloo</param>
<param name="versionformat">6f7095f6e9860ce4fd682a7894042e6eba0996f1</param>
<param name="revision">6f7095f6e9860ce4fd682a7894042e6eba0996f1</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*gloo*.tar</param>
<param name="compression">gz</param>
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/onnx/onnx</param>
<param name="scm">git</param>
<param name="filename">onnx</param>
<param name="versionformat">54c38e6eaf557b844e70cebc00f39ced3321e9ad</param>
<param name="revision">54c38e6eaf557b844e70cebc00f39ced3321e9ad</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*onnx*.tar</param>
<param name="compression">gz</param>
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/Maratyszcza/psimd</param>
<param name="scm">git</param>
<param name="filename">psimd</param>
<param name="versionformat">072586a71b55b7f8c584153d223e95687148a900</param>
<param name="revision">072586a71b55b7f8c584153d223e95687148a900</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*psimd*.tar</param>
<param name="compression">gz</param>
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/Maratyszcza/pthreadpool</param>
<param name="scm">git</param>
<param name="filename">pthreadpool</param>
<param name="versionformat">a134dd5d4cee80cce15db81a72e7f929d71dd413</param>
<param name="revision">a134dd5d4cee80cce15db81a72e7f929d71dd413</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*pthreadpool*.tar</param>
<param name="compression">gz</param>
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/pybind/pybind11</param>
<param name="scm">git</param>
<param name="filename">pybind11</param>
<param name="versionformat">8de7772cc72daca8e947b79b83fea46214931604</param>
<param name="revision">8de7772cc72daca8e947b79b83fea46214931604</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*pybind11*.tar</param>
<param name="compression">gz</param>
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/pytorch/QNNPACK</param>
<param name="scm">git</param>
<param name="filename">QNNPACK</param>
<param name="versionformat">7d2a4e9931a82adc3814275b6219a03e24e36b4c</param>
<param name="revision">7d2a4e9931a82adc3814275b6219a03e24e36b4c</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*QNNPACK*.tar</param>
<param name="compression">gz</param>
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/google/XNNPACK</param>
<param name="scm">git</param>
<param name="filename">XNNPACK</param>
<param name="versionformat">55d53a4e7079d38e90acd75dd9e4f9e781d2da35</param>
<param name="revision">55d53a4e7079d38e90acd75dd9e4f9e781d2da35</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*XNNPACK*.tar</param>
<param name="compression">gz</param>
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/shibatch/sleef</param>
<param name="scm">git</param>
<param name="filename">sleef</param>
<param name="versionformat">e0a003ee838b75d11763aa9c3ef17bf71a725bff</param>
<param name="revision">e0a003ee838b75d11763aa9c3ef17bf71a725bff</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*sleef*.tar</param>
<param name="compression">gz</param>
</service>
</services>

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f3c16d5d393d6d1fa6b6ed8621dd0a535552df9bc88cbba739375dde38a93142
size 3496223

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b84c49b4bdc12b0e8f1bff365dcefd50e5a2a25eeef8c928aeb2dab9fda4d599
size 3488961

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d87f6737be1b544c299340b64b9303c1d6ec0447b49b3aaf6642838b4f8280d7
size 398104

View File

@ -0,0 +1,10 @@
--- pytorch-1.9.0/caffe2/opt/onnxifi_op.h.orig 2021-07-22 14:16:51.417995412 +0000
+++ pytorch-1.9.0/caffe2/opt/onnxifi_op.h 2021-07-22 14:17:51.616490492 +0000
@@ -313,7 +313,6 @@ class OnnxifiOp final : public Operator<
weight_descs.size(),
weight_descs.data(),
&graph,
- static_cast<uint32_t>(max_seq_size_),
defered_blob_reader);
if (ret != ONNXIFI_STATUS_SUCCESS) {
if (ret == ONNXIFI_STATUS_FATAL_ERROR) {

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:de0ec6be9ec3c4da10ff5b0f19cc22f3501c0d563c5cf82d62663a3a68dd0852
size 753304

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3b8b0dbc1b27e1de29399b942ec7258c1d4b51c2bfa3bb6876fbc14bec414f3c
size 28548

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ca8cd06abc4ab0f02299af44ecf01bcb3545e190cfe688685b822b47cd5aedf6
size 28938

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b4418cfd6795ff527940e7911b291b63c66009c3e4f041cbebd1701bde6f6aff
size 247554

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3044a0041eab739ed94c6880d031063f1d048eaa6d89c708ef01c80aae3dfa06
size 222514

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5ea74a3e1bbe0c858729a4d1790ab152b60bb844398da70560b1eb1d346f448d
size 9303388

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:90910ab142174b003f342f445a2112227c0a10945051f55352db298004bd3b1f
size 2593140

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f6c4dab91ae9a03b3019e7cab0572743afd0e1b6e75b97fcca50259c737c924e
size 6825

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:afd27417c6df1c85f79a68361055dd3adc292174913c39c1f58b698b9cfd7926
size 6182

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:90ab4f60ae0e99c0172dd5201dccc6de6c8f384a21b3d959588f4c1e00beec0f
size 12775

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:db5c281f6cd873670e2fef919ab398e4e0587f5265ddc9e014f17cb8e3449611
size 49011

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1a1ccf8779332a7d6d0db9034d42df188867cbaf52eb71d74451f79aa8ce2040
size 559554

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:53cd43ce8ade975225c2fd99325c2d3e42190b317fcabd6e13c6406972427bd0
size 648390

View File

@ -1,3 +1,102 @@
-------------------------------------------------------------------
Thu Jul 22 14:40:45 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Fix build on x86_64 by using GCC10 instead of GCC11
https://github.com/google/XNNPACK/issues/1550
-------------------------------------------------------------------
Thu Jul 22 10:11:03 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Update to 1.9.0
- Release notes: https://github.com/pytorch/pytorch/releases/tag/v1.9.0
- Drop upstreamed patch:
* fix-mov-operand-for-gcc.patch
- Drop unneeded patches:
* removed-peachpy-depedency.patch
- Refresh patches:
* skip-third-party-check.patch
* fix-call-of-onnxInitGraph.patch
- Add new patch:
* pytorch-rm-some-gitmodules.patch
-------------------------------------------------------------------
Thu Jul 22 09:07:31 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Add _service file to ease future update of deps
-------------------------------------------------------------------
Thu Jul 22 08:26:17 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Update sleef to fix build on aarch64
-------------------------------------------------------------------
Fri Apr 23 21:51:36 UTC 2021 - Matej Cepl <mcepl@suse.com>
- Don't build python36-* package (missing pandas)
-------------------------------------------------------------------
Thu Jan 21 23:28:20 UTC 2021 - Benjamin Greiner <code@bnavigator.de>
- Fix python-rpm-macros usage
-------------------------------------------------------------------
Wed Oct 7 15:15:28 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Use GCC9 to build on aarch64 Tumbleweed to workaround SVE
problem with GCC10 with sleef, see:
https://github.com/pytorch/pytorch/issues/45971
-------------------------------------------------------------------
Thu Aug 20 09:04:08 UTC 2020 - Martin Liška <mliska@suse.cz>
- Use memoryperjob constraint instead of %limit_build macro.
-------------------------------------------------------------------
Tue Jun 23 15:28:57 UTC 2020 - Christian Goll <cgoll@suse.com>
- updated to new stable release 1.5.1 which has following changes:
This release includes several major new API additions and improvements. These
include new APIs for autograd allowing for easy computation of hessians and
jacobians, a significant update to the C++ frontend, channels last memory
format for more performant computer vision models, a stable release of the
distributed RPC framework used for model parallel training, and a new API
that allows for the creation of Custom C++ Classes that was inspired by
PyBind. Additionally torch_xla 1.5 is now available and tested with the
PyTorch 1.5 release providing a mature Cloud TPU experience.
* see release.html for detailed information
- added patches:
* fix-call-of-onnxInitGraph.patch for API mismatch in onnx
* fix-mov-operand-for-gcc.patch for aarch64 operands
- removed sources:
* cpuinfo-89fe1695edf9ee14c22f815f24bac45577a4f135.tar.gz
* gloo-7c541247a6fa49e5938e304ab93b6da661823d0f.tar.gz
* onnx-fea8568cac61a482ed208748fdc0e1a8e47f62f5.tar.gz
* psimd-90a938f30ba414ada2f4b00674ee9631d7d85e19.tar.gz
* pthreadpool-13da0b4c21d17f94150713366420baaf1b5a46f4.tar.gz
- added sources:
* cpuinfo-0e6bde92b343c5fbcfe34ecd41abf9515d54b4a7.tar.gz
* gloo-113bde13035594cafdca247be953610b53026553.tar.gz
* onnx-9fdae4c68960a2d44cd1cc871c74a6a9d469fa1f.tar.gz
* psimd-10b4ffc6ea9e2e11668f86969586f88bc82aaefa.tar.gz
* pthreadpool-d465747660ecf9ebbaddf8c3db37e4a13d0c9103.tar.gz
-------------------------------------------------------------------
Tue Jun 23 09:25:06 UTC 2020 - Christian Goll <cgoll@suse.com>
- updated to bugfix release 1.4.1 and added _multibuild file so
that cuda versions can be build on commandline
-------------------------------------------------------------------
Thu Apr 23 14:30:22 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Make sure to pull py2/py3 package from the devel pkg
-------------------------------------------------------------------
Thu Apr 23 09:54:25 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Do not pull in python2 only dependencies
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 26 13:07:14 UTC 2020 - Simon Lees <sflees@suse.de> Wed Feb 26 13:07:14 UTC 2020 - Simon Lees <sflees@suse.de>

View File

@ -1,7 +1,7 @@
# #
# spec file for package python-torch # spec file for package python-torch
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2021 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,52 +16,83 @@
# #
#
%define srcname pytorch %define srcname pytorch
%define skip_python2 1 %define skip_python2 1
%define skip_python36 1
%define pname torch %define pname torch
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "standard"
%bcond_with cuda
%endif
%if "%{flavor}" == "cuda-10-2"
%bcond_without cuda
%define cudaver 10-2
%endif
%define gloo_version 6f7095f6e9860ce4fd682a7894042e6eba0996f1
%define cpuinfo_version 5916273f79a21551890fd3d56fc5375a78d1598d
%define sleef_version e0a003ee838b75d11763aa9c3ef17bf71a725bff
%define pybind11_version 8de7772cc72daca8e947b79b83fea46214931604
%define onnx_version 54c38e6eaf557b844e70cebc00f39ced3321e9ad
%define pthreadpool_version a134dd5d4cee80cce15db81a72e7f929d71dd413
%define FXdiv_version b408327ac2a15ec3e43352421954f5b1967701d1
%define psimd_version 072586a71b55b7f8c584153d223e95687148a900
%define FP16_version 4dfe081cf6bcd15db339cf2680b9281b8451eeb3
%define gemmlowp_version 3fb5c176c17c765a3492cd2f0321b0dab712f350
%define foxi_version bd6feb6d0d3fc903df42b4feb82a602a5fcb1fd5
%define QNNPACK_version 7d2a4e9931a82adc3814275b6219a03e24e36b4c
%define XNNPACK_version 55d53a4e7079d38e90acd75dd9e4f9e781d2da35
%define cub_version d106ddb991a56c3df1b6d51b2409e36ba8181ce4
%define fmt_version cd4af11efc9c622896a3e4cb599fa28668ca3d05
Name: python-torch Name: python-torch
Version: 1.4.0 Version: 1.9.0
Release: 0 Release: 0
Summary: Deep learning framework aka pytorch/Caffe2 Summary: Deep learning framework aka pytorch/Caffe2
License: BSD-2-Clause AND BSD-3-Clause AND MIT AND Zlib AND BSL-1.0 AND Apache-2.0 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT AND Zlib AND BSL-1.0
Group: Development/Languages/Python Group: Development/Languages/Python
URL: https://pytorch.org URL: https://pytorch.org
Source0: https://github.com/pytorch/pytorch/archive/v%{version}.tar.gz#/%{srcname}-%{version}.tar.gz Source0: https://github.com/pytorch/pytorch/archive/v%{version}.tar.gz#/%{srcname}-%{version}.tar.gz
Source1: releases.html Source1: releases.html
# License10: BSD-3-Clause # License10: BSD-3-Clause
Source10: https://github.com/facebookincubator/gloo/archive/7c541247a6fa49e5938e304ab93b6da661823d0f.tar.gz#/gloo-7c541247a6fa49e5938e304ab93b6da661823d0f.tar.gz Source10: https://github.com/facebookincubator/gloo/archive/%{gloo_version}.tar.gz#/gloo-%{gloo_version}.tar.gz
# License12: BSD-2-Clause # License12: BSD-2-Clause
Source12: https://github.com/pytorch/cpuinfo/archive/89fe1695edf9ee14c22f815f24bac45577a4f135.tar.gz#/cpuinfo-89fe1695edf9ee14c22f815f24bac45577a4f135.tar.gz Source12: https://github.com/pytorch/cpuinfo/archive/%{cpuinfo_version}.tar.gz#/cpuinfo-%{cpuinfo_version}.tar.gz
# License13: BSL-1.0 # License13: BSL-1.0
Source13: https://github.com/zdevito/sleef/archive/7f523de651585fe25cade462efccca647dcc8d02.tar.gz#/sleef-7f523de651585fe25cade462efccca647dcc8d02.tar.gz Source13: https://github.com/zdevito/sleef/archive/%{sleef_version}.tar.gz#/sleef-%{sleef_version}.tar.gz
# License14: BSD-3-Clause # License14: BSD-3-Clause
Source14: https://github.com/pybind/pybind11/archive/25abf7efba0b2990f5a6dfb0a31bc65c0f2f4d17.tar.gz#/pybind11-25abf7efba0b2990f5a6dfb0a31bc65c0f2f4d17.tar.gz Source14: https://github.com/pybind/pybind11/archive/%{pybind11_version}.tar.gz#/pybind11-%{pybind11_version}.tar.gz
# License15: MIT # License15: MIT
Source15: https://github.com/onnx/onnx/archive/fea8568cac61a482ed208748fdc0e1a8e47f62f5.tar.gz#/onnx-fea8568cac61a482ed208748fdc0e1a8e47f62f5.tar.gz Source15: https://github.com/onnx/onnx/archive/%{onnx_version}.tar.gz#/onnx-%{onnx_version}.tar.gz
#License16: BSD-2-Clause #License16: BSD-2-Clause
Source16: https://github.com/Maratyszcza/pthreadpool/archive/13da0b4c21d17f94150713366420baaf1b5a46f4.tar.gz#/pthreadpool-13da0b4c21d17f94150713366420baaf1b5a46f4.tar.gz Source16: https://github.com/Maratyszcza/pthreadpool/archive/%{pthreadpool_version}.tar.gz#/pthreadpool-%{pthreadpool_version}.tar.gz
# License17: MIT # License17: MIT
Source17: https://github.com/Maratyszcza/FXdiv/archive/b742d1143724d646cd0f914646f1240eacf5bd73.tar.gz#/FXdiv-b742d1143724d646cd0f914646f1240eacf5bd73.tar.gz Source17: https://github.com/Maratyszcza/FXdiv/archive/%{FXdiv_version}.tar.gz#/FXdiv-%{FXdiv_version}.tar.gz
# License18: MIT # License18: MIT
Source18: https://github.com/Maratyszcza/psimd/archive/90a938f30ba414ada2f4b00674ee9631d7d85e19.tar.gz#/psimd-90a938f30ba414ada2f4b00674ee9631d7d85e19.tar.gz Source18: https://github.com/Maratyszcza/psimd/archive/%{psimd_version}.tar.gz#/psimd-%{psimd_version}.tar.gz
# License19: MIT # License19: MIT
Source19: https://github.com/Maratyszcza/FP16/archive/febbb1c163726b5db24bed55cc9dc42529068997.tar.gz#/FP16-febbb1c163726b5db24bed55cc9dc42529068997.tar.gz Source19: https://github.com/Maratyszcza/FP16/archive/%{FP16_version}.tar.gz#/FP16-%{FP16_version}.tar.gz
# License20: Apache-2.0 # License20: Apache-2.0
Source20: https://github.com/google/gemmlowp/archive/3fb5c176c17c765a3492cd2f0321b0dab712f350.tar.gz#/gemmlowp-3fb5c176c17c765a3492cd2f0321b0dab712f350.tar.gz Source20: https://github.com/google/gemmlowp/archive/%{gemmlowp_version}.tar.gz#/gemmlowp-%{gemmlowp_version}.tar.gz
# License21: MIT # License21: MIT
Source21: https://github.com/houseroad/foxi/archive/97fe555430a857581b9b826ecd955e4f0a3653f0.tar.gz#/foxi-97fe555430a857581b9b826ecd955e4f0a3653f0.tar.gz Source21: https://github.com/houseroad/foxi/archive/%{foxi_version}.tar.gz#/foxi-%{foxi_version}.tar.gz
# License22: MIT # License22: MIT
Source22: https://github.com/pytorch/QNNPACK/archive/7d2a4e9931a82adc3814275b6219a03e24e36b4c.tar.gz#/QNNPACK-7d2a4e9931a82adc3814275b6219a03e24e36b4c.tar.gz Source22: https://github.com/pytorch/QNNPACK/archive/%{QNNPACK_version}.tar.gz#/QNNPACK-%{QNNPACK_version}.tar.gz
# License23: BSD-3-Clause
Patch0: removed-peachpy-depedency.patch Source23: https://github.com/google/XNNPACK/archive/%{XNNPACK_version}.tar.gz#/XNNPACK-%{XNNPACK_version}.tar.gz
Patch1: skip-third-party-check.patch # License24: BSD-3-Clause
Source24: https://github.com/NVlabs/cub/archive/%{cub_version}.tar.gz#/cub-%{cub_version}.tar.gz
# License 25: MIT
Source25: https://github.com/fmtlib/fmt/archive/%{fmt_version}.tar.gz#/fmt-%{fmt_version}.tar.gz
Patch1: pytorch-rm-some-gitmodules.patch
Patch2: skip-third-party-check.patch
# Patch3: fix-call-of-onnxInitGraph.patch #Make the build to fail on Leap/SLE
# A python call to cmake fails with a return code of 1 on this arch, disable it for now. # A python call to cmake fails with a return code of 1 on this arch, disable it for now.
ExcludeArch: %ix86 # and 32-bit arm is not supported
ExcludeArch: %ix86 %{arm}
BuildRequires: %{python_module Gloo} BuildRequires: %{python_module Gloo}
%ifarch x86_64 %ifarch x86_64
@ -76,14 +107,28 @@ BuildRequires: %{python_module numpy-devel}
BuildRequires: %{python_module opcodes} BuildRequires: %{python_module opcodes}
BuildRequires: %{python_module protobuf} BuildRequires: %{python_module protobuf}
BuildRequires: %{python_module psutil} BuildRequires: %{python_module psutil}
BuildRequires: %{python_module rpm-macros}
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module typing_extensions} BuildRequires: %{python_module typing_extensions}
BuildRequires: %{python_module typing} BuildRequires: %{python_module typing}
BuildRequires: %{pythons} %if 0%{?suse_version} <= 1500
BuildRequires: cmake # Python 3.6 still need dataclasses
BuildRequires: %{python_module dataclasses}
%ifarch aarch64
# XNNPACK uses +dotprod modifier which requires GCC8+
BuildRequires: gcc8
BuildRequires: gcc8-c++
%endif
%endif
BuildRequires: cmake >= 3.5
BuildRequires: eigen3-devel BuildRequires: eigen3-devel
BuildRequires: fdupes BuildRequires: fdupes
%ifarch x86_64
%if 0%{?suse_version} > 1500
# Use GCC10 until fixed - https://github.com/google/XNNPACK/issues/1550
BuildRequires: gcc10
BuildRequires: gcc10-c++
%endif
%endif
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: glog-devel BuildRequires: glog-devel
BuildRequires: gtest BuildRequires: gtest
@ -91,16 +136,27 @@ BuildRequires: leveldb-devel
BuildRequires: libnuma-devel BuildRequires: libnuma-devel
BuildRequires: libopenblas_pthreads-devel BuildRequires: libopenblas_pthreads-devel
BuildRequires: lmdb-devel BuildRequires: lmdb-devel
BuildRequires: memory-constraints
BuildRequires: ninja BuildRequires: ninja
BuildRequires: openblas-devel BuildRequires: openblas-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: protobuf-c BuildRequires: protobuf-c
BuildRequires: protobuf-devel BuildRequires: protobuf-devel
BuildRequires: python-py-cpuinfo BuildRequires: python-rpm-macros
BuildRequires: python-pybind11-devel
BuildRequires: snappy-devel BuildRequires: snappy-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with cuda}
BuildRequires: cuda-compiler-%cudaver
BuildRequires: cuda-cudart-dev-%cudaver
BuildRequires: cuda-libraries-dev-%cudaver
BuildRequires: cuda-misc-headers-%cudaver
BuildRequires: cuda-nsight-%cudaver
BuildRequires: cuda-toolkit-%cudaver
%if 0%{?suse_version} > 1500
BuildRequires: gcc7
BuildRequires: gcc7-c++
%endif
BuildRequires: libcudnn7-devel
BuildRequires: libnccl-devel
%endif
Requires: python-future Requires: python-future
Requires: python-leveldb Requires: python-leveldb
Requires: python-numpy Requires: python-numpy
@ -110,6 +166,10 @@ Requires: python-six
Provides: python-caffe2 = %version Provides: python-caffe2 = %version
Provides: python-pytorch = %version Provides: python-pytorch = %version
%if "%flavor" == ""
ExclusiveArch: do_not_build
%endif
%python_subpackages %python_subpackages
%description %description
@ -124,7 +184,7 @@ PyTorch provides two high-level features:
%package devel %package devel
Summary: Headers for C/C++, cmake build description and libraries needed for development Summary: Headers for C/C++, cmake build description and libraries needed for development
Group: Development/Languages/Python Group: Development/Languages/Python
Requires: %{name} = %{version} Requires: python-torch = %{version}
%description devel %description devel
Although the Python interface is more polished and the primary focus of Although the Python interface is more polished and the primary focus of
@ -180,39 +240,60 @@ rmdir python-peachpy/
%make_depend_src %{SOURCE20} gemmlowp/gemmlowp %make_depend_src %{SOURCE20} gemmlowp/gemmlowp
%make_depend_src %{SOURCE21} %make_depend_src %{SOURCE21}
%make_depend_src %{SOURCE22} %make_depend_src %{SOURCE22}
# link system eigen to right place %make_depend_src %{SOURCE23}
rmdir eigen %make_depend_src %{SOURCE24}
ln -s /usr/include/eigen3 eigen %make_depend_src %{SOURCE25}
cd ..
%build %build
#export CC=gcc-7 %define buildvars \
#export CXX=g++-7 export USE_NNPACK=OFF \
export USE_NNPACK=0 %if %{with cuda} \
export USE_CUDNN=0 export USE_CUDA=ON \
export USE_TEST=0 export USE_CUDNN=ON \
export USE_LEVELDB=ON export USE_SYSTEM_NCCL=ON \
export USE_LMDB=ON export PATH="/usr/local/cuda-10.1/bin:$PATH" \
export USE_FBGEMM=0 export CPLUS_INCLUDE_PATH="/usr/local/cuda-10.1/include" \
export USE_SYSTEM_LIB="tbb,fbgemm,fbgemm/third_party/asmjit,onnx/third_party/benchmark" export C_INCLUDE_PATH="/usr/local/cuda-10.1/include" \
export BUILD_CUSTOM_PROTOBUF=OFF export LD_LIBRARY_PATH="/usr/local/cuda-10.1/lib" \
export BUILD_TEST=0 export NCCL_INCLUDE_DIR="/usr/include/" \
%limit_build -m 2000 %if 0%{?suse_version} > 1500 \
export MAX_JOBS=%{?jobs} export CC=gcc-7 \
export CXX=g++-7 \
%endif \
%else \
%ifarch x86_64 \
%if 0%{?suse_version} > 1500 \
export CC=gcc-10 \
export CXX=g++-10 \
%endif \
%endif \
%if 0%{?suse_version} <= 1500 \
%ifarch aarch64 \
export CC=gcc-8 \
export CXX=g++-8 \
%endif \
%endif \
export USE_CUDA=OFF \
export USE_CUDNN=OFF \
%endif \
export USE_KINETO=OFF \
export USE_DISTRIBUTED=OFF \
export USE_TEST=OFF \
export USE_LEVELDB=ON \
export USE_LMDB=ON \
export USE_FBGEMM=OFF \
export USE_SYSTEM_BENCHMARK=ON \
export USE_SYSTEM_EIGEN_INSTALL=ON \
export USE_TBB=OFF \
export BUILD_CUSTOM_PROTOBUF=OFF \
export BUILD_TEST=OFF \
export MAX_JOBS=%{?jobs} \
%buildvars
%python_build %python_build
%install %install
export USE_NNPACK=0 %buildvars
export USE_CUDNN=0
export USE_TEST=0
export USE_LEVELDB=ON
export USE_LMDB=ON
export USE_FBGEMM=0
export USE_SYSTEM_LIB="tbb,fbgemm,fbgemm/third_party/asmjit,onnx/third_party/benchmark"
export BUILD_CUSTOM_PROTOBUF=OFF
export BUILD_TEST=1
%limit_build -m 2000
export MAX_JOBS=%{?jobs}
%python_install %python_install
%python_expand %fdupes %{buildroot}%{$python_sitearch} %python_expand %fdupes %{buildroot}%{$python_sitearch}

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8efc9c3d1804ffb97cbcf4ef988febc8d0b8701763614a586c7fc457a97cf847
size 9641840

3
pytorch-1.9.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:951dc1826c7c90326d32b09600ce2f27035818c0153fa59935122658cf038e6a
size 16772380

View File

@ -0,0 +1,118 @@
--- pytorch-1.9.0/.gitmodules.orig 2021-07-22 11:52:36.279286034 +0000
+++ pytorch-1.9.0/.gitmodules 2021-07-22 12:40:01.725543111 +0000
@@ -6,30 +6,6 @@
ignore = dirty
path = third_party/cub
url = https://github.com/NVlabs/cub.git
-[submodule "third_party/eigen"]
- ignore = dirty
- path = third_party/eigen
- url = https://github.com/eigenteam/eigen-git-mirror.git
-[submodule "third_party/googletest"]
- ignore = dirty
- path = third_party/googletest
- url = https://github.com/google/googletest.git
-[submodule "third_party/benchmark"]
- ignore = dirty
- path = third_party/benchmark
- url = https://github.com/google/benchmark.git
-[submodule "third_party/protobuf"]
- ignore = dirty
- path = third_party/protobuf
- url = https://github.com/protocolbuffers/protobuf.git
-[submodule "third_party/ios-cmake"]
- ignore = dirty
- path = third_party/ios-cmake
- url = https://github.com/Yangqing/ios-cmake.git
-[submodule "third_party/NNPACK"]
- ignore = dirty
- path = third_party/NNPACK
- url = https://github.com/Maratyszcza/NNPACK.git
[submodule "third_party/gloo"]
ignore = dirty
path = third_party/gloo
@@ -50,46 +26,18 @@
ignore = dirty
path = third_party/psimd
url = https://github.com/Maratyszcza/psimd.git
-[submodule "third_party/zstd"]
- ignore = dirty
- path = third_party/zstd
- url = https://github.com/facebook/zstd.git
[submodule "third_party/cpuinfo"]
ignore = dirty
path = third_party/cpuinfo
url = https://github.com/pytorch/cpuinfo.git
-[submodule "third_party/python-enum"]
- ignore = dirty
- path = third_party/python-enum
- url = https://github.com/PeachPy/enum34.git
-[submodule "third_party/python-peachpy"]
- ignore = dirty
- path = third_party/python-peachpy
- url = https://github.com/Maratyszcza/PeachPy.git
-[submodule "third_party/python-six"]
- ignore = dirty
- path = third_party/python-six
- url = https://github.com/benjaminp/six.git
[submodule "third_party/onnx"]
ignore = dirty
path = third_party/onnx
url = https://github.com/onnx/onnx.git
-[submodule "third_party/onnx-tensorrt"]
- ignore = dirty
- path = third_party/onnx-tensorrt
- url = https://github.com/onnx/onnx-tensorrt
[submodule "third_party/sleef"]
ignore = dirty
path = third_party/sleef
url = https://github.com/shibatch/sleef
-[submodule "third_party/ideep"]
- ignore = dirty
- path = third_party/ideep
- url = https://github.com/intel/ideep
-[submodule "third_party/nccl/nccl"]
- ignore = dirty
- path = third_party/nccl/nccl
- url = https://github.com/NVIDIA/nccl
[submodule "third_party/gemmlowp/gemmlowp"]
ignore = dirty
path = third_party/gemmlowp/gemmlowp
@@ -98,26 +46,10 @@
ignore = dirty
path = third_party/QNNPACK
url = https://github.com/pytorch/QNNPACK
-[submodule "third_party/neon2sse"]
- ignore = dirty
- path = third_party/neon2sse
- url = https://github.com/intel/ARM_NEON_2_x86_SSE.git
-[submodule "third_party/fbgemm"]
- ignore = dirty
- path = third_party/fbgemm
- url = https://github.com/pytorch/fbgemm
[submodule "third_party/foxi"]
ignore = dirty
path = third_party/foxi
url = https://github.com/houseroad/foxi.git
-[submodule "third_party/tbb"]
- path = third_party/tbb
- url = https://github.com/01org/tbb
- branch = tbb_2018
-[submodule "android/libs/fbjni"]
- ignore = dirty
- path = android/libs/fbjni
- url = https://github.com/facebookincubator/fbjni.git
[submodule "third_party/XNNPACK"]
ignore = dirty
path = third_party/XNNPACK
@@ -126,10 +58,3 @@
ignore = dirty
path = third_party/fmt
url = https://github.com/fmtlib/fmt.git
-[submodule "third_party/tensorpipe"]
- ignore = dirty
- path = third_party/tensorpipe
- url = https://github.com/pytorch/tensorpipe.git
-[submodule "third_party/kineto"]
- path = third_party/kineto
- url = https://github.com/pytorch/kineto

File diff suppressed because it is too large Load Diff

View File

@ -1,24 +0,0 @@
From f8d67af7a466d878581579af5a77848e552ffdfd Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.de>
Date: Wed, 3 Apr 2019 12:04:10 +0200
Subject: [PATCH] removed peachpy depedency
---
cmake/External/nnpack.cmake | 1 -
1 file changed, 1 deletion(-)
diff --git a/cmake/External/nnpack.cmake b/cmake/External/nnpack.cmake
index 2cd9efc..6e16257 100644
--- a/cmake/External/nnpack.cmake
+++ b/cmake/External/nnpack.cmake
@@ -47,7 +47,6 @@ if (ANDROID OR IOS OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NA
# Directories for NNPACK dependencies submoduled in Caffe2
set(PYTHON_SIX_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/python-six" CACHE STRING "six (Python package) source directory")
set(PYTHON_ENUM_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/python-enum" CACHE STRING "enum34 (Python package) source directory")
- set(PYTHON_PEACHPY_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/python-peachpy" CACHE STRING "PeachPy (Python package) source directory")
if (NOT DEFINED CPUINFO_SOURCE_DIR)
set(CPUINFO_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/cpuinfo" CACHE STRING "cpuinfo source directory")
endif()
--
2.16.4

View File

@ -1,69 +1,17 @@
From 0f1b2fb9bd2b9ea9ae7c25b366c74dd9daf39439 Mon Sep 17 00:00:00 2001 --- pytorch-1.9.0/setup.py.orig 2021-07-22 11:29:23.485565837 +0000
From: Christian Goll <cgoll@suse.de> +++ pytorch-1.9.0/setup.py 2021-07-22 12:04:17.690981402 +0000
Date: Thu, 20 Feb 2020 15:18:18 +0100 @@ -340,10 +340,10 @@ def check_submodules():
Subject: [PATCH] skip third party check Add the possibilty to skip check for sys.exit(1)
subdirs in third_party for folder in folders:
check_for_files(folder, ["CMakeLists.txt", "Makefile", "setup.py", "LICENSE"])
- check_for_files(os.path.join(third_party_path, 'fbgemm', 'third_party',
- 'asmjit'), ['CMakeLists.txt'])
- check_for_files(os.path.join(third_party_path, 'onnx', 'third_party',
- 'benchmark'), ['CMakeLists.txt'])
+ #check_for_files(os.path.join(third_party_path, 'fbgemm', 'third_party',
+ #'asmjit'), ['CMakeLists.txt'])
+ #check_for_files(os.path.join(third_party_path, 'onnx', 'third_party',
+ #'benchmark'), ['CMakeLists.txt'])
---
setup.py | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/setup.py b/setup.py
index 01fee0e3a5..4c3d86cee6 100644
--- a/setup.py
+++ b/setup.py
@@ -160,7 +160,9 @@
# USE_TBB
# enable TBB support
#
-
+# USE_SYSTEM_LIB
+# A comma seperated list of libraries for which should not be checked
+# under the directory third_party
from __future__ import print_function
from setuptools import setup, Extension, distutils, find_packages
from collections import defaultdict
@@ -287,22 +289,25 @@ def build_deps():
report('-- Building version ' + version)
def check_file(f):
- if not os.path.exists(f):
- report("Could not find {}".format(f))
- report("Did you run 'git submodule update --init --recursive'?")
- sys.exit(1)
-
- check_file(os.path.join(third_party_path, "gloo", "CMakeLists.txt"))
- check_file(os.path.join(third_party_path, "pybind11", "CMakeLists.txt"))
- check_file(os.path.join(third_party_path, 'cpuinfo', 'CMakeLists.txt'))
- check_file(os.path.join(third_party_path, 'tbb', 'Makefile'))
- check_file(os.path.join(third_party_path, 'onnx', 'CMakeLists.txt'))
- check_file(os.path.join(third_party_path, 'foxi', 'CMakeLists.txt'))
- check_file(os.path.join(third_party_path, 'QNNPACK', 'CMakeLists.txt'))
- check_file(os.path.join(third_party_path, 'fbgemm', 'CMakeLists.txt'))
- check_file(os.path.join(third_party_path, 'fbgemm', 'third_party',
+ if os.path.dirname(f) in str(os.getenv('USE_SYSTEM_LIB')):
+ report("Not checking for {} in third_party".format(f))
+ else:
+ if not os.path.exists(os.path.join(third_party_path,f)):
+ report("Could not find {}".format(os.path.join(third_party_path,f)))
+ report("Did you run 'git submodule update --init --recursive'?")
+ sys.exit(1)
+
+ check_file(os.path.join("gloo", "CMakeLists.txt"))
+ check_file(os.path.join("pybind11", "CMakeLists.txt"))
+ check_file(os.path.join('cpuinfo', 'CMakeLists.txt'))
+ check_file(os.path.join('tbb', 'Makefile'))
+ check_file(os.path.join('onnx', 'CMakeLists.txt'))
+ check_file(os.path.join('foxi', 'CMakeLists.txt'))
+ check_file(os.path.join('QNNPACK', 'CMakeLists.txt'))
+ check_file(os.path.join('fbgemm', 'CMakeLists.txt'))
+ check_file(os.path.join('fbgemm', 'third_party',
'asmjit', 'CMakeLists.txt'))
- check_file(os.path.join(third_party_path, 'onnx', 'third_party',
+ check_file(os.path.join('onnx', 'third_party',
'benchmark', 'CMakeLists.txt'))
check_pydep('yaml', 'pyyaml')
--
2.25.0
# all the work we need to do _before_ setup runs

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8cb5fae822077ca9cbc14dcc7bba9a3a35ad519284fc5169f9a176672c63860a
size 1174007

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fdf8901ebeb58924e197dd14d264f7c04e9f80da720f4c38deb13992f1bb89ac
size 1642070