Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 70121f0

Browse files
committedJan 4, 2024
cherry-pick: Port most changes from main
- Excluded all changes to `docs` and `.github` directories; did include documentation changes and all other commits, with the exception of #2451 and #2445 for reasons discussed - Made necessary changes to switch over to Torch 2.2.0 rc builds, including updating imports
1 parent b6dd22b commit 70121f0

File tree

89 files changed

+4229
-694
lines changed

Some content is hidden

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

89 files changed

+4229
-694
lines changed
 

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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} torch==2.1.2 torchvision==0.16.2 pyyaml
5+
${CONDA_RUN} ${PIP_INSTALL_TORCH} torch==2.2.0 torchvision==0.17.0 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

‎.github/workflows/build-test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ on:
1515

1616
jobs:
1717
generate-matrix:
18-
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1
18+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.2
1919
with:
2020
package-type: wheel
2121
os: linux
2222
test-infra-repository: pytorch/test-infra
23-
test-infra-ref: release/2.1
23+
test-infra-ref: release/2.2
2424
channel: test
2525
with-rocm: false
2626
with-cpu: false
@@ -38,12 +38,12 @@ jobs:
3838
smoke-test-script: ""
3939
package-name: torch_tensorrt
4040
name: Build torch-tensorrt whl package
41-
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.1
41+
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.2
4242
with:
4343
repository: ${{ matrix.repository }}
4444
ref: ""
4545
test-infra-repository: pytorch/test-infra
46-
test-infra-ref: release/2.1
46+
test-infra-ref: release/2.2
4747
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
4848
pre-script: ${{ matrix.pre-script }}
4949
env-var-script: ${{ matrix.env-var-script }}
@@ -71,7 +71,7 @@ jobs:
7171
repository: "pytorch/tensorrt"
7272
ref: ""
7373
test-infra-repository: pytorch/test-infra
74-
test-infra-ref: release/2.1
74+
test-infra-ref: release/2.2
7575
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
7676
pre-script: ${{ matrix.pre-script }}
7777
script: |
@@ -106,7 +106,7 @@ jobs:
106106
repository: "pytorch/tensorrt"
107107
ref: ""
108108
test-infra-repository: pytorch/test-infra
109-
test-infra-ref: release/2.1
109+
test-infra-ref: release/2.2
110110
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
111111
pre-script: ${{ matrix.pre-script }}
112112
script: |
@@ -133,7 +133,7 @@ jobs:
133133
repository: "pytorch/tensorrt"
134134
ref: ""
135135
test-infra-repository: pytorch/test-infra
136-
test-infra-ref: release/2.1
136+
test-infra-ref: release/2.2
137137
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
138138
pre-script: ${{ matrix.pre-script }}
139139
script: |
@@ -162,7 +162,7 @@ jobs:
162162
repository: "pytorch/tensorrt"
163163
ref: ""
164164
test-infra-repository: pytorch/test-infra
165-
test-infra-ref: release/2.1
165+
test-infra-ref: release/2.2
166166
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
167167
pre-script: ${{ matrix.pre-script }}
168168
script: |
@@ -190,7 +190,7 @@ jobs:
190190
repository: "pytorch/tensorrt"
191191
ref: ""
192192
test-infra-repository: pytorch/test-infra
193-
test-infra-ref: release/2.1
193+
test-infra-ref: release/2.2
194194
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
195195
pre-script: ${{ matrix.pre-script }}
196196
script: |

0 commit comments

Comments
 (0)