From b1b2db3eff1007c78175597cc9d9cfc899980501 Mon Sep 17 00:00:00 2001 From: lanluo-nvidia Date: Tue, 10 Sep 2024 09:20:30 -0700 Subject: [PATCH 1/6] cut release/2.5 --- docker/dist-build.sh | 4 ++-- py/requirements.txt | 4 ++-- pyproject.toml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/dist-build.sh b/docker/dist-build.sh index 04d2e8b84a..19c3af8d50 100755 --- a/docker/dist-build.sh +++ b/docker/dist-build.sh @@ -5,9 +5,9 @@ set -x TOP_DIR=$(cd $(dirname $0); pwd)/.. if [[ -z "${USE_CXX11}" ]]; then - BUILD_CMD="python -m pip wheel . --extra-index-url https://download.pytorch.org/whl/nightly/cu124 -w dist" + BUILD_CMD="python -m pip wheel . --extra-index-url https://download.pytorch.org/whl/test/cu124 -w dist" else - BUILD_CMD="python -m pip wheel . --config-setting="--build-option=--use-cxx11-abi" --extra-index-url https://download.pytorch.org/whl/nightly/cu124 -w dist" + BUILD_CMD="python -m pip wheel . --config-setting="--build-option=--use-cxx11-abi" --extra-index-url https://download.pytorch.org/whl/test/cu124 -w dist" fi # TensorRT restricts our pip version diff --git a/py/requirements.txt b/py/requirements.txt index 15d359fbc3..921ee9eead 100644 --- a/py/requirements.txt +++ b/py/requirements.txt @@ -2,7 +2,7 @@ numpy packaging pybind11==2.6.2 --extra-index-url https://download.pytorch.org/whl/nightly/cu124 -torch>=2.5.0.dev,<2.6.0 -torchvision>=0.20.0.dev,<0.21.0 +torch>=2.5.0,<2.6.0 +torchvision>=0.20.0,<0.21.0 --extra-index-url https://pypi.ngc.nvidia.com pyyaml diff --git a/pyproject.toml b/pyproject.toml index f6230c8a74..ed44df374b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ requires = [ "typing-extensions>=4.7.0", "future>=0.18.3", "tensorrt-cu12==10.3.0", - "torch >=2.5.0.dev,<2.6.0", + "torch>=2.5.0,<2.6.0", "pybind11==2.6.2", "numpy", ] @@ -54,7 +54,7 @@ keywords = [ "inference", ] dependencies = [ - "torch >=2.5.0.dev,<2.6.0", + "torch>=2.5.0,<2.6.0", "tensorrt-cu12==10.3.0", "tensorrt-cu12-bindings==10.3.0", "tensorrt-cu12-libs==10.3.0", From dcd47a5281c780645f9d77f67855b52bc1abf300 Mon Sep 17 00:00:00 2001 From: lanluo-nvidia Date: Tue, 10 Sep 2024 10:47:40 -0700 Subject: [PATCH 2/6] test --- py/requirements.txt | 4 ++-- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/py/requirements.txt b/py/requirements.txt index 921ee9eead..40688278d3 100644 --- a/py/requirements.txt +++ b/py/requirements.txt @@ -1,8 +1,8 @@ numpy packaging pybind11==2.6.2 ---extra-index-url https://download.pytorch.org/whl/nightly/cu124 +--extra-index-url https://download.pytorch.org/whl/test/cu124 torch>=2.5.0,<2.6.0 -torchvision>=0.20.0,<0.21.0 +torchvision>=0.19.1,<0.20.0 --extra-index-url https://pypi.ngc.nvidia.com pyyaml diff --git a/pyproject.toml b/pyproject.toml index ed44df374b..d81d00acf0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -65,7 +65,7 @@ dependencies = [ dynamic = ["version"] [project.optional-dependencies] -torchvision = ["torchvision >=0.20.dev,<0.21.0"] +torchvision = ["torchvision>=0.19.1,<0.20.0"] quantization = ["nvidia-modelopt[all]>=0.15.1"] monitoring-tools = ["rich >= 13.7.1"] jupyter = ["rich[jupyter] >= 13.7.1"] From f71632623e6ccd1e668916ed2fdddd48bf551313 Mon Sep 17 00:00:00 2001 From: lanluo-nvidia Date: Wed, 11 Sep 2024 09:33:09 -0700 Subject: [PATCH 3/6] test --- py/requirements.txt | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/py/requirements.txt b/py/requirements.txt index 40688278d3..af3f8ef9ad 100644 --- a/py/requirements.txt +++ b/py/requirements.txt @@ -3,6 +3,6 @@ packaging pybind11==2.6.2 --extra-index-url https://download.pytorch.org/whl/test/cu124 torch>=2.5.0,<2.6.0 -torchvision>=0.19.1,<0.20.0 +torchvision>=0.20.0,<0.21.0 --extra-index-url https://pypi.ngc.nvidia.com pyyaml diff --git a/pyproject.toml b/pyproject.toml index d81d00acf0..a2e069036b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -65,7 +65,7 @@ dependencies = [ dynamic = ["version"] [project.optional-dependencies] -torchvision = ["torchvision>=0.19.1,<0.20.0"] +torchvision = ["torchvision>=0.20.0,<0.21.0"] quantization = ["nvidia-modelopt[all]>=0.15.1"] monitoring-tools = ["rich >= 13.7.1"] jupyter = ["rich[jupyter] >= 13.7.1"] From f1b29d73586b3cd7021d5d7d4e88248283b9cc2d Mon Sep 17 00:00:00 2001 From: lanluo-nvidia Date: Fri, 13 Sep 2024 10:32:31 -0700 Subject: [PATCH 4/6] test --- pyproject.toml | 2 +- tests/py/requirements.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a2e069036b..c408645751 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,7 +66,7 @@ dynamic = ["version"] [project.optional-dependencies] torchvision = ["torchvision>=0.20.0,<0.21.0"] -quantization = ["nvidia-modelopt[all]>=0.15.1"] +quantization = ["nvidia-modelopt[all]>=0.17.0"] monitoring-tools = ["rich >= 13.7.1"] jupyter = ["rich[jupyter] >= 13.7.1"] diff --git a/tests/py/requirements.txt b/tests/py/requirements.txt index 5e4842954e..0723d96819 100644 --- a/tests/py/requirements.txt +++ b/tests/py/requirements.txt @@ -9,6 +9,5 @@ pytest-xdist>=3.6.1 pyyaml timm>=1.0.3 transformers==4.40.2 -# TODO: once 0.16.1 is out, update it here -nvidia-modelopt>=0.15.1 +nvidia-modelopt>=0.17.0 --extra-index-url https://pypi.nvidia.com From 162ce9384ea2088ee971c0f15f26d8e3d206ed45 Mon Sep 17 00:00:00 2001 From: lanluo-nvidia Date: Sat, 14 Sep 2024 09:17:16 -0700 Subject: [PATCH 5/6] test --- pyproject.toml | 2 +- tests/py/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c408645751..55d7c3d506 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,7 +66,7 @@ dynamic = ["version"] [project.optional-dependencies] torchvision = ["torchvision>=0.20.0,<0.21.0"] -quantization = ["nvidia-modelopt[all]>=0.17.0"] +quantization = ["nvidia-modelopt[deploy,hf,torch]~=0.17.0"] monitoring-tools = ["rich >= 13.7.1"] jupyter = ["rich[jupyter] >= 13.7.1"] diff --git a/tests/py/requirements.txt b/tests/py/requirements.txt index 0723d96819..f791444c8a 100644 --- a/tests/py/requirements.txt +++ b/tests/py/requirements.txt @@ -9,5 +9,5 @@ pytest-xdist>=3.6.1 pyyaml timm>=1.0.3 transformers==4.40.2 -nvidia-modelopt>=0.17.0 +nvidia-modelopt[deploy,hf,torch]~=0.17.0 --extra-index-url https://pypi.nvidia.com From 41fb51e575723fe8d95663a22330984acb0ff01a Mon Sep 17 00:00:00 2001 From: lanluo-nvidia Date: Sun, 15 Sep 2024 09:22:40 -0700 Subject: [PATCH 6/6] test --- tests/py/dynamo/models/test_models_export.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/py/dynamo/models/test_models_export.py b/tests/py/dynamo/models/test_models_export.py index bf19c3c5e6..e5492648ad 100644 --- a/tests/py/dynamo/models/test_models_export.py +++ b/tests/py/dynamo/models/test_models_export.py @@ -1,4 +1,5 @@ # type: ignore +import platform import unittest import modelopt @@ -241,8 +242,8 @@ def calibrate_loop(model): @unittest.skipIf( - modelopt.__version__ < "0.16.1", - "Int8 quantization is supported in modelopt since 0.16.1 or later", + platform.system() != "Linux" or modelopt.__version__ < "0.17.0", + "Int8 quantization is supported in modelopt since 0.17.0 or later for linux only", ) @pytest.mark.unit def test_base_int8(ir):