Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: cherry-pick NGC fixes for 25.02 #3371

Merged
merged 5 commits into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/scripts/generate_binary_build_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,6 @@ def generate_wheels_matrix(
ret: List[Dict[str, Any]] = []
for python_version in python_versions:
for arch_version in arches:

# TODO: Enable Python 3.13 support for ROCM
if arch_version in ROCM_ARCHES and python_version == "3.13":
continue
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/assigner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-tensorrt-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-tensorrt-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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/
Expand Down
26 changes: 19 additions & 7 deletions .github/workflows/build-test-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: pytorch/tensorrt
- name: Generate release matrix
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -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
Expand Down
26 changes: 19 additions & 7 deletions .github/workflows/build-test-tensorrt-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: pytorch/tensorrt
- name: Generate tensorrt matrix
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -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
Expand Down
26 changes: 19 additions & 7 deletions .github/workflows/build-test-tensorrt-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: pytorch/tensorrt
- name: Generate tensorrt matrix
Expand Down Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -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
Expand Down
24 changes: 18 additions & 6 deletions .github/workflows/build-test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker_builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -54,7 +54,7 @@ jobs:
TRT_VERSION=$(python3 -c "import versions; versions.tensorrt_version()")
echo "TRT VERSION = ${TRT_VERSION}"

DOCKER_BUILDKIT=1 docker build --build-arg TENSORRT_VERSION=$TRT_VERSION -f docker/Dockerfile --tag $DOCKER_TAG .
DOCKER_BUILDKIT=1 docker build --build-arg TENSORRT_VERSION=$TRT_VERSION --build-arg USE_CXX11_ABI=1 -f docker/Dockerfile --tag $DOCKER_TAG .

- name: Push Docker image
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@v4
with:
python-version: '3.9'
- name: Setup env
Expand Down Expand Up @@ -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@v4
with:
python-version: '3.9'
- name: Setup env
Expand Down
Loading
Loading