Cleanup and add new pytorch packages to cmssw-tools

Author: iarspider

cmssw-tools.spec

@@ -188,7 +188,10 @@ Requires: oracle-fake
 Requires: xtensor
 Requires: xtl
 Requires: xgboost
-Requires: pytorch
+Requires: pytorch-cpu
+# TODO
+#Requires: pytorch-cuda
+#Requires: pytorch-rocm
 Requires: pytorch-custom-ops
 
 ## INCLUDE tfaot-models

pytorch-cluster.spec

@@ -10,7 +10,7 @@
 Source: git+https://github.com/%{github_user}/pytorch_cluster.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz
 
 BuildRequires: cmake
-Requires: pytorch %{!?without_cuda:cuda}
+Requires: pytorch-cpu %{!?without_cuda:cuda}
 %define build_flags -Wall -Wextra -pedantic %{?arch_build_flags}
 %define cuda_arch_float $(echo %{cuda_arch} | tr ' ' '\\n' | sed -E 's|([0-9])$|.\\1|' | tr '\\n' ' ')
 

pytorch-ignore-different-cuda-include-dir.patch

@@ -10,7 +10,7 @@
 Source: git+https://github.com/%{github_user}/pytorch_scatter.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz
 
 BuildRequires: cmake
-Requires: pytorch %{!?without_cuda:cuda}
+Requires: pytorch-cpu %{!?without_cuda:cuda}
 %define build_flags -Wall -Wextra -pedantic %{?arch_build_flags}
 %define cuda_arch_float $(echo %{cuda_arch} | tr ' ' '\\n' | sed -E 's|([0-9])$|.\\1|' | tr '\\n' ' ')
 

pytorch-scatter.spec

@@ -10,7 +10,7 @@
 Source: git+https://github.com/%{github_user}/pytorch_sparse.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz
 
 BuildRequires: cmake
-Requires: pytorch %{!?without_cuda:cuda}
+Requires: pytorch-cpu %{!?without_cuda:cuda}
 %define build_flags -Wall -Wextra -pedantic %{?arch_build_flags}
 %define cuda_arch_float $(echo %{cuda_arch} | tr ' ' '\\n' | sed -E 's|([0-9])$|.\\1|' | tr '\\n' ' ')
 

pytorch-sparse.spec

@@ -1,5 +1,4 @@
 ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}
-# Revision 1
 
 Source: git+https://github.com/pytorch/pytorch.git?obj=main/v%{realversion}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz
 Source1: FindEigen3.cmake

pytorch.file

@@ -5,7 +5,7 @@
     <environment name="INCLUDE" default="$@TOOL_BASE@/include/torchcluster/"/>
     <environment name="LIBDIR" default="$@TOOL_BASE@/lib"/>
   </client>
-  <use name="pytorch"/>
+  <use name="pytorch-cpu"/>
   <lib name="torchcluster"/>
   <flags FORCE_LINK="1"/>
 </tool>

pytorch.spec

@@ -1,5 +1,5 @@
 <tool name="@TOOL@" version="1.0" revision="2">
-    <use name="pytorch"/>
+    <use name="pytorch-cpu"/>
     <use name="pytorch-scatter"/>
     <use name="pytorch-cluster"/>
     <use name="pytorch-sparse"/>

scram-tools.file/tools/pytorch-cluster/pytorch-cluster.xml

@@ -5,7 +5,7 @@
     <environment name="INCLUDE" default="$@TOOL_BASE@/include/torchscatter/"/>
     <environment name="LIBDIR" default="$@TOOL_BASE@/lib"/>
   </client>
-  <use name="pytorch"/>
+  <use name="pytorch-cpu"/>
   <lib name="torchscatter"/>
   <flags FORCE_LINK="1"/>
 </tool>