diff --git a/.gitignore b/.gitignore index 621f21e..72c29f9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /FXdiv-63058ef.tar.gz /FP16-0a92994.tar.gz /psimd-072586a.tar.gz +/cpuinfo-d6860c4.tar.gz diff --git a/python-torch.spec b/python-torch.spec index ea60d27..29db936 100644 --- a/python-torch.spec +++ b/python-torch.spec @@ -172,6 +172,9 @@ Source32: https://github.com/Maratyszcza/FP16/archive/%{fp_commit}/FP16-%{ %global ps_commit 072586a71b55b7f8c584153d223e95687148a900 %global ps_scommit %(c=%{ps_commit}; echo ${c:0:7}) Source33: https://github.com/Maratyszcza/psimd/archive/%{ps_commit}/psimd-%{ps_scommit}.tar.gz +%global ci_commit d6860c477c99f1fce9e28eb206891af3c0e1a1d7 +%global ci_scommit %(c=%{ci_commit}; echo ${c:0:7}) +Source34: https://github.com/pytorch/cpuinfo/archive/%{ci_commit}/cpuinfo-%{ci_scommit}.tar.gz %endif %if %{without pthreadpool} @@ -245,7 +248,6 @@ ExclusiveArch: x86_64 aarch64 %global _lto_cflags %nil BuildRequires: cmake -BuildRequires: cpuinfo-devel BuildRequires: eigen3-devel BuildRequires: fmt-devel %if %{with caffe2} @@ -287,6 +289,7 @@ BuildRequires: pthreadpool-devel %endif %if %{with xnnpack} +BuildRequires: cpuinfo-devel BuildRequires: FP16-devel BuildRequires: fxdiv-devel BuildRequires: psimd-devel @@ -380,6 +383,8 @@ Provides: bundled(FP16) Provides: bundled(fxdiv) # MIT Provides: bundled(psimd) +# BSD-2-Clause +Provides: bundled(cpuinfo) %endif %if %{without pthreadpool} @@ -525,6 +530,9 @@ cp -r FP16-*/* third_party/FP16/ tar xf %{SOURCE33} rm -rf third_party/psimd/* cp -r psimd-*/* third_party/psimd/ +tar xf %{SOURCE34} +rm -rf third_party/cpuinfo/* +cp -r cpuinfo-*/* third_party/cpuinfo/ %endif %if %{without pthreadpool} @@ -630,6 +638,7 @@ mv third_party/XNNPACK . mv third_party/FXdiv . mv third_party/FP16 . mv third_party/psimd . +mv third_party/cpuinfo . %endif %if %{without pthreadpool} @@ -678,6 +687,7 @@ mv XNNPACK third_party mv FXdiv third_party mv FP16 third_party mv psimd third_party +mv cpuinfo third_party %endif %if %{without pthreadpool} @@ -814,7 +824,6 @@ export USE_PYTORCH_QNNPACK=OFF export USE_QNNPACK=OFF %endif export USE_ROCM=OFF -export USE_SYSTEM_CPUINFO=ON export USE_SYSTEM_SLEEF=ON export USE_SYSTEM_EIGEN_INSTALL=ON export USE_SYSTEM_ONNX=ON @@ -828,6 +837,7 @@ export USE_SYSTEM_PTHREADPOOL=ON %endif %if %{with xnnpack} +export USE_SYSTEM_CPUINFO=ON export USE_SYSTEM_FP16=ON export USE_SYSTEM_FXDIV=ON export USE_SYSTEM_PSIMD=ON diff --git a/sources b/sources index 834f425..444da8e 100644 --- a/sources +++ b/sources @@ -16,3 +16,4 @@ SHA512 (xnnpack-fcbf55a.tar.gz) = 8063e27686f7b71cfba05b0c004c46db4506638689ffb1 SHA512 (FXdiv-63058ef.tar.gz) = da33eab4d006645f383a1f24fc3e747db3aeb0613219297ec0ae69aa2617f07ba050ebd6a64a8cbde6d25481f176d0ec3b9753a95d1fbcead2136595f3e50e97 SHA512 (FP16-0a92994.tar.gz) = 3f094f242425ea37de274eb8539dc5f8ab0c13fd5325d14180ef12e9c04e6002a110d086c4c667f7c8054af337deab096d59482eb95cc8a632c3c412b48e89d1 SHA512 (psimd-072586a.tar.gz) = a18faea093423dd9fe19ece8b228e011dccce0a2a22222f777ea19b023a13173966d4a8aea01147e8fc58de5d39cffcedeb2221a1572ae52bd5aba1295f86a94 +SHA512 (cpuinfo-d6860c4.tar.gz) = 02dd70f0b95c2cb6d8af4e33072f63f5d72d2314796033ae68bb6b37cb7db18d43dd2cdfedafc896dec0614dbeec9ab507f765f3d958fbda8c0ab3e3a191a87c