Skip to content

Commit fdd6bad

Browse files
gs-olivegs-olive
authored
fix: release/2.1 CI Repair (#2528)
1 parent 9b13f10 commit fdd6bad

File tree

6 files changed

+29
-28
lines changed

6 files changed

+29
-28
lines changed

‎.github/scripts/install-torch-tensorrt.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
set -eou pipefail
33
# Source conda so it's available to the script environment
44
source ${BUILD_ENV_FILE}
5-
${CONDA_RUN} ${PIP_INSTALL_TORCH} torchvision pyyaml
5+
${CONDA_RUN} ${PIP_INSTALL_TORCH} torch==2.1.2 torchvision==0.16.2 pyyaml
66
export TRT_VERSION=$(${CONDA_RUN} python -c "import versions; versions.tensorrt_version()")
77
${CONDA_RUN} python -m pip install /opt/torch-tensorrt-builds/torch_tensorrt*+${CU_VERSION}*.whl tensorrt~=${TRT_VERSION} tensorrt-bindings~=${TRT_VERSION} --extra-index-url=https://pypi.ngc.nvidia.com
88

9-
echo -e "Running test script";
9+
echo -e "Running test script";

‎.github/workflows/build-test.yml

+20-19
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ on:
1515

1616
jobs:
1717
generate-matrix:
18-
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
18+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1
1919
with:
2020
package-type: wheel
2121
os: linux
2222
test-infra-repository: pytorch/test-infra
23-
test-infra-ref: main
23+
test-infra-ref: release/2.1
24+
channel: test
2425
with-rocm: false
2526
with-cpu: false
2627

@@ -37,12 +38,12 @@ jobs:
3738
smoke-test-script: ""
3839
package-name: torch_tensorrt
3940
name: Build torch-tensorrt whl package
40-
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
41+
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.1
4142
with:
4243
repository: ${{ matrix.repository }}
4344
ref: ""
4445
test-infra-repository: pytorch/test-infra
45-
test-infra-ref: main
46+
test-infra-ref: release/2.1
4647
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
4748
pre-script: ${{ matrix.pre-script }}
4849
env-var-script: ${{ matrix.env-var-script }}
@@ -64,13 +65,13 @@ jobs:
6465
- repository: pytorch/tensorrt
6566
package-name: torch_tensorrt
6667
pre-script: packaging/pre_build_script.sh
67-
uses: pytorch/tensorrt/.github/workflows/linux-test.yml@main
68+
uses: ./.github/workflows/linux-test.yml
6869
with:
6970
job-name: tests-py-torchscript-fe
7071
repository: "pytorch/tensorrt"
7172
ref: ""
7273
test-infra-repository: pytorch/test-infra
73-
test-infra-ref: main
74+
test-infra-ref: release/2.1
7475
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
7576
pre-script: ${{ matrix.pre-script }}
7677
script: |
@@ -83,7 +84,7 @@ jobs:
8384
popd
8485
pushd .
8586
cd tests/py/ts
86-
${CONDA_RUN} python -m pip install --pre pytest timm transformers parameterized expecttest --use-deprecated=legacy-resolver
87+
${CONDA_RUN} python -m pip install --pre pytest timm transformers parameterized expecttest==0.1.6 --use-deprecated=legacy-resolver
8788
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_api_test_results.xml api/
8889
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_models_test_results.xml models/
8990
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_integrations_test_results.xml integrations/
@@ -99,20 +100,20 @@ jobs:
99100
- repository: pytorch/tensorrt
100101
package-name: torch_tensorrt
101102
pre-script: packaging/pre_build_script.sh
102-
uses: pytorch/tensorrt/.github/workflows/linux-test.yml@main
103+
uses: ./.github/workflows/linux-test.yml
103104
with:
104105
job-name: tests-py-dynamo-converters
105106
repository: "pytorch/tensorrt"
106107
ref: ""
107108
test-infra-repository: pytorch/test-infra
108-
test-infra-ref: main
109+
test-infra-ref: release/2.1
109110
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
110111
pre-script: ${{ matrix.pre-script }}
111112
script: |
112113
export USE_HOST_DEPS=1
113114
pushd .
114115
cd tests/py/dynamo
115-
${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest --use-deprecated=legacy-resolver
116+
${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest==0.1.6 --use-deprecated=legacy-resolver
116117
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/dynamo_converters_test_results.xml -n 10 conversion/
117118
popd
118119
@@ -126,20 +127,20 @@ jobs:
126127
- repository: pytorch/tensorrt
127128
package-name: torch_tensorrt
128129
pre-script: packaging/pre_build_script.sh
129-
uses: pytorch/tensorrt/.github/workflows/linux-test.yml@main
130+
uses: ./.github/workflows/linux-test.yml
130131
with:
131132
job-name: tests-py-dynamo-fe
132133
repository: "pytorch/tensorrt"
133134
ref: ""
134135
test-infra-repository: pytorch/test-infra
135-
test-infra-ref: main
136+
test-infra-ref: release/2.1
136137
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
137138
pre-script: ${{ matrix.pre-script }}
138139
script: |
139140
export USE_HOST_DEPS=1
140141
pushd .
141142
cd tests/py/dynamo
142-
${CONDA_RUN} python -m pip install --pre pytest timm transformers parameterized expecttest --use-deprecated=legacy-resolver
143+
${CONDA_RUN} python -m pip install --pre pytest timm transformers parameterized expecttest==0.1.6 --use-deprecated=legacy-resolver
143144
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/dynamo_fe_test_results.xml --ir dynamo models/test_models_export.py
144145
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/export_serde_test_results.xml --ir dynamo models/test_export_serde.py
145146
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/dyn_models_export.xml --ir dynamo models/test_dyn_models.py
@@ -155,20 +156,20 @@ jobs:
155156
- repository: pytorch/tensorrt
156157
package-name: torch_tensorrt
157158
pre-script: packaging/pre_build_script.sh
158-
uses: pytorch/tensorrt/.github/workflows/linux-test.yml@main
159+
uses: ./.github/workflows/linux-test.yml
159160
with:
160161
job-name: tests-py-torch-compile-be
161162
repository: "pytorch/tensorrt"
162163
ref: ""
163164
test-infra-repository: pytorch/test-infra
164-
test-infra-ref: main
165+
test-infra-ref: release/2.1
165166
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
166167
pre-script: ${{ matrix.pre-script }}
167168
script: |
168169
export USE_HOST_DEPS=1
169170
pushd .
170171
cd tests/py/dynamo
171-
${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest --use-deprecated=legacy-resolver
172+
${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest==0.1.6 --use-deprecated=legacy-resolver
172173
${CONDA_RUN} python -m pytest -n 10 --junitxml=${RUNNER_TEST_RESULTS_DIR}/torch_compile_be_test_results.xml backend/
173174
${CONDA_RUN} python -m pytest -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/torch_comple_be_e2e_test_results.xml --ir torch_compile models/test_models.py
174175
popd
@@ -183,20 +184,20 @@ jobs:
183184
- repository: pytorch/tensorrt
184185
package-name: torch_tensorrt
185186
pre-script: packaging/pre_build_script.sh
186-
uses: pytorch/tensorrt/.github/workflows/linux-test.yml@main
187+
uses: ./.github/workflows/linux-test.yml
187188
with:
188189
job-name: tests-py-dynamo-core
189190
repository: "pytorch/tensorrt"
190191
ref: ""
191192
test-infra-repository: pytorch/test-infra
192-
test-infra-ref: main
193+
test-infra-ref: release/2.1
193194
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
194195
pre-script: ${{ matrix.pre-script }}
195196
script: |
196197
export USE_HOST_DEPS=1
197198
pushd .
198199
cd tests/py/dynamo
199-
${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest --use-deprecated=legacy-resolver
200+
${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest==0.1.6 --use-deprecated=legacy-resolver
200201
${CONDA_RUN} python -m pytest -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_runtime_test_results.xml runtime/
201202
${CONDA_RUN} python -m pytest -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_partitioning_test_results.xml partitioning/
202203
${CONDA_RUN} python -m pytest -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_lowering_test_results.xml lowering/

‎.github/workflows/linux-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,4 +191,4 @@ jobs:
191191

192192
concurrency:
193193
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ inputs.repository }}-${{ github.event_name == 'workflow_dispatch' }}-${{ inputs.job-name }}
194-
cancel-in-progress: true
194+
cancel-in-progress: true

‎py/requirements.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
numpy
22
packaging
33
pybind11==2.6.2
4-
torch==2.1.1
5-
torchvision==0.16.1
6-
--extra-index-url https://pypi.ngc.nvidia.com
4+
torch==2.1.2
5+
torchvision==0.16.2
6+
--extra-index-url https://pypi.nvidia.com
77
tensorrt==8.6.1
88
pyyaml

‎requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ pytest
88
transformers
99
timm
1010
parameterized
11-
expecttest
11+
expecttest==0.1.6

‎toolchains/ci_workspaces/WORKSPACE.x86_64.release.rhel.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ http_archive(
5959
name = "libtorch",
6060
build_file = "@//third_party/libtorch:BUILD",
6161
strip_prefix = "libtorch",
62-
urls = ["https://download.pytorch.org/libtorch/test/cu121/libtorch-cxx11-abi-shared-with-deps-latest.zip"],
62+
urls = ["https://download.pytorch.org/libtorch/test/cu121/libtorch-cxx11-abi-shared-with-deps-2.1.2%2Bcu121.zip"],
6363
)
6464

6565
http_archive(
6666
name = "libtorch_pre_cxx11_abi",
6767
build_file = "@//third_party/libtorch:BUILD",
6868
strip_prefix = "libtorch",
69-
urls = ["https://download.pytorch.org/libtorch/test/cu121/libtorch-shared-with-deps-latest.zip"],
69+
urls = ["https://download.pytorch.org/libtorch/test/cu121/libtorch-shared-with-deps-2.1.2%2Bcu121.zip"],
7070
)
7171

7272
####################################################################################

0 commit comments

Comments
 (0)