From f0d5f5f7c0ba864e6c548fafc9cac513030af3ed Mon Sep 17 00:00:00 2001 From: Pete MacKinnon Date: Fri, 27 Jan 2023 17:26:42 +0000 Subject: [PATCH 1/4] Fixes #644; update torch to 1.13.1+cu116 --- docker/conda/environments/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/conda/environments/requirements.txt b/docker/conda/environments/requirements.txt index 6970ecdc4f..13a06fdb07 100644 --- a/docker/conda/environments/requirements.txt +++ b/docker/conda/environments/requirements.txt @@ -1,6 +1,6 @@ # Note, to include this when using setup.py or pip, set the variable: # PIP_FIND_LINKS=https://download.pytorch.org/whl/cu113/torch_stable.html ---find-links https://download.pytorch.org/whl/cu113/torch_stable.html +--find-links https://download.pytorch.org/whl/cu116/torch_stable.html ####### Pip-only runtime dependencies (keep sorted!) ####### # Packages listed here should also be listed in setup.py @@ -10,6 +10,6 @@ jupyter-core>=4.11.2,<5.0 jupyterlab nvidia-pyindex pytest-benchmark>=4.0 -torch==1.12.0+cu113 +torch==1.13.1+cu116 tritonclient[all]==2.17.* websockets From 7d5b254366e8e3d6715026f7fc9e29a863c6b045 Mon Sep 17 00:00:00 2001 From: Pete MacKinnon Date: Fri, 27 Jan 2023 12:33:22 -0500 Subject: [PATCH 2/4] Update requirements.txt --- docker/conda/environments/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/conda/environments/requirements.txt b/docker/conda/environments/requirements.txt index 13a06fdb07..17540f4c64 100644 --- a/docker/conda/environments/requirements.txt +++ b/docker/conda/environments/requirements.txt @@ -1,5 +1,5 @@ # Note, to include this when using setup.py or pip, set the variable: -# PIP_FIND_LINKS=https://download.pytorch.org/whl/cu113/torch_stable.html +# PIP_FIND_LINKS=https://download.pytorch.org/whl/cu116/torch_stable.html --find-links https://download.pytorch.org/whl/cu116/torch_stable.html ####### Pip-only runtime dependencies (keep sorted!) ####### From 8248c1aea826708fe3118c1983afec36bd00dc48 Mon Sep 17 00:00:00 2001 From: Pete MacKinnon Date: Fri, 27 Jan 2023 13:51:55 -0500 Subject: [PATCH 3/4] Update requirements.txt --- docker/conda/environments/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/conda/environments/requirements.txt b/docker/conda/environments/requirements.txt index 17540f4c64..1f2c5ac3c4 100644 --- a/docker/conda/environments/requirements.txt +++ b/docker/conda/environments/requirements.txt @@ -1,6 +1,6 @@ # Note, to include this when using setup.py or pip, set the variable: -# PIP_FIND_LINKS=https://download.pytorch.org/whl/cu116/torch_stable.html ---find-links https://download.pytorch.org/whl/cu116/torch_stable.html +# PIP_FIND_LINKS=https://download.pytorch.org/whl/torch/ +--find-links https://download.pytorch.org/whl/torch/ ####### Pip-only runtime dependencies (keep sorted!) ####### # Packages listed here should also be listed in setup.py From 2c1a844a37a9ff228d6a4da4f4727996509ed443 Mon Sep 17 00:00:00 2001 From: Pete MacKinnon Date: Fri, 27 Jan 2023 21:53:00 +0000 Subject: [PATCH 4/4] Fix other missed torch refs --- docker/conda/environments/requirements.txt | 4 ++-- .../training-tuning-scripts/phishing-models/requirements.txt | 2 +- .../root-cause-models/requirements.txt | 2 +- .../validation-inference-scripts/dfp-models/requirements.txt | 2 +- .../phishing-models/requirements.txt | 2 +- .../root-cause-models/requirements.txt | 2 +- setup.py | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/conda/environments/requirements.txt b/docker/conda/environments/requirements.txt index 1f2c5ac3c4..17540f4c64 100644 --- a/docker/conda/environments/requirements.txt +++ b/docker/conda/environments/requirements.txt @@ -1,6 +1,6 @@ # Note, to include this when using setup.py or pip, set the variable: -# PIP_FIND_LINKS=https://download.pytorch.org/whl/torch/ ---find-links https://download.pytorch.org/whl/torch/ +# PIP_FIND_LINKS=https://download.pytorch.org/whl/cu116/torch_stable.html +--find-links https://download.pytorch.org/whl/cu116/torch_stable.html ####### Pip-only runtime dependencies (keep sorted!) ####### # Packages listed here should also be listed in setup.py diff --git a/models/training-tuning-scripts/phishing-models/requirements.txt b/models/training-tuning-scripts/phishing-models/requirements.txt index a6745592d8..fc6905b410 100644 --- a/models/training-tuning-scripts/phishing-models/requirements.txt +++ b/models/training-tuning-scripts/phishing-models/requirements.txt @@ -3,6 +3,6 @@ cupy==10.6.0 numpy==1.22.4 pandas==1.3.5 scikit_learn==1.1.3 -torch==1.12.0+cu113 +torch==1.13.1+cu116 tqdm==4.64.1 transformers==4.24.0 diff --git a/models/training-tuning-scripts/root-cause-models/requirements.txt b/models/training-tuning-scripts/root-cause-models/requirements.txt index a6745592d8..fc6905b410 100644 --- a/models/training-tuning-scripts/root-cause-models/requirements.txt +++ b/models/training-tuning-scripts/root-cause-models/requirements.txt @@ -3,6 +3,6 @@ cupy==10.6.0 numpy==1.22.4 pandas==1.3.5 scikit_learn==1.1.3 -torch==1.12.0+cu113 +torch==1.13.1+cu116 tqdm==4.64.1 transformers==4.24.0 diff --git a/models/validation-inference-scripts/dfp-models/requirements.txt b/models/validation-inference-scripts/dfp-models/requirements.txt index 802bd43663..451e0b4d2e 100644 --- a/models/validation-inference-scripts/dfp-models/requirements.txt +++ b/models/validation-inference-scripts/dfp-models/requirements.txt @@ -6,4 +6,4 @@ matplotlib==3.4.2 numpy==1.22.0 pandas==1.0.1 scikit_learn==1.0.2 -torch==1.12.0+cu113 +torch==1.13.1+cu116 diff --git a/models/validation-inference-scripts/phishing-models/requirements.txt b/models/validation-inference-scripts/phishing-models/requirements.txt index ad4660fb54..5d41fef50c 100644 --- a/models/validation-inference-scripts/phishing-models/requirements.txt +++ b/models/validation-inference-scripts/phishing-models/requirements.txt @@ -2,4 +2,4 @@ cudf==22.8.1 numpy==1.22.4 onnxruntime==1.13.1 scipy==1.9.1 -torch==1.12.0+cu113 +torch==1.13.1+cu116 diff --git a/models/validation-inference-scripts/root-cause-models/requirements.txt b/models/validation-inference-scripts/root-cause-models/requirements.txt index ad4660fb54..5d41fef50c 100644 --- a/models/validation-inference-scripts/root-cause-models/requirements.txt +++ b/models/validation-inference-scripts/root-cause-models/requirements.txt @@ -2,4 +2,4 @@ cudf==22.8.1 numpy==1.22.4 onnxruntime==1.13.1 scipy==1.9.1 -torch==1.12.0+cu113 +torch==1.13.1+cu116 diff --git a/setup.py b/setup.py index e614e66c0c..2e83cf538e 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ # Required to install torch via setup.py # Note: this is order dependent -os.environ["PIP_FIND_LINKS"] = "https://download.pytorch.org/whl/cu113/torch_stable.html" +os.environ["PIP_FIND_LINKS"] = "https://download.pytorch.org/whl/cu116/torch_stable.html" import versioneer # noqa: E402 from setuptools import find_packages # noqa: E402 @@ -49,7 +49,7 @@ # Only list the packages which cannot be installed via conda here. Should mach the requirements in # docker/conda/environments/requirements.txt "dfencoder @ git+https://github.com/nv-morpheus/dfencoder.git@branch-23.01#egg=dfencoder", - "torch==1.12.0+cu113", + "torch==1.13.1+cu116", "tritonclient[all]==2.17.*", # Force to 2.17 since they require grpcio==1.41 for newer versions ], license="Apache",