Fix broken cpuinfo for aarch64

Signed-off-by: Tom Rix <trix@redhat.com>

.gitignore

@@ -12,3 +12,8 @@
 /pytorch-97ff6cf.tar.gz
 /pytorch-v2.3.0.tar.gz
 /pytorch-v2.3.1.tar.gz
+/xnnpack-fcbf55a.tar.gz
+/FXdiv-63058ef.tar.gz
+/FP16-0a92994.tar.gz
+/psimd-072586a.tar.gz
+/cpuinfo-d6860c4.tar.gz

python-torch.spec

@@ -33,7 +33,12 @@
 # hipblaslt is in development
 %bcond_with hipblaslt
 # Which families gpu build for
+%if 0%{?fedora} > 40
 %global rocm_gpu_list gfx8 gfx9 gfx10 gfx11 gfx90a gfx942 gfx1100
+%else
+# F40
+%global rocm_gpu_list gfx8 gfx9 gfx10 gfx11
+%endif
 %global rocm_default_gpu default
 %bcond_without rocm_loop
 
@@ -167,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}
@@ -240,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}
@@ -282,6 +289,7 @@ BuildRequires:  pthreadpool-devel
 %endif
 
 %if %{with xnnpack}
+BuildRequires:  cpuinfo-devel
 BuildRequires:  FP16-devel
 BuildRequires:  fxdiv-devel
 BuildRequires:  psimd-devel
@@ -375,6 +383,8 @@ Provides:       bundled(FP16)
 Provides:       bundled(fxdiv)
 # MIT
 Provides:       bundled(psimd)
+# BSD-2-Clause
+Provides:       bundled(cpuinfo)
 %endif
 
 %if %{without pthreadpool}
@@ -436,6 +446,7 @@ Summary:        %{name} for ROCm gfx11
 %description -n python3-%{pypi_name}-rocm-gfx11
 %{summary}
 
+%if 0%{?fedora} > 40
 %package -n python3-%{pypi_name}-rocm-gfx90a
 Summary:        %{name} for ROCm MI200
 %description -n python3-%{pypi_name}-rocm-gfx90a
@@ -450,6 +461,7 @@ Summary:        %{name} for ROCm MI300
 Summary:        %{name} for W7900
 %description -n python3-%{pypi_name}-rocm-gfx1100
 %{summary}
+%endif
 
 %endif
 
@@ -518,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}
@@ -623,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}
@@ -671,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}
@@ -807,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
@@ -821,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
@@ -985,6 +1002,7 @@ done
 %{_libdir}/rocm/gfx11/bin/*
 %{_libdir}/rocm/gfx11/lib64/*
 
+%if 0%{?fedora} > 40
 %files -n python3-%{pypi_name}-rocm-gfx90a
 %{_libdir}/rocm/gfx90a/bin/*
 %{_libdir}/rocm/gfx90a/lib64/*
@@ -996,6 +1014,7 @@ done
 %files -n python3-%{pypi_name}-rocm-gfx1100
 %{_libdir}/rocm/gfx1100/bin/*
 %{_libdir}/rocm/gfx1100/lib64/*
+%endif
 
 %endif
 

sources

@@ -12,3 +12,8 @@ SHA512 (libnop-910b558.tar.gz) = 74c5324eaa1b6b2ac8dfef94c835b5c5b044625f8e5efe3
 SHA512 (pytorch-97ff6cf.tar.gz) = 105ebcba298558fe833f90e7e40b003d35a74609e777f9dc4c47f5668c884f603455113ac0ff252a62b83c81137ae66ceb1a862d351203925dcfc3dcf9f73580
 SHA512 (pytorch-v2.3.0.tar.gz) = 0c2ffc7bf2fd86070e9958c34eca1f03a0248a011ac6ffaeb69f65306ff856edd5359986f02af25888433187e6d7f29b60edded092e2ac30c8cec49023166eda
 SHA512 (pytorch-v2.3.1.tar.gz) = fe132251b2bae87b70ba3d95dc32f6a4545970d11893118b0ebe6ca129732e516ef4d6cc4f380b3db9bb2277d1db8ce78a401c40149bb1dfbab76eab9e3992c4
+SHA512 (xnnpack-fcbf55a.tar.gz) = 8063e27686f7b71cfba05b0c004c46db4506638689ffb112f013b3886de58653b60ca5487978c3f96275c17bb1136883ca4c93ddb2241a2c31925a950cb51759
+SHA512 (FXdiv-63058ef.tar.gz) = da33eab4d006645f383a1f24fc3e747db3aeb0613219297ec0ae69aa2617f07ba050ebd6a64a8cbde6d25481f176d0ec3b9753a95d1fbcead2136595f3e50e97
+SHA512 (FP16-0a92994.tar.gz) = 3f094f242425ea37de274eb8539dc5f8ab0c13fd5325d14180ef12e9c04e6002a110d086c4c667f7c8054af337deab096d59482eb95cc8a632c3c412b48e89d1
+SHA512 (psimd-072586a.tar.gz) = a18faea093423dd9fe19ece8b228e011dccce0a2a22222f777ea19b023a13173966d4a8aea01147e8fc58de5d39cffcedeb2221a1572ae52bd5aba1295f86a94
+SHA512 (cpuinfo-d6860c4.tar.gz) = 02dd70f0b95c2cb6d8af4e33072f63f5d72d2314796033ae68bb6b37cb7db18d43dd2cdfedafc896dec0614dbeec9ab507f765f3d958fbda8c0ab3e3a191a87c