Skip to content

Commit 5c7e8a1

Browse files
committed
Cleanup and add new pytorch packages to cmssw-tools
1 parent 9eb1b4d commit 5c7e8a1

File tree

7 files changed

+8
-123
lines changed

7 files changed

+8
-123
lines changed

cmssw-tools.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,10 @@ Requires: oracle-fake
188188
Requires: xtensor
189189
Requires: xtl
190190
Requires: xgboost
191-
Requires: pytorch
191+
Requires: pytorch-cpu
192+
# TODO
193+
#Requires: pytorch-cuda
194+
#Requires: pytorch-rocm
192195
Requires: pytorch-custom-ops
193196

194197
## INCLUDE tfaot-models

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

Lines changed: 0 additions & 16 deletions
This file was deleted.

pytorch.spec

Lines changed: 0 additions & 102 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<environment name="INCLUDE" default="$@TOOL_BASE@/include/torchcluster/"/>
66
<environment name="LIBDIR" default="$@TOOL_BASE@/lib"/>
77
</client>
8-
<use name="pytorch"/>
8+
<use name="pytorch-cpu"/>
99
<lib name="torchcluster"/>
1010
<flags FORCE_LINK="1"/>
1111
</tool>

scram-tools.file/tools/pytorch-custom-ops/pytorch-custom-ops.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<tool name="@TOOL@" version="1.0" revision="2">
2-
<use name="pytorch"/>
2+
<use name="pytorch-cpu"/>
33
<use name="pytorch-scatter"/>
44
<use name="pytorch-cluster"/>
55
<use name="pytorch-sparse"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<environment name="INCLUDE" default="$@TOOL_BASE@/include/torchscatter/"/>
66
<environment name="LIBDIR" default="$@TOOL_BASE@/lib"/>
77
</client>
8-
<use name="pytorch"/>
8+
<use name="pytorch-cpu"/>
99
<lib name="torchscatter"/>
1010
<flags FORCE_LINK="1"/>
1111
</tool>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<environment name="INCLUDE" default="$@TOOL_BASE@/include/torchsparse/"/>
66
<environment name="LIBDIR" default="$@TOOL_BASE@/lib"/>
77
</client>
8-
<use name="pytorch"/>
8+
<use name="pytorch-cpu"/>
99
<lib name="torchsparse"/>
1010
<flags FORCE_LINK="1"/>
1111
</tool>

0 commit comments

Comments
 (0)