From 7ec9a77ccd4e73d91742be0f72212f8dc65b7624 Mon Sep 17 00:00:00 2001 From: Evan Li Date: Fri, 10 Jan 2025 22:19:07 -0800 Subject: [PATCH 1/7] fix --- .github/scripts/generate_binary_build_matrix.py | 2 +- .github/workflows/linux-test.yml | 2 +- pyproject.toml | 4 ++-- version.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/scripts/generate_binary_build_matrix.py b/.github/scripts/generate_binary_build_matrix.py index 26bb447b4f..0db7073889 100644 --- a/.github/scripts/generate_binary_build_matrix.py +++ b/.github/scripts/generate_binary_build_matrix.py @@ -64,7 +64,7 @@ XPU = "xpu" -CURRENT_NIGHTLY_VERSION = "2.6.0" +CURRENT_NIGHTLY_VERSION = "2.7.0" CURRENT_CANDIDATE_VERSION = "2.5.1" CURRENT_STABLE_VERSION = "2.5.1" CURRENT_VERSION = CURRENT_STABLE_VERSION diff --git a/.github/workflows/linux-test.yml b/.github/workflows/linux-test.yml index 6ddc601f2c..75ad26b191 100644 --- a/.github/workflows/linux-test.yml +++ b/.github/workflows/linux-test.yml @@ -155,7 +155,7 @@ jobs: path: ${{ env.RUNNER_TEST_RESULTS_DIR }}/**/*.xml summary: true display-options: fEs - fail-on-empty: True + fail-on-empty: false - name: Prepare artifacts for upload working-directory: ${{ inputs.repository }} diff --git a/pyproject.toml b/pyproject.toml index 999973f829..fb29bf9239 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ requires = [ "typing-extensions>=4.7.0", "future>=0.18.3", "tensorrt-cu12>=10.6.0,<10.8.0", - "torch>=2.6.0.dev,<2.7.0", + "torch>=2.7.0.dev,<2.8.0", "pybind11==2.6.2", "numpy", ] @@ -54,7 +54,7 @@ keywords = [ "inference", ] dependencies = [ - "torch>=2.6.0.dev,<2.7.0", + "torch>=2.7.0.dev,<2.8.0", "tensorrt-cu12>=10.6.0,<10.8.0", "tensorrt-cu12-bindings>=10.6.0,<10.8.0", "tensorrt-cu12-libs>=10.6.0,<10.8.0", diff --git a/version.txt b/version.txt index 3d87ca93f8..787e6e4ab7 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.6.0a0 +2.7.0a0 From af08d28aba68cb96b84feff92d9f90b7f5f04e7c Mon Sep 17 00:00:00 2001 From: Evan Li Date: Fri, 10 Jan 2025 22:57:22 -0800 Subject: [PATCH 2/7] fix --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fb29bf9239..04bbcb7885 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ requires = [ "typing-extensions>=4.7.0", "future>=0.18.3", "tensorrt-cu12>=10.6.0,<10.8.0", - "torch>=2.7.0.dev,<2.8.0", + "torch>=2.6.0.dev,<2.8.0", "pybind11==2.6.2", "numpy", ] @@ -54,7 +54,7 @@ keywords = [ "inference", ] dependencies = [ - "torch>=2.7.0.dev,<2.8.0", + "torch>=2.6.0.dev,<2.8.0", "tensorrt-cu12>=10.6.0,<10.8.0", "tensorrt-cu12-bindings>=10.6.0,<10.8.0", "tensorrt-cu12-libs>=10.6.0,<10.8.0", From 2c2a4f646b220684c5a8fa48d0c7594aa0dd1acc Mon Sep 17 00:00:00 2001 From: Evan Li Date: Tue, 14 Jan 2025 10:38:03 -0800 Subject: [PATCH 3/7] update requirements --- py/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/py/requirements.txt b/py/requirements.txt index 361afab365..5644656330 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.6.0.dev,<2.7.0 -torchvision>=0.20.0.dev,<0.21.0 +torch>=2.7.0.dev,<2.8.0 +torchvision>=0.22.0.dev,<0.23.0 --extra-index-url https://pypi.ngc.nvidia.com pyyaml From b3a081cdcbe87847411813662bfe650317501da0 Mon Sep 17 00:00:00 2001 From: Evan Li Date: Tue, 14 Jan 2025 15:09:19 -0800 Subject: [PATCH 4/7] fix --- .github/workflows/linux-test.yml | 4 ++-- .github/workflows/windows-test.yml | 4 ++-- noxfile.py | 2 +- py/requirements.txt | 2 -- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/linux-test.yml b/.github/workflows/linux-test.yml index 75ad26b191..393c457690 100644 --- a/.github/workflows/linux-test.yml +++ b/.github/workflows/linux-test.yml @@ -114,13 +114,13 @@ jobs: script: ${{ inputs.pre-script }} - name: Download artifacts if: ${{ matrix.tensorrt == '' }} - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.ARTIFACT_NAME }} path: /opt/torch-tensorrt-builds/ - name: Download artifacts if: ${{ matrix.tensorrt != '' }} - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.DOWNLOAD_ARTIFACT_NAME }} path: /opt/torch-tensorrt-builds/ diff --git a/.github/workflows/windows-test.yml b/.github/workflows/windows-test.yml index 13feedfa8c..0a2fabddb2 100644 --- a/.github/workflows/windows-test.yml +++ b/.github/workflows/windows-test.yml @@ -105,13 +105,13 @@ jobs: is_windows: 'enabled' - name: Download artifacts if: ${{ matrix.tensorrt == '' }} - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.ARTIFACT_NAME }} path: ${{ runner.temp }}/artifacts/ - name: Download artifacts if: ${{ matrix.tensorrt != '' }} - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.DOWNLOAD_ARTIFACT_NAME }} path: ${{ runner.temp }}/artifacts/ diff --git a/noxfile.py b/noxfile.py index 73d0dca854..9a5c3263bb 100644 --- a/noxfile.py +++ b/noxfile.py @@ -34,7 +34,7 @@ # Set epochs to train VGG model for accuracy tests EPOCHS = 25 -SUPPORTED_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10"] +SUPPORTED_PYTHON_VERSIONS = ["3.9", "3.10", "3.11", "3.12"] nox.options.sessions = [ "l0_api_tests-" + "{}.{}".format(sys.version_info.major, sys.version_info.minor) diff --git a/py/requirements.txt b/py/requirements.txt index 5644656330..a2c78462ce 100644 --- a/py/requirements.txt +++ b/py/requirements.txt @@ -1,8 +1,6 @@ numpy packaging pybind11==2.6.2 ---extra-index-url https://download.pytorch.org/whl/nightly/cu124 torch>=2.7.0.dev,<2.8.0 torchvision>=0.22.0.dev,<0.23.0 ---extra-index-url https://pypi.ngc.nvidia.com pyyaml From 9f3a7eb271c0874770c37057e2f656fe71ead3a1 Mon Sep 17 00:00:00 2001 From: Evan Li Date: Wed, 15 Jan 2025 13:23:52 -0800 Subject: [PATCH 5/7] fix torchvision version --- py/requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/py/requirements.txt b/py/requirements.txt index a2c78462ce..70a5fa07dd 100644 --- a/py/requirements.txt +++ b/py/requirements.txt @@ -1,6 +1,8 @@ numpy packaging pybind11==2.6.2 +--extra-index-url https://download.pytorch.org/whl/nightly/cu124 torch>=2.7.0.dev,<2.8.0 -torchvision>=0.22.0.dev,<0.23.0 +torchvision>=0.20.0.dev,<0.23.0 +--extra-index-url https://pypi.ngc.nvidia.com pyyaml From 1faa64aaef730a527c3414aa3b3bc0422b9a79ab Mon Sep 17 00:00:00 2001 From: Evan Li Date: Thu, 16 Jan 2025 16:14:21 -0800 Subject: [PATCH 6/7] upgrade --- .github/workflows/assigner.yml | 2 +- .github/workflows/build-tensorrt-linux.yml | 6 ++-- .github/workflows/build-tensorrt-windows.yml | 4 +-- .github/workflows/build-test-linux.yml | 28 +++++++++++++------ .../workflows/build-test-tensorrt-linux.yml | 28 +++++++++++++------ .../workflows/build-test-tensorrt-windows.yml | 28 +++++++++++++------ .github/workflows/build-test-windows.yml | 24 ++++++++++++---- .github/workflows/docker_builder.yml | 2 +- .github/workflows/linter.yml | 4 +-- .github/workflows/linux-test.yml | 4 +-- .github/workflows/nightlies.yml | 2 +- .github/workflows/release-linux.yml | 8 +++--- .github/workflows/release-wheel-linux.yml | 10 +++---- .github/workflows/release-wheel-windows.yml | 4 +-- .github/workflows/release-windows.yml | 4 +-- .github/workflows/windows-test.yml | 2 +- py/requirements.txt | 2 +- pyproject.toml | 12 ++++---- 18 files changed, 111 insertions(+), 63 deletions(-) diff --git a/.github/workflows/assigner.yml b/.github/workflows/assigner.yml index 2b65e554b1..b1056c50b3 100644 --- a/.github/workflows/assigner.yml +++ b/.github/workflows/assigner.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Assign uses: ./.github/actions/assigner diff --git a/.github/workflows/build-tensorrt-linux.yml b/.github/workflows/build-tensorrt-linux.yml index 7581c38ae8..42fd32eb55 100644 --- a/.github/workflows/build-tensorrt-linux.yml +++ b/.github/workflows/build-tensorrt-linux.yml @@ -114,13 +114,13 @@ jobs: rm -rf "${RUNNER_TEMP}/*" fi echo "::endgroup::" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # Support the use case where we need to checkout someone's fork repository: ${{ inputs.test-infra-repository }} ref: ${{ inputs.test-infra-ref }} path: test-infra - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 if: ${{ env.ARCH == 'aarch64' }} with: # Support the use case where we need to checkout someone's fork @@ -212,7 +212,7 @@ jobs: # NB: Only upload to GitHub after passing smoke tests - name: Upload wheel to GitHub continue-on-error: true - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.UPLOAD_ARTIFACT_NAME }} path: ${{ inputs.repository }}/dist diff --git a/.github/workflows/build-tensorrt-windows.yml b/.github/workflows/build-tensorrt-windows.yml index 4b86910768..67639a3f02 100644 --- a/.github/workflows/build-tensorrt-windows.yml +++ b/.github/workflows/build-tensorrt-windows.yml @@ -100,7 +100,7 @@ jobs: # to have a conversation timeout-minutes: 120 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # Support the use case where we need to checkout someone's fork repository: ${{ inputs.test-infra-repository }} @@ -216,7 +216,7 @@ jobs: # NB: Only upload to GitHub after passing smoke tests - name: Upload wheel to GitHub continue-on-error: true - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.UPLOAD_ARTIFACT_NAME }} path: ${{ inputs.repository }}/dist/ diff --git a/.github/workflows/build-test-linux.yml b/.github/workflows/build-test-linux.yml index b0a487bb79..5718e96642 100644 --- a/.github/workflows/build-test-linux.yml +++ b/.github/workflows/build-test-linux.yml @@ -30,10 +30,10 @@ jobs: matrix: ${{ steps.generate.outputs.matrix }} runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.10' - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: pytorch/tensorrt - name: Generate release matrix @@ -136,7 +136,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/dynamo_converters_test_results.xml -n 4 conversion/ popd @@ -165,7 +167,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/dyn_models_export.xml --ir dynamo models/ popd @@ -194,7 +198,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/export_serde_test_results.xml --ir dynamo models/test_export_serde.py python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/reexport_test_results.xml --ir dynamo models/test_reexport.py popd @@ -224,7 +230,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra -n 10 --junitxml=${RUNNER_TEST_RESULTS_DIR}/torch_compile_be_test_results.xml backend/ python -m pytest -ra -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/torch_complete_be_e2e_test_results.xml --ir torch_compile models/test_models.py python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/torch_compile_dyn_models_export.xml --ir torch_compile models/test_dyn_models.py @@ -255,7 +263,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_runtime_test_results.xml --ignore runtime/test_002_cudagraphs_py.py --ignore runtime/test_002_cudagraphs_cpp.py runtime/ python -m pytest -ra -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_partitioning_test_results.xml partitioning/ python -m pytest -ra -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_lowering_test_results.xml lowering/ @@ -286,7 +296,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo nvidia-smi python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_runtime_cudagraphs_cpp_test_results.xml runtime/test_002_cudagraphs_cpp.py || true python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_runtime_cudagraphs_py_test_results.xml runtime/test_002_cudagraphs_py.py || true diff --git a/.github/workflows/build-test-tensorrt-linux.yml b/.github/workflows/build-test-tensorrt-linux.yml index dd83299fe7..f25e96c5d6 100644 --- a/.github/workflows/build-test-tensorrt-linux.yml +++ b/.github/workflows/build-test-tensorrt-linux.yml @@ -27,10 +27,10 @@ jobs: matrix: ${{ steps.generate.outputs.matrix }} runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.10' - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: pytorch/tensorrt - name: Generate tensorrt matrix @@ -132,7 +132,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/dynamo_converters_test_results.xml -n 4 conversion/ popd @@ -161,7 +163,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/dyn_models_export.xml --ir dynamo models/ popd @@ -190,7 +194,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/export_serde_test_results.xml --ir dynamo models/test_export_serde.py popd @@ -219,7 +225,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra -n 10 --junitxml=${RUNNER_TEST_RESULTS_DIR}/torch_compile_be_test_results.xml backend/ python -m pytest -ra -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/torch_complete_be_e2e_test_results.xml --ir torch_compile models/test_models.py python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/torch_compile_dyn_models_export.xml --ir torch_compile models/test_dyn_models.py @@ -250,7 +258,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_runtime_test_results.xml --ignore runtime/test_002_cudagraphs_py.py --ignore runtime/test_002_cudagraphs_cpp.py runtime/ python -m pytest -ra -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_partitioning_test_results.xml partitioning/ python -m pytest -ra -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_lowering_test_results.xml lowering/ @@ -281,7 +291,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo nvidia-smi python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_runtime_cudagraphs_cpp_test_results.xml runtime/test_002_cudagraphs_cpp.py || true python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_runtime_cudagraphs_py_test_results.xml runtime/test_002_cudagraphs_py.py || true diff --git a/.github/workflows/build-test-tensorrt-windows.yml b/.github/workflows/build-test-tensorrt-windows.yml index 883e7fe42a..6df471184c 100644 --- a/.github/workflows/build-test-tensorrt-windows.yml +++ b/.github/workflows/build-test-tensorrt-windows.yml @@ -27,10 +27,10 @@ jobs: matrix: ${{ steps.generate.outputs.matrix }} runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.10' - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: pytorch/tensorrt - name: Generate tensorrt matrix @@ -135,7 +135,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/dynamo_converters_test_results.xml -n 4 conversion/ popd @@ -161,7 +163,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/dyn_models_export.xml --ir dynamo models/ popd @@ -187,7 +191,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/export_serde_test_results.xml --ir dynamo models/test_export_serde.py popd @@ -213,7 +219,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra -n 10 --junitxml=${RUNNER_TEST_RESULTS_DIR}/torch_compile_be_test_results.xml backend/ python -m pytest -ra -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/torch_complete_be_e2e_test_results.xml --ir torch_compile models/test_models.py python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/torch_compile_dyn_models_export.xml --ir torch_compile models/test_dyn_models.py @@ -241,7 +249,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_runtime_test_results.xml --ignore runtime/test_002_cudagraphs_py.py --ignore runtime/test_002_cudagraphs_cpp.py runtime/ python -m pytest -ra -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_partitioning_test_results.xml partitioning/ python -m pytest -ra -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_lowering_test_results.xml lowering/ @@ -269,7 +279,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_runtime_cudagraphs_cpp_test_results.xml runtime/test_002_cudagraphs_cpp.py python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_runtime_cudagraphs_py_test_results.xml runtime/test_002_cudagraphs_py.py popd diff --git a/.github/workflows/build-test-windows.yml b/.github/workflows/build-test-windows.yml index c227d14a0f..2ee31b4b74 100644 --- a/.github/workflows/build-test-windows.yml +++ b/.github/workflows/build-test-windows.yml @@ -118,7 +118,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/dynamo_converters_test_results.xml -n 4 conversion/ popd @@ -144,7 +146,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/dyn_models_export.xml --ir dynamo models/ popd @@ -170,7 +174,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/export_serde_test_results.xml --ir dynamo models/test_export_serde.py python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/reexport_test_results.xml --ir dynamo models/test_reexport.py popd @@ -197,7 +203,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra -n 10 --junitxml=${RUNNER_TEST_RESULTS_DIR}/torch_compile_be_test_results.xml backend/ python -m pytest -ra -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/torch_complete_be_e2e_test_results.xml --ir torch_compile models/test_models.py python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/torch_compile_dyn_models_export.xml --ir torch_compile models/test_dyn_models.py @@ -225,7 +233,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_runtime_test_results.xml --ignore runtime/test_002_cudagraphs_py.py --ignore runtime/test_002_cudagraphs_cpp.py runtime/ python -m pytest -ra -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_partitioning_test_results.xml partitioning/ python -m pytest -ra -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_lowering_test_results.xml lowering/ @@ -253,7 +263,9 @@ jobs: export USE_HOST_DEPS=1 export CI_BUILD=1 pushd . - cd tests/py/dynamo + cd tests/py + python -m pip install -r requirements.txt + cd dynamo python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_runtime_cudagraphs_cpp_test_results.xml runtime/test_002_cudagraphs_cpp.py python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_runtime_cudagraphs_py_test_results.xml runtime/test_002_cudagraphs_py.py popd diff --git a/.github/workflows/docker_builder.yml b/.github/workflows/docker_builder.yml index a978d82b6a..b991acf933 100644 --- a/.github/workflows/docker_builder.yml +++ b/.github/workflows/docker_builder.yml @@ -30,7 +30,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Fix Slashes Repo Name id: fix_slashes diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 6428bef8c8..464dfbdf34 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -26,7 +26,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - name: Set up Python 3.9 - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: '3.9' - name: Setup env @@ -66,7 +66,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - name: Set up Python 3.9 - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: '3.9' - name: Setup env diff --git a/.github/workflows/linux-test.yml b/.github/workflows/linux-test.yml index 393c457690..5d47e51d04 100644 --- a/.github/workflows/linux-test.yml +++ b/.github/workflows/linux-test.yml @@ -85,7 +85,7 @@ jobs: rm -rfv "${GITHUB_WORKSPACE}" mkdir -p "${GITHUB_WORKSPACE}" echo "::endgroup::" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # Support the use case where we need to checkout someone's fork repository: ${{ inputs.test-infra-repository }} @@ -184,7 +184,7 @@ jobs: echo "upload-docs=${upload_docs}" >> "${GITHUB_OUTPUT}" - name: Upload artifacts to GitHub (if any) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ inputs.upload-artifact != '' }} with: name: ${{ inputs.upload-artifact }} diff --git a/.github/workflows/nightlies.yml b/.github/workflows/nightlies.yml index a0692cdafe..aac1c58f7f 100644 --- a/.github/workflows/nightlies.yml +++ b/.github/workflows/nightlies.yml @@ -11,7 +11,7 @@ jobs: environment: trigger-nightly timeout-minutes: 120 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: main token: ${{ secrets.GH_PYTORCHBOT_TOKEN }} diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index ca13b37443..25454d27e2 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -31,10 +31,10 @@ jobs: matrix: ${{ steps.generate.outputs.matrix }} runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.10' - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: pytorch/tensorrt - name: Generate release matrix @@ -81,10 +81,10 @@ jobs: matrix: ${{ steps.generate.outputs.matrix }} runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.10' - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: pytorch/tensorrt - name: Generate release matrix diff --git a/.github/workflows/release-wheel-linux.yml b/.github/workflows/release-wheel-linux.yml index 6ddd9e0306..54732378eb 100644 --- a/.github/workflows/release-wheel-linux.yml +++ b/.github/workflows/release-wheel-linux.yml @@ -114,13 +114,13 @@ jobs: rm -rf "${RUNNER_TEMP}/*" fi echo "::endgroup::" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # Support the use case where we need to checkout someone's fork repository: ${{ inputs.test-infra-repository }} ref: ${{ inputs.test-infra-ref }} path: test-infra - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 if: ${{ env.ARCH == 'aarch64' }} with: # Support the use case where we need to checkout someone's fork @@ -236,21 +236,21 @@ jobs: - name: Upload wheel to GitHub if: ${{ inputs.cxx11-tarball-release != 'true' }} continue-on-error: true - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.ARTIFACT_NAME }} path: ${{ inputs.repository }}/release/wheel/ - name: Upload pre-cxx11 tarball to GitHub if: ${{ inputs.cxx11-tarball-release != 'true' && env.PYTHON_VERSION == '3.10' }} continue-on-error: true - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: pre-cxx11-tarball-${{ env.PYTHON_VERSION }}-${{ env.CU_VERSION }} path: ${{ inputs.repository }}/release/tarball/ - name: Upload cxx11 tarball to GitHub if: ${{ inputs.cxx11-tarball-release == 'true' }} continue-on-error: true - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: cxx11-tarball-${{ env.PYTHON_VERSION }}-${{ env.CU_VERSION }} path: ${{ inputs.repository }}/release/tarball/ diff --git a/.github/workflows/release-wheel-windows.yml b/.github/workflows/release-wheel-windows.yml index 6a6c993502..2ea88bce9e 100644 --- a/.github/workflows/release-wheel-windows.yml +++ b/.github/workflows/release-wheel-windows.yml @@ -90,7 +90,7 @@ jobs: # to have a conversation timeout-minutes: 120 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # Support the use case where we need to checkout someone's fork repository: ${{ inputs.test-infra-repository }} @@ -199,7 +199,7 @@ jobs: # NB: Only upload to GitHub after passing smoke tests - name: Upload wheel to GitHub continue-on-error: true - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.ARTIFACT_NAME }} path: ${{ inputs.repository }}/dist/ diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 271547cec3..c6518e1e2a 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -31,10 +31,10 @@ jobs: matrix: ${{ steps.generate.outputs.matrix }} runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.10' - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: pytorch/tensorrt - name: Generate release matrix diff --git a/.github/workflows/windows-test.yml b/.github/workflows/windows-test.yml index 0a2fabddb2..a8b27c0aa9 100644 --- a/.github/workflows/windows-test.yml +++ b/.github/workflows/windows-test.yml @@ -70,7 +70,7 @@ jobs: mkdir -p "${GITHUB_WORKSPACE}" echo "::endgroup::" - name: Checkout repository (${{ inputs.test-infra-repository }}@${{ inputs.test-infra-ref }}) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: # Support the use case where we need to checkout someone's fork repository: ${{ inputs.test-infra-repository }} diff --git a/py/requirements.txt b/py/requirements.txt index 70a5fa07dd..5644656330 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/nightly/cu124 torch>=2.7.0.dev,<2.8.0 -torchvision>=0.20.0.dev,<0.23.0 +torchvision>=0.22.0.dev,<0.23.0 --extra-index-url https://pypi.ngc.nvidia.com pyyaml diff --git a/pyproject.toml b/pyproject.toml index 04bbcb7885..7ec6c7469a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,8 +8,8 @@ requires = [ "cffi>=1.15.1", "typing-extensions>=4.7.0", "future>=0.18.3", - "tensorrt-cu12>=10.6.0,<10.8.0", - "torch>=2.6.0.dev,<2.8.0", + "tensorrt-cu12>=10.7.0,<10.8.0", + "torch>=2.7.0.dev,<2.8.0", "pybind11==2.6.2", "numpy", ] @@ -54,10 +54,10 @@ keywords = [ "inference", ] dependencies = [ - "torch>=2.6.0.dev,<2.8.0", - "tensorrt-cu12>=10.6.0,<10.8.0", - "tensorrt-cu12-bindings>=10.6.0,<10.8.0", - "tensorrt-cu12-libs>=10.6.0,<10.8.0", + "torch>=2.7.0.dev,<2.8.0", + "tensorrt-cu12>=10.7.0,<10.8.0", + "tensorrt-cu12-bindings>=10.7.0,<10.8.0", + "tensorrt-cu12-libs>=10.7.0,<10.8.0", "packaging>=23", "numpy", "typing-extensions>=4.7.0", From f2cda2b6724609ab70af7a7dd59eea5f7acd9d20 Mon Sep 17 00:00:00 2001 From: Evan Li Date: Thu, 16 Jan 2025 17:57:38 -0800 Subject: [PATCH 7/7] try USE_CXX11_ABI=1 --- packaging/env_vars.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packaging/env_vars.txt b/packaging/env_vars.txt index bfd05b7bf6..44a2350e0f 100644 --- a/packaging/env_vars.txt +++ b/packaging/env_vars.txt @@ -1,7 +1,3 @@ export CI_BUILD="1" export RELEASE="1" -if [ $CU_VERSION == "cu126" ]; then - export USE_CXX11_ABI="1" -else - export USE_CXX11_ABI="0" -fi \ No newline at end of file +export USE_CXX11_ABI="1" \ No newline at end of file