Skip to content

Commit 045f73a

Browse files
gs-olivegs-olive
committed
Return all tests
1 parent 5b7d785 commit 045f73a

File tree

3 files changed

+128
-126
lines changed

3 files changed

+128
-126
lines changed

‎.github/workflows/build-test.yml

+121-117
Original file line numberDiff line numberDiff line change
@@ -55,40 +55,41 @@ jobs:
5555
AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID: ${{ secrets.AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID }}
5656
AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY: ${{ secrets.AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY }}
5757

58-
# tests-py-torchscript-fe:
59-
# name: Test torchscript frontend [Python]
60-
# needs: [generate-matrix, build]
61-
# strategy:
62-
# fail-fast: false
63-
# matrix:
64-
# include:
65-
# - repository: pytorch/tensorrt
66-
# package-name: torch_tensorrt
67-
# pre-script: packaging/pre_build_script.sh
68-
# uses: ./.github/workflows/linux-test.yml
69-
# with:
70-
# job-name: tests-py-torchscript-fe
71-
# repository: "pytorch/tensorrt"
72-
# ref: ""
73-
# test-infra-repository: pytorch/test-infra
74-
# test-infra-ref: release/2.1
75-
# build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
76-
# pre-script: ${{ matrix.pre-script }}
77-
# script: |
78-
# export USE_HOST_DEPS=1
79-
# export LD_LIBRARY_PATH=/usr/lib64:$LD_LIBRARY_PATH
80-
# pushd .
81-
# cd tests/modules
82-
# ${CONDA_RUN} python -m pip install --pre -r requirements.txt --use-deprecated=legacy-resolver
83-
# ${CONDA_RUN} python hub.py
84-
# popd
85-
# pushd .
86-
# cd tests/py/ts
87-
# ${CONDA_RUN} python -m pip install --pre pytest timm transformers parameterized expecttest --use-deprecated=legacy-resolver
88-
# ${CONDA_RUN} python -m pytest api/
89-
# ${CONDA_RUN} python -m pytest models/
90-
# ${CONDA_RUN} python -m pytest integrations/
91-
# popd
58+
tests-py-torchscript-fe:
59+
name: Test torchscript frontend [Python]
60+
needs: [generate-matrix, build]
61+
strategy:
62+
fail-fast: false
63+
matrix:
64+
include:
65+
- repository: pytorch/tensorrt
66+
package-name: torch_tensorrt
67+
pre-script: packaging/pre_build_script.sh
68+
uses: ./.github/workflows/linux-test.yml
69+
with:
70+
job-name: tests-py-torchscript-fe
71+
repository: "pytorch/tensorrt"
72+
ref: ""
73+
test-infra-repository: pytorch/test-infra
74+
test-infra-ref: release/2.1
75+
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
76+
pre-script: ${{ matrix.pre-script }}
77+
channel: test
78+
script: |
79+
export USE_HOST_DEPS=1
80+
export LD_LIBRARY_PATH=/usr/lib64:$LD_LIBRARY_PATH
81+
pushd .
82+
cd tests/modules
83+
${CONDA_RUN} python -m pip install --pre -r requirements.txt --use-deprecated=legacy-resolver
84+
${CONDA_RUN} python hub.py
85+
popd
86+
pushd .
87+
cd tests/py/ts
88+
${CONDA_RUN} python -m pip install --pre pytest timm transformers parameterized expecttest --use-deprecated=legacy-resolver
89+
${CONDA_RUN} python -m pytest api/
90+
${CONDA_RUN} python -m pytest models/
91+
${CONDA_RUN} python -m pytest integrations/
92+
popd
9293
9394
tests-py-dynamo-converters:
9495
name: Test dynamo converters [Python]
@@ -118,88 +119,91 @@ jobs:
118119
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/dynamo_converters_test_results.xml -n 10 conversion/
119120
popd
120121
121-
# tests-py-dynamo-fe:
122-
# name: Test dynamo frontend [Python]
123-
# needs: [generate-matrix, build]
124-
# strategy:
125-
# fail-fast: false
126-
# matrix:
127-
# include:
128-
# - repository: pytorch/tensorrt
129-
# package-name: torch_tensorrt
130-
# pre-script: packaging/pre_build_script.sh
131-
# uses: ./.github/workflows/linux-test.yml
132-
# with:
133-
# job-name: tests-py-dynamo-fe
134-
# repository: "pytorch/tensorrt"
135-
# ref: ""
136-
# test-infra-repository: pytorch/test-infra
137-
# test-infra-ref: release/2.1
138-
# build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
139-
# pre-script: ${{ matrix.pre-script }}
140-
# script: |
141-
# export USE_HOST_DEPS=1
142-
# pushd .
143-
# cd tests/py/dynamo
144-
# ${CONDA_RUN} python -m pip install --pre pytest timm transformers parameterized expecttest --use-deprecated=legacy-resolver
145-
# ${CONDA_RUN} python -m pytest --ir dynamo models/test_models_export.py
146-
# ${CONDA_RUN} python -m pytest --ir dynamo models/test_export_serde.py
147-
# ${CONDA_RUN} python -m pytest --ir dynamo models/test_dyn_models.py
148-
# popd
122+
tests-py-dynamo-fe:
123+
name: Test dynamo frontend [Python]
124+
needs: [generate-matrix, build]
125+
strategy:
126+
fail-fast: false
127+
matrix:
128+
include:
129+
- repository: pytorch/tensorrt
130+
package-name: torch_tensorrt
131+
pre-script: packaging/pre_build_script.sh
132+
uses: ./.github/workflows/linux-test.yml
133+
with:
134+
job-name: tests-py-dynamo-fe
135+
repository: "pytorch/tensorrt"
136+
ref: ""
137+
test-infra-repository: pytorch/test-infra
138+
test-infra-ref: release/2.1
139+
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
140+
pre-script: ${{ matrix.pre-script }}
141+
channel: test
142+
script: |
143+
export USE_HOST_DEPS=1
144+
pushd .
145+
cd tests/py/dynamo
146+
${CONDA_RUN} python -m pip install --pre pytest timm transformers parameterized expecttest --use-deprecated=legacy-resolver
147+
${CONDA_RUN} python -m pytest --ir dynamo models/test_models_export.py
148+
${CONDA_RUN} python -m pytest --ir dynamo models/test_export_serde.py
149+
${CONDA_RUN} python -m pytest --ir dynamo models/test_dyn_models.py
150+
popd
149151
150-
# tests-py-torch-compile-be:
151-
# name: Test torch compile backend [Python]
152-
# needs: [generate-matrix, build]
153-
# strategy:
154-
# fail-fast: false
155-
# matrix:
156-
# include:
157-
# - repository: pytorch/tensorrt
158-
# package-name: torch_tensorrt
159-
# pre-script: packaging/pre_build_script.sh
160-
# uses: ./.github/workflows/linux-test.yml
161-
# with:
162-
# job-name: tests-py-torch-compile-be
163-
# repository: "pytorch/tensorrt"
164-
# ref: ""
165-
# test-infra-repository: pytorch/test-infra
166-
# test-infra-ref: release/2.1
167-
# build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
168-
# pre-script: ${{ matrix.pre-script }}
169-
# script: |
170-
# export USE_HOST_DEPS=1
171-
# pushd .
172-
# cd tests/py/dynamo
173-
# ${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest --use-deprecated=legacy-resolver
174-
# ${CONDA_RUN} python -m pytest -n 10 backend/
175-
# ${CONDA_RUN} python -m pytest -n 4 --ir torch_compile models/test_models.py
176-
# popd
152+
tests-py-torch-compile-be:
153+
name: Test torch compile backend [Python]
154+
needs: [generate-matrix, build]
155+
strategy:
156+
fail-fast: false
157+
matrix:
158+
include:
159+
- repository: pytorch/tensorrt
160+
package-name: torch_tensorrt
161+
pre-script: packaging/pre_build_script.sh
162+
uses: ./.github/workflows/linux-test.yml
163+
with:
164+
job-name: tests-py-torch-compile-be
165+
repository: "pytorch/tensorrt"
166+
ref: ""
167+
test-infra-repository: pytorch/test-infra
168+
test-infra-ref: release/2.1
169+
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
170+
pre-script: ${{ matrix.pre-script }}
171+
channel: test
172+
script: |
173+
export USE_HOST_DEPS=1
174+
pushd .
175+
cd tests/py/dynamo
176+
${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest --use-deprecated=legacy-resolver
177+
${CONDA_RUN} python -m pytest -n 10 backend/
178+
${CONDA_RUN} python -m pytest -n 4 --ir torch_compile models/test_models.py
179+
popd
177180
178-
# tests-py-dynamo-core:
179-
# name: Test dynamo core [Python]
180-
# needs: [generate-matrix, build]
181-
# strategy:
182-
# fail-fast: false
183-
# matrix:
184-
# include:
185-
# - repository: pytorch/tensorrt
186-
# package-name: torch_tensorrt
187-
# pre-script: packaging/pre_build_script.sh
188-
# uses: ./.github/workflows/linux-test.yml
189-
# with:
190-
# job-name: tests-py-dynamo-core
191-
# repository: "pytorch/tensorrt"
192-
# ref: ""
193-
# test-infra-repository: pytorch/test-infra
194-
# test-infra-ref: release/2.1
195-
# build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
196-
# pre-script: ${{ matrix.pre-script }}
197-
# script: |
198-
# export USE_HOST_DEPS=1
199-
# pushd .
200-
# cd tests/py/dynamo
201-
# ${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest --use-deprecated=legacy-resolver
202-
# ${CONDA_RUN} python -m pytest -n 4 runtime/
203-
# ${CONDA_RUN} python -m pytest -n 4 partitioning/
204-
# ${CONDA_RUN} python -m pytest -n 4 lowering/
205-
# popd
181+
tests-py-dynamo-core:
182+
name: Test dynamo core [Python]
183+
needs: [generate-matrix, build]
184+
strategy:
185+
fail-fast: false
186+
matrix:
187+
include:
188+
- repository: pytorch/tensorrt
189+
package-name: torch_tensorrt
190+
pre-script: packaging/pre_build_script.sh
191+
uses: ./.github/workflows/linux-test.yml
192+
with:
193+
job-name: tests-py-dynamo-core
194+
repository: "pytorch/tensorrt"
195+
ref: ""
196+
test-infra-repository: pytorch/test-infra
197+
test-infra-ref: release/2.1
198+
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
199+
pre-script: ${{ matrix.pre-script }}
200+
channel: test
201+
script: |
202+
export USE_HOST_DEPS=1
203+
pushd .
204+
cd tests/py/dynamo
205+
${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest --use-deprecated=legacy-resolver
206+
${CONDA_RUN} python -m pytest -n 4 runtime/
207+
${CONDA_RUN} python -m pytest -n 4 partitioning/
208+
${CONDA_RUN} python -m pytest -n 4 lowering/
209+
popd

‎py/requirements.txt

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
numpy
2-
packaging>=23
2+
packaging
33
pybind11==2.6.2
4-
--extra-index-url https://download.pytorch.org/whl/test/cu121
5-
--extra-index-url https://download.pytorch.org/whl/test/cu118
6-
torch>=2.1.0,<=2.2.0
7-
torchvision>=0.16.0,<=0.17.0
8-
--extra-index-url https://pypi.ngc.nvidia.com
4+
torch==2.1.1
5+
torchvision==0.16.1
6+
--extra-index-url https://pypi.nvidia.com
97
tensorrt==8.6.1
108
pyyaml

‎pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ requires = [
99
"typing-extensions>=4.7.0",
1010
"future>=0.18.3",
1111
"tensorrt>=8.6,<8.7",
12-
"torch>=2.1.0,<=2.2.0",
12+
"torch>=2.1.0,<2.2.0",
1313
"pybind11==2.6.2",
1414
"numpy",
1515
]
@@ -41,7 +41,7 @@ readme = {file = "py/README.md", content-type = "text/markdown"}
4141
requires-python = ">=3.8"
4242
keywords = ["pytorch", "torch", "tensorrt", "trt", "ai", "artificial intelligence", "ml", "machine learning", "dl", "deep learning", "compiler", "dynamo", "torchscript", "inference"]
4343
dependencies = [
44-
"torch>=2.1.0,<=2.2.0",
44+
"torch>=2.1.0,<2.2.0",
4545
"tensorrt>=8.6,<8.7",
4646
"packaging>=23",
4747
"numpy",
@@ -50,7 +50,7 @@ dependencies = [
5050
dynamic = ["version"]
5151

5252
[project.optional-dependencies]
53-
torchvision = ["torchvision>=0.16.0,<=0.17.0"]
53+
torchvision = ["torchvision>=0.16.0,<0.17.0"]
5454

5555
[project.urls]
5656
Homepage = "https://pytorch.org/tensorrt"

0 commit comments

Comments
 (0)