Switch to pytorch new extra index url notation

Signed-off-by: ddelange <[email protected]>

python/requirements/ml/requirements_dl.txt

@@ -4,12 +4,14 @@
 tensorflow==2.9.0
 tensorflow-probability==0.17.0
 
-# If you make changes to the torch versions below, please also make the corresponding changes to `requirements_ml_docker.txt`!
+# If you make changes below this line, please also make the corresponding changes to `requirements_ml_docker.txt`!
 
-torch==1.12.1;sys_platform=="darwin"
-torchvision==0.13.1;sys_platform=="darwin"
-
-# On non-OSX machines only install CPU version of torch and torchvision
--f https://download.pytorch.org/whl/torch_stable.html
-torch==1.12.1+cpu;sys_platform!="darwin"
-torchvision==0.13.1+cpu;sys_platform!="darwin"
+--extra-index-url https://download.pytorch.org/whl/cpu  # for CPU versions of torch, torchvision
+--find-links https://data.pyg.org/whl/torch-1.13.0+cpu.html  # for CPU versions of torch-scatter, torch-sparse, torch-cluster, torch-spline-conv
+torch==1.13.0
+torchvision==0.14.0
+torch-scatter==2.1.0
+torch-sparse==0.6.15
+torch-cluster==1.6.0
+torch-spline-conv==1.2.1
+torch-geometric==2.1.0

python/requirements/ml/requirements_ml_docker.txt

@@ -3,15 +3,14 @@ ipython
 # Needed for Ray Client error message serialization/deserialization.
 tblib
 
-# If you make changes to the torch versions, please also make the corresponding changes to `requirements_dl.txt`!
--f https://download.pytorch.org/whl/torch_stable.html
-torch==1.12.1+cu116
-torchvision==0.13.1+cu116
+# If you make changes below this line, please also make the corresponding changes to `requirements_dl.txt`!
 
--f https://data.pyg.org/whl/torch-1.12.1+cu116.html
-torch-scatter==2.0.9
-torch-sparse==0.6.15
-
-# torch-geometric has to be installed after torch-scatter and torch-sparse.
-torch-geometric==2.0.3; python_version < '3.7'
-torch-geometric==2.0.4; python_version >= '3.7'
+--extra-index-url https://download.pytorch.org/whl/cu116  # for GPU versions of torch, torchvision
+--find-links https://data.pyg.org/whl/torch-1.13.0+cu116.html  # for GPU versions of torch-scatter, torch-sparse, torch-cluster, torch-spline-conv
+# specifying explicit plus-notation below so pip overwrites the existing cpu verisons
+torch==1.13.0+cu116
+torchvision==0.14.0+cu116
+torch-scatter==2.1.0+pt113cu116
+torch-sparse==0.6.15+pt113cu116
+torch-cluster==1.6.0+pt113cu116
+torch-spline-conv==1.2.1+pt113cu116