From aa4fe4e00fed57964eccab7588bf5d6a2a05519a Mon Sep 17 00:00:00 2001
From: Naren Dasan <naren@narendasan.com>
Date: Thu, 23 May 2024 13:37:04 -0700
Subject: [PATCH 1/2] chore: Make from and to methods use the same TRT API
Signed-off-by: Naren Dasan <naren@narendasan.com>
Signed-off-by: Naren Dasan <narens@nvidia.com>
---
py/torch_tensorrt/_enums.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/py/torch_tensorrt/_enums.py b/py/torch_tensorrt/_enums.py
index 32587a38f2..ed0b00a109 100644
--- a/py/torch_tensorrt/_enums.py
+++ b/py/torch_tensorrt/_enums.py
@@ -99,21 +99,21 @@ def _from(
f"Provided an unsupported data type as a data type for translation (support: bool, int, long, half, float, bfloat16), got: {t}"
)
elif isinstance(t, trt.DataType):
- if t == trt.uint8:
+ if t == trt.DataType.UINT8:
return dtype.u8
- elif t == trt.int8:
+ elif t == trt.DataType.INT8:
return dtype.i8
- elif t == trt.int32:
+ elif t == trt.DataType.INT32:
return dtype.i32
- elif t == trt.int64:
+ elif t == trt.DataType.INT64:
return dtype.i64
- elif t == trt.float16:
+ elif t == trt.DataType.HALF:
return dtype.f16
- elif t == trt.float32:
+ elif t == trt.DataType.FLOAT:
return dtype.f32
- elif t == trt.bool:
+ elif t == trt.DataType.BOOL:
return dtype.b
- elif t == trt.bf16:
+ elif t == trt.DataType.BF16:
return dtype.bf16
else:
raise TypeError(
From d84de7c8e6b4c43f8bec9f9206c72401822bd86f Mon Sep 17 00:00:00 2001
From: Naren Dasan <naren@narendasan.com>
Date: Thu, 23 May 2024 14:17:31 -0700
Subject: [PATCH 2/2] refactor: Fix test dependencies
Signed-off-by: Naren Dasan <naren@narendasan.com>
Signed-off-by: Naren Dasan <narens@nvidia.com>
---
.../{build-test.yml => build-test-linux.yml} | 16 ++++++++--------
.github/workflows/build-test-windows.yml | 8 ++++----
tests/py/requirements.txt | 6 ++++++
3 files changed, 18 insertions(+), 12 deletions(-)
rename .github/workflows/{build-test.yml => build-test-linux.yml} (90%)
create mode 100644 tests/py/requirements.txt
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test-linux.yml
similarity index 90%
rename from .github/workflows/build-test.yml
rename to .github/workflows/build-test-linux.yml
index 95e3850013..a1fd6641c4 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test-linux.yml
@@ -1,4 +1,4 @@
-name: Build and test linux wheels
+name: Build and test Linux wheels
on:
pull_request:
@@ -86,7 +86,7 @@ jobs:
popd
pushd .
cd tests/py/ts
- ${CONDA_RUN} python -m pip install --pre pytest timm transformers parameterized expecttest==0.1.6 --use-deprecated=legacy-resolver
+ ${CONDA_RUN} python -m pip install --pre -r ../requirements.txt
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_api_test_results.xml api/
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_models_test_results.xml models/
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_integrations_test_results.xml integrations/
@@ -117,7 +117,7 @@ jobs:
export LD_LIBRARY_PATH=/opt/torch-tensorrt-builds/TensorRT-10.0.1.6/lib:$LD_LIBRARY_PATH
pushd .
cd tests/py/dynamo
- ${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest==0.1.6 --use-deprecated=legacy-resolver
+ ${CONDA_RUN} python -m pip install --pre -r ../requirements.txt
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/dynamo_converters_test_results.xml -n 10 conversion/
popd
@@ -146,7 +146,7 @@ jobs:
export LD_LIBRARY_PATH=/opt/torch-tensorrt-builds/TensorRT-10.0.1.6/lib:$LD_LIBRARY_PATH
pushd .
cd tests/py/dynamo
- ${CONDA_RUN} python -m pip install --pre pytest timm transformers parameterized expecttest==0.1.6 --use-deprecated=legacy-resolver
+ ${CONDA_RUN} python -m pip install --pre -r ../requirements.txt
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/dynamo_fe_test_results.xml --ir dynamo models/test_models_export.py
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/dyn_models_export.xml --ir dynamo models/test_dyn_models.py
popd
@@ -176,7 +176,7 @@ jobs:
export LD_LIBRARY_PATH=/opt/torch-tensorrt-builds/TensorRT-10.0.1.6/lib:$LD_LIBRARY_PATH
pushd .
cd tests/py/dynamo
- ${CONDA_RUN} python -m pip install --pre pytest timm transformers parameterized expecttest==0.1.6 --use-deprecated=legacy-resolver
+ ${CONDA_RUN} python -m pip install --pre -r ../requirements.txt
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/export_serde_test_results.xml --ir dynamo models/test_export_serde.py
popd
@@ -205,7 +205,7 @@ jobs:
export LD_LIBRARY_PATH=/opt/torch-tensorrt-builds/TensorRT-10.0.1.6/lib:$LD_LIBRARY_PATH
pushd .
cd tests/py/dynamo
- ${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest==0.1.6 --use-deprecated=legacy-resolver
+ ${CONDA_RUN} python -m pip install --pre -r ../requirements.txt
${CONDA_RUN} python -m pytest -n 10 --junitxml=${RUNNER_TEST_RESULTS_DIR}/torch_compile_be_test_results.xml backend/
${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
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/torch_compile_dyn_models_export.xml --ir torch_compile models/test_dyn_models.py
@@ -236,7 +236,7 @@ jobs:
export LD_LIBRARY_PATH=/opt/torch-tensorrt-builds/TensorRT-10.0.1.6/lib:$LD_LIBRARY_PATH
pushd .
cd tests/py/dynamo
- ${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest==0.1.6 --use-deprecated=legacy-resolver
+ ${CONDA_RUN} python -m pip install --pre -r ../requirements.txt
${CONDA_RUN} python -m pytest -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_runtime_test_results.xml runtime/
${CONDA_RUN} python -m pytest -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_partitioning_test_results.xml partitioning/
${CONDA_RUN} python -m pytest -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_lowering_test_results.xml lowering/
@@ -266,6 +266,6 @@ jobs:
export LD_LIBRARY_PATH=/opt/torch-tensorrt-builds/TensorRT-10.0.1.6/lib:$LD_LIBRARY_PATH
pushd .
cd tests/py/core
- ${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest==0.1.6 --use-deprecated=legacy-resolver
+ ${CONDA_RUN} python -m pip install --pre -r ../requirements.txt
${CONDA_RUN} python -m pytest -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_core_test_results.xml .
popd
diff --git a/.github/workflows/build-test-windows.yml b/.github/workflows/build-test-windows.yml
index c7f1ba1d6b..03c658ae6b 100644
--- a/.github/workflows/build-test-windows.yml
+++ b/.github/workflows/build-test-windows.yml
@@ -72,7 +72,7 @@ jobs:
export USE_HOST_DEPS=1
pushd .
cd tests/py/dynamo
- ${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest==0.1.6 --use-deprecated=legacy-resolver
+ ${CONDA_RUN} python -m pip install --pre -r ../requirements.txt
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/dynamo_converters_test_results.xml -n 10 conversion/
popd
@@ -98,7 +98,7 @@ jobs:
export USE_HOST_DEPS=1
pushd .
cd tests/py/dynamo
- ${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest==0.1.6 --use-deprecated=legacy-resolver
+ ${CONDA_RUN} python -m pip install --pre -r ../requirements.txt
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/dynamo_fe_test_results.xml --ir dynamo models/test_models_export.py
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/dyn_models_export.xml --ir dynamo models/test_dyn_models.py
popd
@@ -125,7 +125,7 @@ jobs:
export USE_HOST_DEPS=1
pushd .
cd tests/py/dynamo
- ${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest==0.1.6 --use-deprecated=legacy-resolver
+ ${CONDA_RUN} python -m pip install --pre -r ../requirements.txt
${CONDA_RUN} python -m pytest -n 10 --junitxml=${RUNNER_TEST_RESULTS_DIR}/torch_compile_be_test_results.xml backend/
${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
popd
@@ -152,7 +152,7 @@ jobs:
export USE_HOST_DEPS=1
pushd .
cd tests/py/dynamo
- ${CONDA_RUN} python -m pip install --pre pytest-xdist timm transformers parameterized expecttest==0.1.6 --use-deprecated=legacy-resolver
+ ${CONDA_RUN} python -m pip install --pre -r ../requirements.txt
${CONDA_RUN} python -m pytest -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_runtime_test_results.xml runtime/
${CONDA_RUN} python -m pytest -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_partitioning_test_results.xml partitioning/
${CONDA_RUN} python -m pytest -n 4 --junitxml=${RUNNER_TEST_RESULTS_DIR}/tests_py_dynamo_core_lowering_test_results.xml lowering/
diff --git a/tests/py/requirements.txt b/tests/py/requirements.txt
new file mode 100644
index 0000000000..0df01cb0f2
--- /dev/null
+++ b/tests/py/requirements.txt
@@ -0,0 +1,6 @@
+pytest>=8.2.1
+pytest-xdist>=3.6.1
+timm>=1.0.3
+transformers==4.39.3
+parameterized>=0.2.0
+expecttest==0.1.6
\ No newline at end of file