Skip to content

Commit ff18dcd

Browse files
zewenli98zewenli98
authored
Merge branch 'pytorch:main' into fully_connected_dynamo_converter
2 parents 00d89fc + c377c48 commit ff18dcd

File tree

207 files changed

+31133
-9015
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+31133
-9015
lines changed

‎.github/workflows/build-test.yml

+34-33
Original file line numberDiff line numberDiff line change
@@ -54,39 +54,40 @@ jobs:
5454
AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID: ${{ secrets.AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID }}
5555
AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY: ${{ secrets.AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY }}
5656

57-
# tests-py-torchscript-fe:
58-
# name: Test torchscript frontend [Python]
59-
# needs: [generate-matrix, build]
60-
# strategy:
61-
# fail-fast: false
62-
# matrix:
63-
# include:
64-
# - repository: pytorch/tensorrt
65-
# package-name: torch_tensorrt
66-
# pre-script: packaging/pre_build_script.sh
67-
# uses: pytorch/tensorrt/.github/workflows/linux-test.yml@main
68-
# with:
69-
# job-name: tests-py-torchscript-fe
70-
# repository: "pytorch/tensorrt"
71-
# ref: ""
72-
# test-infra-repository: pytorch/test-infra
73-
# test-infra-ref: main
74-
# build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
75-
# pre-script: ${{ matrix.pre-script }}
76-
# script: |
77-
# export USE_HOST_DEPS=1
78-
# pushd .
79-
# cd tests/modules
80-
# ${CONDA_RUN} python -m pip install -r requirements.txt
81-
# ${CONDA_RUN} python hub.py
82-
# popd
83-
# pushd .
84-
# cd tests/py/ts
85-
# ${CONDA_RUN} python -m pip install --pre pytest timm transformers parameterized expecttest --use-deprecated=legacy-resolver
86-
# ${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_api_test_results.xml api/
87-
# ${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_models_test_results.xml models/
88-
# ${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_integrations_test_results.xml integrations/
89-
# popd
57+
tests-py-torchscript-fe:
58+
name: Test torchscript frontend [Python]
59+
needs: [generate-matrix, build]
60+
strategy:
61+
fail-fast: false
62+
matrix:
63+
include:
64+
- repository: pytorch/tensorrt
65+
package-name: torch_tensorrt
66+
pre-script: packaging/pre_build_script.sh
67+
uses: pytorch/tensorrt/.github/workflows/linux-test.yml@main
68+
with:
69+
job-name: tests-py-torchscript-fe
70+
repository: "pytorch/tensorrt"
71+
ref: ""
72+
test-infra-repository: pytorch/test-infra
73+
test-infra-ref: main
74+
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
75+
pre-script: ${{ matrix.pre-script }}
76+
script: |
77+
export USE_HOST_DEPS=1
78+
export LD_LIBRARY_PATH=/usr/lib64:$LD_LIBRARY_PATH
79+
pushd .
80+
cd tests/modules
81+
${CONDA_RUN} python -m pip install --pre -r requirements.txt --use-deprecated=legacy-resolver
82+
${CONDA_RUN} python hub.py
83+
popd
84+
pushd .
85+
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 pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_api_test_results.xml api/
88+
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_models_test_results.xml models/
89+
${CONDA_RUN} python -m pytest --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_integrations_test_results.xml integrations/
90+
popd
9091
9192
tests-py-dynamo-converters:
9293
name: Test dynamo converters [Python]

‎.github/workflows/docgen.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ jobs:
2626
run: |
2727
git config --global --add safe.directory /__w/TensorRT/TensorRT
2828
echo "/opt/python/cp311-cp311/bin/" >> $GITHUB_PATH
29-
29+
3030
- name: Install base deps
3131
run: |
32-
python3 -m pip install pyyaml torch --pre --extra-index-url https://download.pytorch.org/whl/nightly/cu121
32+
python3 -m pip install pip --upgrade
33+
python3 -m pip install pyyaml numpy torch --pre --extra-index-url https://download.pytorch.org/whl/nightly/cu121
3334
./packaging/pre_build_script.sh
3435
- name: Get HEAD SHA
3536
id: vars
3637
run: echo "sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
3738
- name: Build Python Package
3839
run: |
39-
python3 -m pip install pip --upgrade
4040
python3 -m pip install --pre . --extra-index-url https://download.pytorch.org/whl/nightly/cu121
4141
- name: Generate New Docs
4242
run: |

‎.github/workflows/nightlies.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,18 @@ on:
88
jobs:
99
cut_nightly:
1010
runs-on: ubuntu-latest
11+
environment: trigger-nightly
1112
timeout-minutes: 60
1213
steps:
13-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1415
with:
1516
ref: main
16-
persist-credentials: false
17+
token: ${{ secrets.GH_PYTORCHBOT_TOKEN }}
1718
- name: Create nightly commit
1819
shell: bash
1920
run: |
20-
git config --global user.email "torch-tensorrt.github.bot@nvidia.com"
21-
git config --global user.name "Torch-TensorRT Github Bot"
21+
git config --global user.email "pytorchbot@pytorch.com"
22+
git config --global user.name "pytorchbot"
2223
git fetch origin nightly
2324
HEAD_COMMIT_HASH=$(git rev-parse HEAD)
2425
NIGHTLY_DATE=$(date +"%Y-%m-%d")

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ torch.jit.save(trt_ts_module, "trt_torchscript_module.ts") # save the TRT embedd
116116
These are the following dependencies used to verify the testcases. Torch-TensorRT can work with other versions, but the tests are not guaranteed to pass.
117117

118118
- Bazel 5.2.0
119-
- Libtorch 2.1.0.dev20230703 (built with CUDA 12.1)
119+
- Libtorch 2.2.0.dev (latest nightly) (built with CUDA 12.1)
120120
- CUDA 12.1
121121
- cuDNN 8.8.1
122122
- TensorRT 8.6.1

‎cpp/include/torch_tensorrt/macros.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#define STR(x) XSTR(x)
2525

2626
#define TORCH_TENSORRT_MAJOR_VERSION 2
27-
#define TORCH_TENSORRT_MINOR_VERSION 0
27+
#define TORCH_TENSORRT_MINOR_VERSION 2
2828
#define TORCH_TENSORRT_PATCH_VERSION 0
2929
#define TORCH_TENSORRT_VERSION \
3030
STR(TORCH_TENSORRT_MAJOR_VERSION) \

‎dev_dep_versions.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__: "2.0.0.dev0"
1+
__version__: "2.2.0.dev0"
22
__cuda_version__: "12.1"
33
__cudnn_version__: "8.8"
44
__tensorrt_version__: "8.6"

0 commit comments

Comments
 (0)