From 2b57efd5ca22b850325d7c39dd1f6c906d7f042a Mon Sep 17 00:00:00 2001 From: Dheeraj Peri Date: Thu, 22 Sep 2022 12:47:24 -0700 Subject: [PATCH 01/17] chore: Fix centralized partititoning Signed-off-by: Dheeraj Peri --- core/partitioning/CMakeLists.txt | 3 ++- core/partitioning/shape_analysis.cpp | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/partitioning/CMakeLists.txt b/core/partitioning/CMakeLists.txt index 7f83b3d891..14d4cc373e 100644 --- a/core/partitioning/CMakeLists.txt +++ b/core/partitioning/CMakeLists.txt @@ -4,6 +4,7 @@ add_library(${lib_name} OBJECT) set(CXX_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/partitioning.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/shape_analysis.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/stitching.cpp" ) set(HEADER_FILES @@ -36,4 +37,4 @@ add_subdirectory(partitioningctx) add_subdirectory(partitioninginfo) add_subdirectory(segmentedblock) -install(FILES ${HEADER_FILES} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/torch_tensorrt/core/partitioning") \ No newline at end of file +install(FILES ${HEADER_FILES} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/torch_tensorrt/core/partitioning") diff --git a/core/partitioning/shape_analysis.cpp b/core/partitioning/shape_analysis.cpp index 514681a088..21696e8204 100644 --- a/core/partitioning/shape_analysis.cpp +++ b/core/partitioning/shape_analysis.cpp @@ -33,8 +33,6 @@ std::unordered_map generateRandomI for (auto& input : inputs) { if (input.first->type()->kind() == torch::jit::TypeKind::ListType) { - // create list - std::vector list; c10::TypePtr elementType = c10::TensorType::get(); auto generic_list = c10::impl::GenericList(elementType); for (size_t i = 0; i < input.second.size(); i++) { From 93ec6b0115298f22063191cb9602e2b41d84f0bb Mon Sep 17 00:00:00 2001 From: Dheeraj Peri Date: Fri, 23 Sep 2022 02:15:36 -0700 Subject: [PATCH 02/17] chore: Add new parititoning headers to py packaging Signed-off-by: Dheeraj Peri --- py/setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/py/setup.py b/py/setup.py index 46a89ba78b..30aa49599e 100644 --- a/py/setup.py +++ b/py/setup.py @@ -422,6 +422,9 @@ def run(self): "include/torch_tensorrt/core/lowering/*.h", "include/torch_tensorrt/core/lowering/passes/*.h", "include/torch_tensorrt/core/partitioning/*.h", + "include/torch_tensorrt/core/partitioning/segmentedblock/*.h", + "include/torch_tensorrt/core/partitioning/partitioninginfo/*.h", + "include/torch_tensorrt/core/partitioning/partitioningctx/*.h", "include/torch_tensorrt/core/plugins/*.h", "include/torch_tensorrt/core/plugins/impl/*.h", "include/torch_tensorrt/core/runtime/*.h", From 789be6172b109e01b9047365d324b61e6f26f004 Mon Sep 17 00:00:00 2001 From: Dheeraj Peri Date: Fri, 23 Sep 2022 13:17:19 -0700 Subject: [PATCH 03/17] chore: Add partitioning headers to C++ tar package Signed-off-by: Dheeraj Peri --- BUILD | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BUILD b/BUILD index 238d93ed05..98792b2dc1 100644 --- a/BUILD +++ b/BUILD @@ -22,6 +22,9 @@ pkg_tar( "//core/lowering:include", "//core/lowering/passes:include", "//core/partitioning:include", + "//core/partitioning/segmentedblock:include", + "//core/partitioning/partitioninginfo:include", + "//core/partitioning/partitioningctx:include", "//core/plugins:impl_include", "//core/plugins:include", "//core/runtime:include", From 7013e9d7a64931f82ead537376fcfbbffb3b9075 Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Thu, 22 Sep 2022 19:22:13 -0700 Subject: [PATCH 04/17] chore: Move master to test nightly only Signed-off-by: Naren Dasan Signed-off-by: Naren Dasan --- .circleci/config.yml | 382 +++++------------- WORKSPACE | 8 +- py/requirements.txt | 4 +- py/setup.py | 2 +- .../WORKSPACE.x86_64.release.rhel | 9 +- .../WORKSPACE.x86_64.release.ubuntu | 6 +- 6 files changed, 123 insertions(+), 288 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 16dda8609f..e1482b2462 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -488,7 +488,7 @@ commands: # Define a job to be invoked later in a workflow. # See: https://circleci.com/docs/2.0/configuration-reference/#jobs jobs: - build-aarch64-pyt-jetson: + build-aarch64-jetson: parameters: torch-build: type: string @@ -559,9 +559,9 @@ jobs: - jetson - store_artifacts: path: /tmp/dist/jetson - destination: aarch64-pyt-jetson + destination: aarch64-jetson - build-x86_64-pyt-release: + build-x86_64-linux: parameters: torch-build: type: string @@ -578,8 +578,8 @@ jobs: - create-env: os: "ubuntu2004" platform: "x86_64" - cudnn-version: << pipeline.parameters.cudnn-release-version >> - trt-version-short: << pipeline.parameters.trt-release-version-short >> + cudnn-version: << pipeline.parameters.cudnn-version >> + trt-version-short: << pipeline.parameters.trt-version-short >> bazel-version: << pipeline.parameters.bazel-version >> bazel-platform: "x86_64" - install-torch-from-index: @@ -594,64 +594,19 @@ jobs: steps: - build-py - run: - name: Move to release dir - command: | - mkdir -p /tmp/dist/release - cp -r /tmp/dist/builds/* /tmp/dist/release - - persist_to_workspace: - root: /tmp/dist - paths: - - release - - store_artifacts: - path: /tmp/dist/release - destination: x86_64-pyt-release - - build-x86_64-pyt-nightly: - parameters: - torch-build: - type: string - torch-build-index: - type: string - cxx11-abi: - type: boolean - default: false - machine: - image: ubuntu-2004-cuda-11.4:202110-01 - resource_class: xlarge - steps: - - checkout - - create-env: - os: "ubuntu2004" - platform: "x86_64" - cudnn-version: << pipeline.parameters.cudnn-nightly-version >> - trt-version-short: << pipeline.parameters.trt-nightly-version-short >> - bazel-version: << pipeline.parameters.bazel-version >> - bazel-platform: "x86_64" - - install-torch-from-index: - torch-build: << parameters.torch-build >> - torch-build-index: << parameters.torch-build-index >> - - when: - condition: << parameters.cxx11-abi >> - steps: - - build-py-cxx11-abi - - unless: - condition: << parameters.cxx11-abi >> - steps: - - build-py - - run: - name: Move to nightly dir + name: Move to build dir command: | - mkdir -p /tmp/dist/nightly - cp -r /tmp/dist/builds/* /tmp/dist/nightly + mkdir -p /tmp/dist/x86_64-linux + cp -r /tmp/dist/builds/* /tmp/dist/x86_64-linux - persist_to_workspace: root: /tmp/dist paths: - - nightly + - x86_64-linux - store_artifacts: - path: /tmp/dist/nightly - destination: x86_64-pyt-nightly + path: /tmp/dist/x86_64-linux + destination: x86_64-linux - test-core-cpp-x86_64: + test-core-cpp-x86_64-linux: parameters: torch-build: type: string @@ -663,8 +618,6 @@ jobs: type: string cudnn-version: type: string - channel: - type: string machine: image: ubuntu-2004-cuda-11.4:202110-01 resource_class: gpu.nvidia.large @@ -687,14 +640,12 @@ jobs: at: /tmp/dist - run: name: "Install torch-tensorrt" - command: pip3 install /tmp/dist/<< parameters.channel >>/* + command: pip3 install /tmp/dist/x86_64-linux/* - dump-test-env - test-ts-core - test-py-ts-x86_64: + test-py-ts-x86_64-linux: parameters: - channel: - type: string torch-build: type: string torch-build-index: @@ -712,7 +663,7 @@ jobs: at: /tmp/dist - run: name: "Install torch-tensorrt" - command: pip3 install /tmp/dist/<< parameters.channel >>/* + command: pip3 install /tmp/dist/x86_64-linux/* # We install torch after torch-trt because pip automatically enforces the version constraint otherwise - install-torch-from-index: torch-build: << parameters.torch-build >> @@ -720,7 +671,7 @@ jobs: - dump-test-env - test-ts-py-api - test-py-fx-x86_64: + test-py-fx-x86_64-linux: parameters: channel: type: string @@ -741,7 +692,7 @@ jobs: at: /tmp/dist/ - run: name: "Install torch-tensorrt" - command: pip3 install /tmp/dist/<< parameters.channel >>/* + command: pip3 install /tmp/dist/x86_64-linux/* # We install torch after torch-trt because pip automatically enforces the version constraint otherwise - install-torch-from-index: torch-build: << parameters.torch-build >> @@ -749,7 +700,7 @@ jobs: - dump-test-env - test-fx - package-x86_64: + package-x86_64-linux: parameters: enabled: type: boolean @@ -770,7 +721,7 @@ jobs: name: "Build packaging container" command: | cd ~/project/py/ - docker build -t torch_tensorrt_release_env --build-arg trt_version=<< pipeline.parameters.trt-release-version-short >> -f ci/Dockerfile.ci . + docker build -t torch_tensorrt_release_env --build-arg trt_version=<< pipeline.parameters.trt-version-short >> -f ci/Dockerfile.ci . - run: name: Build Python packages and pre-cxx11-abi tarball command: | @@ -780,8 +731,8 @@ jobs: - create-env: os: "ubuntu2004" platform: "x86_64" - cudnn-version: << pipeline.parameters.cudnn-release-version >> - trt-version-short: << pipeline.parameters.trt-release-version-short >> + cudnn-version: << pipeline.parameters.cudnn-version >> + trt-version-short: << pipeline.parameters.trt-version-short >> bazel-version: << pipeline.parameters.bazel-version >> bazel-platform: "x86_64" - run: @@ -802,11 +753,11 @@ jobs: - run: name: Collect packages command: | - mkdir -p /tmp/dist/release - cp -r ~/project/py/dist/* /tmp/dist/release + mkdir -p /tmp/dist/x86_64-linux + cp -r ~/project/py/dist/* /tmp/dist/x86_64-linux - store_artifacts: - path: /tmp/dist/release - destination: x86_64-release-pkgs + path: /tmp/dist/x86_64-linux + destination: x86_64-linux-pkgs - unless: condition: << parameters.enabled >> steps: @@ -814,7 +765,7 @@ jobs: name: Skipped packaging command: echo -e "Packaging stage not enabled" - package-jetson: + package-aarch64-jetson: parameters: enabled: type: boolean @@ -890,9 +841,9 @@ jobs: cp -r ~/project/py/dist/* /tmp/dist/jetson - store_artifacts: path: /tmp/dist/jetson - destination: aarch64-release-pkgs + destination: aarch64-jetson-pkgs - build-x86_64-cmake: + build-x86_64-linux-cmake: parameters: cudnn-version: type: string @@ -932,7 +883,7 @@ jobs: path: /tmp/dist/cmake destination: x86_64-cmake - build-x86_64-pyt-ngc: + build-x86_64-linux-ngc: parameters: torch-base-image: type: string @@ -996,36 +947,19 @@ parameters: default: "5.2.0" # Nightly platform config - torch-nightly-build: + torch-build: type: string - default: "1.13.0.dev20220825+cu116" - torch-nightly-build-index: + default: "1.13.0.dev20220922+cu117" + torch-build-index: type: string - default: "https://download.pytorch.org/whl/nightly/cu116" - cudnn-nightly-version: + default: "https://download.pytorch.org/whl/nightly/cu117" + cudnn-version: type: string default: "8.4.1" - trt-nightly-version-short: + trt-version-short: type: string default: "8.4.1" - trt-nightly-version-long: - type: string - default: "8.4.3.1" - - # Release platform config - torch-release-build: - type: string - default: "1.12.1+cu116" - torch-release-build-index: - type: string - default: "https://download.pytorch.org/whl/cu116" - cudnn-release-version: - type: string - default: "8.4.1" - trt-release-version-short: - type: string - default: "8.4.1" - trt-release-version-long: + trt-version-long: type: string default: "8.4.3.1" @@ -1071,143 +1005,97 @@ workflows: - master - release/**/* jobs: - - build-aarch64-pyt-jetson: + - build-aarch64-jetson: torch-build: << pipeline.parameters.torch-jetson-build >> jetpack-version: << pipeline.parameters.jetpack-version >> python-version: 3.8.10 - - build-x86_64-pyt-release: - torch-build: << pipeline.parameters.torch-release-build >> - torch-build-index: << pipeline.parameters.torch-release-build-index >> - - - test-core-cpp-x86_64: - name: test-core-cpp-x86_64-pyt-release - channel: "release" - torch-build: << pipeline.parameters.torch-release-build >> - torch-build-index: << pipeline.parameters.torch-release-build-index >> - trt-version-short: << pipeline.parameters.trt-release-version-short >> - trt-version-long: << pipeline.parameters.trt-release-version-long >> - cudnn-version: << pipeline.parameters.cudnn-release-version >> - requires: - - build-x86_64-pyt-release - - - test-py-ts-x86_64: - name: test-py-ts-x86_64-pyt-release - channel: "release" - torch-build: << pipeline.parameters.torch-release-build >> - torch-build-index: << pipeline.parameters.torch-release-build-index >> - trt-version-long: << pipeline.parameters.trt-release-version-long >> - requires: - - build-x86_64-pyt-release - - - test-py-fx-x86_64: - name: test-py-fx-x86_64-pyt-release - channel: "release" - torch-build: << pipeline.parameters.torch-release-build >> - torch-build-index: << pipeline.parameters.torch-release-build-index >> - trt-version-long: << pipeline.parameters.trt-release-version-long >> - requires: - - build-x86_64-pyt-release - - - build-x86_64-pyt-nightly: - torch-build: << pipeline.parameters.torch-nightly-build >> - torch-build-index: << pipeline.parameters.torch-nightly-build-index >> + - build-x86_64-linux: + torch-build: << pipeline.parameters.torch-build >> + torch-build-index: << pipeline.parameters.torch-build-index >> - - test-core-cpp-x86_64: - name: test-core-cpp-x86_64-pyt-nightly - channel: "nightly" - torch-build: << pipeline.parameters.torch-nightly-build >> - torch-build-index: << pipeline.parameters.torch-nightly-build-index >> - trt-version-short: << pipeline.parameters.trt-nightly-version-short >> - trt-version-long: << pipeline.parameters.trt-nightly-version-long >> - cudnn-version: << pipeline.parameters.cudnn-nightly-version >> + - test-core-cpp-x86_64-linux: + torch-build: << pipeline.parameters.torch-build >> + torch-build-index: << pipeline.parameters.torch-build-index >> + trt-version-short: << pipeline.parameters.trt-version-short >> + trt-version-long: << pipeline.parameters.trt-version-long >> + cudnn-version: << pipeline.parameters.cudnn-version >> requires: - - build-x86_64-pyt-nightly + - build-x86_64-linux - - test-py-ts-x86_64: - name: test-py-ts-x86_64-pyt-nightly - channel: "nightly" - torch-build: << pipeline.parameters.torch-nightly-build >> - torch-build-index: << pipeline.parameters.torch-nightly-build-index >> - trt-version-long: << pipeline.parameters.trt-nightly-version-long >> + - test-py-ts-x86_64-linux: + torch-build: << pipeline.parameters.torch-build >> + torch-build-index: << pipeline.parameters.torch-build-index >> + trt-version-long: << pipeline.parameters.trt-version-long >> requires: - - build-x86_64-pyt-nightly + - build-x86_64-linux - - test-py-fx-x86_64: - name: test-py-fx-x86_64-pyt-nightly - channel: "nightly" - torch-build: << pipeline.parameters.torch-nightly-build >> - torch-build-index: << pipeline.parameters.torch-nightly-build-index >> - trt-version-long: << pipeline.parameters.trt-nightly-version-long >> + - test-py-fx-x86_64-linux: + torch-build: << pipeline.parameters.torch-build >> + torch-build-index: << pipeline.parameters.torch-build-index >> + trt-version-long: << pipeline.parameters.trt-version-long >> requires: - - build-x86_64-pyt-nightly + - build-x86_64-linux release: when: << pipeline.parameters.enable-packaging >> jobs: - - build-x86_64-pyt-release: - torch-build: << pipeline.parameters.torch-release-build >> - torch-build-index: << pipeline.parameters.torch-release-build-index >> + - build-x86_64-linux: + torch-build: << pipeline.parameters.torch-build >> + torch-build-index: << pipeline.parameters.torch-build-index >> - - test-core-cpp-x86_64: - name: test-core-cpp-x86_64-pyt-release - channel: "release" - torch-build: << pipeline.parameters.torch-release-build >> - torch-build-index: << pipeline.parameters.torch-release-build-index >> - trt-version-short: << pipeline.parameters.trt-release-version-short >> - trt-version-long: << pipeline.parameters.trt-release-version-long >> - cudnn-version: << pipeline.parameters.cudnn-release-version >> + - test-core-cpp-x86_64-linux: + torch-build: << pipeline.parameters.torch-build >> + torch-build-index: << pipeline.parameters.torch-build-index >> + trt-version-short: << pipeline.parameters.trt-version-short >> + trt-version-long: << pipeline.parameters.trt-version-long >> + cudnn-version: << pipeline.parameters.cudnn-version >> requires: - - build-x86_64-pyt-release + - build-x86_64-linux - - test-py-ts-x86_64: - name: test-py-ts-x86_64-pyt-release - channel: "release" - torch-build: << pipeline.parameters.torch-release-build >> - torch-build-index: << pipeline.parameters.torch-release-build-index >> - trt-version-long: << pipeline.parameters.trt-release-version-long >> + - test-py-ts-x86_64-linux: + torch-build: << pipeline.parameters.torch-build >> + torch-build-index: << pipeline.parameters.torch-build-index >> + trt-version-long: << pipeline.parameters.trt-version-long >> requires: - - build-x86_64-pyt-release + - build-x86_64-linux - - test-py-fx-x86_64: - name: test-py-fx-x86_64-pyt-release - channel: "release" - torch-build: << pipeline.parameters.torch-release-build >> - torch-build-index: << pipeline.parameters.torch-release-build-index >> - trt-version-long: << pipeline.parameters.trt-release-version-long >> + - test-py-fx-x86_64-linux: + torch-build: << pipeline.parameters.torch-build >> + torch-build-index: << pipeline.parameters.torch-build-index >> + trt-version-long: << pipeline.parameters.trt-version-long >> requires: - - build-x86_64-pyt-release + - build-x86_64-linux - - package-x86_64: - name: package-release-x86_64 + - package-x86_64-linux: enabled: << pipeline.parameters.enable-packaging >> - torch-build: << pipeline.parameters.torch-release-build >> - torch-build-index: << pipeline.parameters.torch-release-build-index >> + torch-build: << pipeline.parameters.torch-build >> + torch-build-index: << pipeline.parameters.torch-build-index >> requires: - - test-core-cpp-x86_64-pyt-release - - test-py-ts-x86_64-pyt-release - - test-py-fx-x86_64-pyt-release + - test-core-cpp-x86_64-linux + - test-py-ts-x86_64-linux + - test-py-fx-x86_64-linux ngc-release: when: << pipeline.parameters.enable-ngc-packaging >> jobs: - - build-aarch64-pyt-jetson: + - build-aarch64-jetson: torch-build: << pipeline.parameters.torch-jetson-build >> jetpack-version: << pipeline.parameters.jetpack-version >> python-version: 3.8.10 - - build-x86_64-pyt-ngc: + - build-x86_64-linux-ngc: torch-base-image: << pipeline.parameters.torch-ngc-base-image >> - - package-x86_64-ngc: + - package-x86_64-linux-ngc: torch-base-image: << pipeline.parameters.torch-ngc-base-image >> enabled: << pipeline.parameters.enable-ngc-packaging >> requires: - - build-x86_64-pyt-ngc + - build-x86_64-linux-ngc - - package-jetson: + - package-aarch64-jetson: name: package-release-aarch64-jetson enabled: << pipeline.parameters.enable-ngc-packaging >> torch-build: << pipeline.parameters.torch-jetson-build >> @@ -1218,88 +1106,40 @@ workflows: on-push: jobs: - - build-aarch64-pyt-jetson: + - build-aarch64-jetson: torch-build: << pipeline.parameters.torch-jetson-build >> jetpack-version: << pipeline.parameters.jetpack-version >> python-version: 3.8.10 - - build-x86_64-pyt-release: - torch-build: << pipeline.parameters.torch-release-build >> - torch-build-index: << pipeline.parameters.torch-release-build-index >> + - build-x86_64-linux: + torch-build: << pipeline.parameters.torch-build >> + torch-build-index: << pipeline.parameters.torch-build-index >> - test-core-cpp-x86_64: - name: test-core-cpp-x86_64-pyt-release - channel: "release" - torch-build: << pipeline.parameters.torch-release-build >> - torch-build-index: << pipeline.parameters.torch-release-build-index >> - trt-version-short: << pipeline.parameters.trt-release-version-short >> - trt-version-long: << pipeline.parameters.trt-release-version-long >> - cudnn-version: << pipeline.parameters.cudnn-release-version >> + torch-build: << pipeline.parameters.torch-build >> + torch-build-index: << pipeline.parameters.torch-build-index >> + trt-version-short: << pipeline.parameters.trt-version-short >> + trt-version-long: << pipeline.parameters.trt-version-long >> + cudnn-version: << pipeline.parameters.cudnn-version >> requires: - - build-x86_64-pyt-release + - build-x86_64-linux - test-py-ts-x86_64: - name: test-py-ts-x86_64-pyt-release - channel: "release" - torch-build: << pipeline.parameters.torch-release-build >> - torch-build-index: << pipeline.parameters.torch-release-build-index >> - trt-version-long: << pipeline.parameters.trt-release-version-long >> + torch-build: << pipeline.parameters.torch-build >> + torch-build-index: << pipeline.parameters.torch-build-index >> + trt-version-long: << pipeline.parameters.trt-version-long >> requires: - - build-x86_64-pyt-release + - build-x86_64-linux - test-py-fx-x86_64: - name: test-py-fx-x86_64-pyt-release - channel: "release" - torch-build: << pipeline.parameters.torch-release-build >> - torch-build-index: << pipeline.parameters.torch-release-build-index >> - trt-version-long: << pipeline.parameters.trt-release-version-long >> + torch-build: << pipeline.parameters.torch-build >> + torch-build-index: << pipeline.parameters.torch-build-index >> + trt-version-long: << pipeline.parameters.trt-version-long >> requires: - - build-x86_64-pyt-release - + - build-x86_64-linux - - build-x86_64-pyt-nightly: - torch-build: << pipeline.parameters.torch-nightly-build >> - torch-build-index: << pipeline.parameters.torch-nightly-build-index >> - - - test-core-cpp-x86_64: - name: test-core-cpp-x86_64-pyt-nightly - channel: "nightly" - torch-build: << pipeline.parameters.torch-nightly-build >> - torch-build-index: << pipeline.parameters.torch-nightly-build-index >> - trt-version-short: << pipeline.parameters.trt-nightly-version-short >> - trt-version-long: << pipeline.parameters.trt-nightly-version-long >> - cudnn-version: << pipeline.parameters.cudnn-nightly-version >> - requires: - - build-x86_64-pyt-nightly - - - test-py-ts-x86_64: - name: test-py-ts-x86_64-pyt-nightly - channel: "nightly" - torch-build: << pipeline.parameters.torch-nightly-build >> - torch-build-index: << pipeline.parameters.torch-nightly-build-index >> - trt-version-long: << pipeline.parameters.trt-nightly-version-long >> - requires: - - build-x86_64-pyt-nightly - - - test-py-fx-x86_64: - name: test-py-fx-x86_64-pyt-nightly - channel: "nightly" - torch-build: << pipeline.parameters.torch-nightly-build >> - torch-build-index: << pipeline.parameters.torch-nightly-build-index >> - trt-version-long: << pipeline.parameters.trt-nightly-version-long >> - requires: - - build-x86_64-pyt-nightly - - - build-x86_64-cmake: - name: build-x86_64-cmake-pyt-nightly - torch-build: << pipeline.parameters.torch-nightly-build >> - torch-build-index: << pipeline.parameters.torch-nightly-build-index >> - trt-version-short: << pipeline.parameters.trt-nightly-version-short >> - cudnn-version: << pipeline.parameters.cudnn-nightly-version >> - - - build-x86_64-cmake: - name: build-x86_64-cmake-pyt-release - torch-build: << pipeline.parameters.torch-release-build >> - torch-build-index: << pipeline.parameters.torch-release-build-index >> - trt-version-short: << pipeline.parameters.trt-release-version-short >> - cudnn-version: << pipeline.parameters.cudnn-release-version >> + - build-x86_64-linux-cmake: + torch-build: << pipeline.parameters.torch-build >> + torch-build-index: << pipeline.parameters.torch-build-index >> + trt-version-short: << pipeline.parameters.trt-version-short >> + cudnn-version: << pipeline.parameters.cudnn-version >> diff --git a/WORKSPACE b/WORKSPACE index 9711fef9b5..0a6771b890 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -41,7 +41,7 @@ local_repository( new_local_repository( name = "cuda", build_file = "@//third_party/cuda:BUILD", - path = "/usr/local/cuda-11.6/", + path = "/usr/local/cuda-11.7/", ) new_local_repository( @@ -56,17 +56,15 @@ new_local_repository( http_archive( name = "libtorch", build_file = "@//third_party/libtorch:BUILD", - sha256 = "5a392132fbff9db1482eae72a30f74b09f53a47edf8305fe9688d4ce7ddb0b6b", strip_prefix = "libtorch", - urls = ["https://download.pytorch.org/libtorch/cu116/libtorch-cxx11-abi-shared-with-deps-1.12.1%2Bcu116.zip"], + urls = ["https://download.pytorch.org/libtorch/nightly/cu117/libtorch-cxx11-abi-shared-with-deps-1.13.0.dev20220922%2Bcu117.zip"], ) http_archive( name = "libtorch_pre_cxx11_abi", build_file = "@//third_party/libtorch:BUILD", - sha256 = "5e044cc56a29cd4f3a7198c0fe5b2f0fa8f4c38cd71a0491274b6a914e8f24a7", strip_prefix = "libtorch", - urls = ["https://download.pytorch.org/libtorch/cu116/libtorch-shared-with-deps-1.12.1%2Bcu116.zip"], + urls = ["https://download.pytorch.org/libtorch/nightly/cu117/libtorch-shared-with-deps-1.13.0.dev20220922%2Bcu117.zip"], ) # Download these tarballs manually from the NVIDIA website diff --git a/py/requirements.txt b/py/requirements.txt index 5add5891ed..66cfdc8dc7 100644 --- a/py/requirements.txt +++ b/py/requirements.txt @@ -1,6 +1,6 @@ numpy pybind11==2.6.2 ---extra-index-url https://download.pytorch.org/whl/nightly/cu116 -torch==1.13.0.dev20220825+cu116 +--extra-index-url https://download.pytorch.org/whl/nightly/cu117 +torch==1.13.0.dev20220922+cu117 --extra-index-url https://pypi.ngc.nvidia.com nvidia-tensorrt==8.4.3.1 diff --git a/py/setup.py b/py/setup.py index 46a89ba78b..c36276271e 100644 --- a/py/setup.py +++ b/py/setup.py @@ -376,7 +376,7 @@ def run(self): long_description=long_description, ext_modules=ext_modules, install_requires=[ - "torch>=1.12.0+cu113,<1.13.0", + "torch>=1.13.0,<1.14.0", ], setup_requires=[], cmdclass={ diff --git a/toolchains/ci_workspaces/WORKSPACE.x86_64.release.rhel b/toolchains/ci_workspaces/WORKSPACE.x86_64.release.rhel index ba18c1d59d..e41c8de4c6 100644 --- a/toolchains/ci_workspaces/WORKSPACE.x86_64.release.rhel +++ b/toolchains/ci_workspaces/WORKSPACE.x86_64.release.rhel @@ -41,7 +41,7 @@ local_repository( new_local_repository( name = "cuda", build_file = "@//third_party/cuda:BUILD", - path = "/usr/local/cuda-11.3", + path = "/usr/local/cuda-11.7", ) new_local_repository( @@ -56,19 +56,18 @@ new_local_repository( http_archive( name = "libtorch", build_file = "@//third_party/libtorch:BUILD", - sha256 = "80f089939de20e68e3fcad4dfa72a26c8bf91b5e77b11042f671f39ebac35865", strip_prefix = "libtorch", - urls = ["https://download.pytorch.org/libtorch/cu113/libtorch-cxx11-abi-shared-with-deps-1.12.0%2Bcu113.zip"], + urls = ["https://download.pytorch.org/libtorch/nightly/cu117/libtorch-cxx11-abi-shared-with-deps-1.13.0.dev20220922%2Bcu117.zip"], ) http_archive( name = "libtorch_pre_cxx11_abi", build_file = "@//third_party/libtorch:BUILD", - sha256 = "8e35371403f7052d9e9b43bcff383980dbde4df028986dc1dab539953481d55f", strip_prefix = "libtorch", - urls = ["https://download.pytorch.org/libtorch/cu113/libtorch-shared-with-deps-1.12.0%2Bcu113.zip"], + urls = ["https://download.pytorch.org/libtorch/nightly/cu117/libtorch-shared-with-deps-1.13.0.dev20220922%2Bcu117.zip"], ) + #################################################################################### # Locally installed dependencies (use in cases of custom dependencies or aarch64) #################################################################################### diff --git a/toolchains/ci_workspaces/WORKSPACE.x86_64.release.ubuntu b/toolchains/ci_workspaces/WORKSPACE.x86_64.release.ubuntu index d9c28bbda1..688eb990f9 100644 --- a/toolchains/ci_workspaces/WORKSPACE.x86_64.release.ubuntu +++ b/toolchains/ci_workspaces/WORKSPACE.x86_64.release.ubuntu @@ -56,17 +56,15 @@ new_local_repository( http_archive( name = "libtorch", build_file = "@//third_party/libtorch:BUILD", - sha256 = "80f089939de20e68e3fcad4dfa72a26c8bf91b5e77b11042f671f39ebac35865", strip_prefix = "libtorch", - urls = ["https://download.pytorch.org/libtorch/cu113/libtorch-cxx11-abi-shared-with-deps-1.12.0%2Bcu113.zip"], + urls = ["https://download.pytorch.org/libtorch/nightly/cu117/libtorch-cxx11-abi-shared-with-deps-1.13.0.dev20220922%2Bcu117.zip"], ) http_archive( name = "libtorch_pre_cxx11_abi", build_file = "@//third_party/libtorch:BUILD", - sha256 = "8e35371403f7052d9e9b43bcff383980dbde4df028986dc1dab539953481d55f", strip_prefix = "libtorch", - urls = ["https://download.pytorch.org/libtorch/cu113/libtorch-shared-with-deps-1.12.0%2Bcu113.zip"], + urls = ["https://download.pytorch.org/libtorch/nightly/cu117/libtorch-shared-with-deps-1.13.0.dev20220922%2Bcu117.zip"], ) #################################################################################### From ca66b734532e4eac258884a8d722b72063dc7371 Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Thu, 22 Sep 2022 20:25:35 -0700 Subject: [PATCH 05/17] chore: Different build Signed-off-by: Naren Dasan Signed-off-by: Naren Dasan --- .circleci/config.yml | 2 +- WORKSPACE | 6 ++++-- py/requirements.txt | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e1482b2462..195534a74d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -949,7 +949,7 @@ parameters: # Nightly platform config torch-build: type: string - default: "1.13.0.dev20220922+cu117" + default: "1.13.0.dev20220921+cu117" torch-build-index: type: string default: "https://download.pytorch.org/whl/nightly/cu117" diff --git a/WORKSPACE b/WORKSPACE index 0a6771b890..e84edf4ec4 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -56,15 +56,17 @@ new_local_repository( http_archive( name = "libtorch", build_file = "@//third_party/libtorch:BUILD", + sha256 = "70bba99fea3ac8a18da35e759464f112007ee959803835119334d4be4f0147e0", strip_prefix = "libtorch", - urls = ["https://download.pytorch.org/libtorch/nightly/cu117/libtorch-cxx11-abi-shared-with-deps-1.13.0.dev20220922%2Bcu117.zip"], + urls = ["https://download.pytorch.org/libtorch/nightly/cu117/libtorch-cxx11-abi-shared-with-deps-1.13.0.dev20220921%2Bcu117.zip"], ) http_archive( name = "libtorch_pre_cxx11_abi", build_file = "@//third_party/libtorch:BUILD", + sha256 = "18efe95eb3c40a59cec6cb45539112a8f8e0cec75826d8f48fca49969664fafb", strip_prefix = "libtorch", - urls = ["https://download.pytorch.org/libtorch/nightly/cu117/libtorch-shared-with-deps-1.13.0.dev20220922%2Bcu117.zip"], + urls = ["https://download.pytorch.org/libtorch/nightly/cu117/libtorch-shared-with-deps-1.13.0.dev20220921%2Bcu117.zip"], ) # Download these tarballs manually from the NVIDIA website diff --git a/py/requirements.txt b/py/requirements.txt index 66cfdc8dc7..e64f960d0a 100644 --- a/py/requirements.txt +++ b/py/requirements.txt @@ -1,6 +1,7 @@ numpy pybind11==2.6.2 --extra-index-url https://download.pytorch.org/whl/nightly/cu117 -torch==1.13.0.dev20220922+cu117 +torch==1.13.0.dev20220921+cu117 +torchvision==0.14.0.dev20220921+cu117 --extra-index-url https://pypi.ngc.nvidia.com nvidia-tensorrt==8.4.3.1 From a8ea3f52f8fcc3015dc21a9f75bea7e556c46752 Mon Sep 17 00:00:00 2001 From: Naren Dasan <1790613+narendasan@users.noreply.github.com> Date: Fri, 23 Sep 2022 15:54:31 -0700 Subject: [PATCH 06/17] Updated config.yml --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 195534a74d..769fe9641c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -673,8 +673,6 @@ jobs: test-py-fx-x86_64-linux: parameters: - channel: - type: string torch-build: type: string torch-build-index: From 1a106e36fec0fad602ab0e5c280dcf09f2ef7384 Mon Sep 17 00:00:00 2001 From: Naren Dasan <1790613+narendasan@users.noreply.github.com> Date: Fri, 23 Sep 2022 15:56:55 -0700 Subject: [PATCH 07/17] Updated config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 769fe9641c..fed160fa91 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -906,7 +906,7 @@ jobs: path: /tmp/dist/ngc destination: x86_64-pyt-ngc - package-x86_64-ngc: + package-x86_64-linux-ngc: parameters: enabled: type: boolean From cc1f43f2f552bc67955eab64ee1d47dcf0f02a76 Mon Sep 17 00:00:00 2001 From: Naren Dasan <1790613+narendasan@users.noreply.github.com> Date: Fri, 23 Sep 2022 23:05:43 +0000 Subject: [PATCH 08/17] Update CI conf Signed-off-by: Naren Dasan <1790613+narendasan@users.noreply.github.com> --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fed160fa91..9a91ad2bc0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1113,7 +1113,7 @@ workflows: torch-build: << pipeline.parameters.torch-build >> torch-build-index: << pipeline.parameters.torch-build-index >> - - test-core-cpp-x86_64: + - test-core-cpp-x86_64-linux: torch-build: << pipeline.parameters.torch-build >> torch-build-index: << pipeline.parameters.torch-build-index >> trt-version-short: << pipeline.parameters.trt-version-short >> @@ -1122,14 +1122,14 @@ workflows: requires: - build-x86_64-linux - - test-py-ts-x86_64: + - test-py-ts-x86_64-linux: torch-build: << pipeline.parameters.torch-build >> torch-build-index: << pipeline.parameters.torch-build-index >> trt-version-long: << pipeline.parameters.trt-version-long >> requires: - build-x86_64-linux - - test-py-fx-x86_64: + - test-py-fx-x86_64-linux: torch-build: << pipeline.parameters.torch-build >> torch-build-index: << pipeline.parameters.torch-build-index >> trt-version-long: << pipeline.parameters.trt-version-long >> From 5365f9003dd51517e180c1c8c287dff07c3594bf Mon Sep 17 00:00:00 2001 From: Naren Dasan <1790613+narendasan@users.noreply.github.com> Date: Thu, 29 Sep 2022 19:14:45 +0000 Subject: [PATCH 09/17] chore: reordering dep installation Signed-off-by: Naren Dasan <1790613+narendasan@users.noreply.github.com> --- .circleci/config.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9a91ad2bc0..bb6f0e11c6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -661,13 +661,12 @@ jobs: trt-version-long: << parameters.trt-version-long >> - attach_workspace: at: /tmp/dist - - run: - name: "Install torch-tensorrt" - command: pip3 install /tmp/dist/x86_64-linux/* - # We install torch after torch-trt because pip automatically enforces the version constraint otherwise - install-torch-from-index: torch-build: << parameters.torch-build >> torch-build-index: << parameters.torch-build-index >> + - run: + name: "Install torch-tensorrt" + command: pip3 install /tmp/dist/x86_64-linux/* - dump-test-env - test-ts-py-api @@ -688,13 +687,13 @@ jobs: trt-version-long: << parameters.trt-version-long >> - attach_workspace: at: /tmp/dist/ + - install-torch-from-index: + torch-build: << parameters.torch-build >> + torch-build-index: << parameters.torch-build-index >> - run: name: "Install torch-tensorrt" command: pip3 install /tmp/dist/x86_64-linux/* # We install torch after torch-trt because pip automatically enforces the version constraint otherwise - - install-torch-from-index: - torch-build: << parameters.torch-build >> - torch-build-index: << parameters.torch-build-index >> - dump-test-env - test-fx From 2aefc7be5108932015fb2d8848525dcf6f7bc790 Mon Sep 17 00:00:00 2001 From: Naren Dasan <1790613+narendasan@users.noreply.github.com> Date: Thu, 29 Sep 2022 21:29:45 +0000 Subject: [PATCH 10/17] chore: Allow prerelease deps Signed-off-by: Naren Dasan <1790613+narendasan@users.noreply.github.com> --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bb6f0e11c6..74be8d50da 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -666,7 +666,7 @@ jobs: torch-build-index: << parameters.torch-build-index >> - run: name: "Install torch-tensorrt" - command: pip3 install /tmp/dist/x86_64-linux/* + command: pip3 install --pre /tmp/dist/x86_64-linux/* - dump-test-env - test-ts-py-api @@ -692,7 +692,7 @@ jobs: torch-build-index: << parameters.torch-build-index >> - run: name: "Install torch-tensorrt" - command: pip3 install /tmp/dist/x86_64-linux/* + command: pip3 install --pre /tmp/dist/x86_64-linux/* # We install torch after torch-trt because pip automatically enforces the version constraint otherwise - dump-test-env - test-fx From fef2cbdfa59eadfd3ef9edcc8e364728c1ffc9f9 Mon Sep 17 00:00:00 2001 From: Naren Dasan <1790613+narendasan@users.noreply.github.com> Date: Thu, 29 Sep 2022 21:54:22 +0000 Subject: [PATCH 11/17] chore: relax torch version Signed-off-by: Naren Dasan <1790613+narendasan@users.noreply.github.com> --- py/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py/setup.py b/py/setup.py index 63f43694ba..0f6868d9fa 100644 --- a/py/setup.py +++ b/py/setup.py @@ -376,7 +376,7 @@ def run(self): long_description=long_description, ext_modules=ext_modules, install_requires=[ - "torch>=1.13.0,<1.14.0", + "torch>=1.13.0.dev0,<1.14.0", ], setup_requires=[], cmdclass={ From e29b638a058fe2a6cbbd4411be767c56938ab8d5 Mon Sep 17 00:00:00 2001 From: Naren Dasan <1790613+narendasan@users.noreply.github.com> Date: Thu, 29 Sep 2022 22:35:50 +0000 Subject: [PATCH 12/17] chore: update cudnn for pytorch Signed-off-by: Naren Dasan <1790613+narendasan@users.noreply.github.com> --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 74be8d50da..b342b565bc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -952,7 +952,7 @@ parameters: default: "https://download.pytorch.org/whl/nightly/cu117" cudnn-version: type: string - default: "8.4.1" + default: "8.5.0" trt-version-short: type: string default: "8.4.1" From 1f8eec445e67d802a40f45879785b5433bc7b797 Mon Sep 17 00:00:00 2001 From: Naren Dasan <1790613+narendasan@users.noreply.github.com> Date: Fri, 30 Sep 2022 00:52:04 +0000 Subject: [PATCH 13/17] chore: switch back to cuda 11.6 because tensorrt is pinned to cudnn 8.4 Signed-off-by: Naren Dasan <1790613+narendasan@users.noreply.github.com> --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b342b565bc..b7408d2bff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -946,13 +946,13 @@ parameters: # Nightly platform config torch-build: type: string - default: "1.13.0.dev20220921+cu117" + default: "1.13.0.dev20220921+cu116" torch-build-index: type: string - default: "https://download.pytorch.org/whl/nightly/cu117" + default: "https://download.pytorch.org/whl/nightly/cu116" cudnn-version: type: string - default: "8.5.0" + default: "8.4.1" trt-version-short: type: string default: "8.4.1" From d5bc2738442906efe5bd95e1cb9694f5750c5d7d Mon Sep 17 00:00:00 2001 From: Naren Dasan <1790613+narendasan@users.noreply.github.com> Date: Fri, 30 Sep 2022 02:36:05 +0000 Subject: [PATCH 14/17] chore: release configs Signed-off-by: Naren Dasan <1790613+narendasan@users.noreply.github.com> --- toolchains/ci_workspaces/WORKSPACE.x86_64.release.rhel | 9 +++++---- toolchains/ci_workspaces/WORKSPACE.x86_64.release.ubuntu | 6 ++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/toolchains/ci_workspaces/WORKSPACE.x86_64.release.rhel b/toolchains/ci_workspaces/WORKSPACE.x86_64.release.rhel index e41c8de4c6..8d584f184d 100644 --- a/toolchains/ci_workspaces/WORKSPACE.x86_64.release.rhel +++ b/toolchains/ci_workspaces/WORKSPACE.x86_64.release.rhel @@ -41,7 +41,7 @@ local_repository( new_local_repository( name = "cuda", build_file = "@//third_party/cuda:BUILD", - path = "/usr/local/cuda-11.7", + path = "/usr/local/cuda-11.6", ) new_local_repository( @@ -57,17 +57,18 @@ http_archive( name = "libtorch", build_file = "@//third_party/libtorch:BUILD", strip_prefix = "libtorch", - urls = ["https://download.pytorch.org/libtorch/nightly/cu117/libtorch-cxx11-abi-shared-with-deps-1.13.0.dev20220922%2Bcu117.zip"], + sha256 = "94573e4c5f84ee70dea00c39dc1afcd4173ef4454f4d7cb428b499cf4c3b86e1", + urls = ["https://download.pytorch.org/libtorch/nightly/cu116/libtorch-cxx11-abi-shared-with-deps-1.13.0.dev20220922%2Bcu116.zip"], ) http_archive( name = "libtorch_pre_cxx11_abi", build_file = "@//third_party/libtorch:BUILD", strip_prefix = "libtorch", - urls = ["https://download.pytorch.org/libtorch/nightly/cu117/libtorch-shared-with-deps-1.13.0.dev20220922%2Bcu117.zip"], + sha256 = "5748ee06d81934a4bf7654653b34820365b264d16f6b99b56833cfdd3005da71", + urls = ["https://download.pytorch.org/libtorch/nightly/cu116/libtorch-shared-with-deps-1.13.0.dev20220922%2Bcu116.zip"], ) - #################################################################################### # Locally installed dependencies (use in cases of custom dependencies or aarch64) #################################################################################### diff --git a/toolchains/ci_workspaces/WORKSPACE.x86_64.release.ubuntu b/toolchains/ci_workspaces/WORKSPACE.x86_64.release.ubuntu index 688eb990f9..d26414c9a5 100644 --- a/toolchains/ci_workspaces/WORKSPACE.x86_64.release.ubuntu +++ b/toolchains/ci_workspaces/WORKSPACE.x86_64.release.ubuntu @@ -57,14 +57,16 @@ http_archive( name = "libtorch", build_file = "@//third_party/libtorch:BUILD", strip_prefix = "libtorch", - urls = ["https://download.pytorch.org/libtorch/nightly/cu117/libtorch-cxx11-abi-shared-with-deps-1.13.0.dev20220922%2Bcu117.zip"], + sha256 = "94573e4c5f84ee70dea00c39dc1afcd4173ef4454f4d7cb428b499cf4c3b86e1", + urls = ["https://download.pytorch.org/libtorch/nightly/cu116/libtorch-cxx11-abi-shared-with-deps-1.13.0.dev20220922%2Bcu116.zip"], ) http_archive( name = "libtorch_pre_cxx11_abi", build_file = "@//third_party/libtorch:BUILD", strip_prefix = "libtorch", - urls = ["https://download.pytorch.org/libtorch/nightly/cu117/libtorch-shared-with-deps-1.13.0.dev20220922%2Bcu117.zip"], + sha256 = "5748ee06d81934a4bf7654653b34820365b264d16f6b99b56833cfdd3005da71", + urls = ["https://download.pytorch.org/libtorch/nightly/cu116/libtorch-shared-with-deps-1.13.0.dev20220922%2Bcu116.zip"], ) #################################################################################### From dc6a7a2894461e594fdaa7b58bf1476e6afafa47 Mon Sep 17 00:00:00 2001 From: Naren Dasan <1790613+narendasan@users.noreply.github.com> Date: Fri, 30 Sep 2022 18:17:11 +0000 Subject: [PATCH 15/17] chore: update build container Signed-off-by: Naren Dasan <1790613+narendasan@users.noreply.github.com> --- .circleci/config.yml | 8 ++++---- py/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b7408d2bff..7e02b9cf3e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1070,10 +1070,10 @@ workflows: enabled: << pipeline.parameters.enable-packaging >> torch-build: << pipeline.parameters.torch-build >> torch-build-index: << pipeline.parameters.torch-build-index >> - requires: - - test-core-cpp-x86_64-linux - - test-py-ts-x86_64-linux - - test-py-fx-x86_64-linux + #requires: + #- test-core-cpp-x86_64-linux + #- test-py-ts-x86_64-linux + #- test-py-fx-x86_64-linux ngc-release: when: << pipeline.parameters.enable-ngc-packaging >> diff --git a/py/Dockerfile b/py/Dockerfile index 4895fe5b3a..3852b2ab4e 100644 --- a/py/Dockerfile +++ b/py/Dockerfile @@ -1,4 +1,4 @@ -FROM pytorch/manylinux-builder:cuda11.3 +FROM pytorch/manylinux-builder:cuda11.6 RUN yum install -y ninja-build From 69d52a4f30e94b3785c69d5a081adaddbe1fd959 Mon Sep 17 00:00:00 2001 From: Naren Dasan <1790613+narendasan@users.noreply.github.com> Date: Sat, 1 Oct 2022 00:36:48 +0000 Subject: [PATCH 16/17] update ci release container Signed-off-by: Naren Dasan <1790613+narendasan@users.noreply.github.com> --- py/ci/Dockerfile.ci | 2 +- py/ci/build_whl.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/py/ci/Dockerfile.ci b/py/ci/Dockerfile.ci index ba887a9678..2cd9962449 100644 --- a/py/ci/Dockerfile.ci +++ b/py/ci/Dockerfile.ci @@ -1,4 +1,4 @@ -FROM pytorch/manylinux-builder:cuda11.3 +FROM pytorch/manylinux-builder:cuda11.6 ARG trt_version RUN echo -e "Installing with TensorRT ${trt_version}" diff --git a/py/ci/build_whl.sh b/py/ci/build_whl.sh index f25bebf194..66855fbf2e 100755 --- a/py/ci/build_whl.sh +++ b/py/ci/build_whl.sh @@ -5,7 +5,7 @@ cd /workspace/project/py export CXX=g++ -export CUDA_HOME=/usr/local/cuda-11.3 +export CUDA_HOME=/usr/local/cuda-11.6 PROJECT_DIR=/workspace/project cp -r $CUDA_HOME /usr/local/cuda From 1edd66a41399bbabdd885d787c7bc8bb81d83982 Mon Sep 17 00:00:00 2001 From: Naren Dasan <1790613+narendasan@users.noreply.github.com> Date: Mon, 3 Oct 2022 21:50:15 +0000 Subject: [PATCH 17/17] Downgrade default libtorch to cuda 11.6 due to torchvision / tensorrt incompatibility Signed-off-by: Naren Dasan <1790613+narendasan@users.noreply.github.com> --- WORKSPACE | 10 +++++----- py/requirements.txt | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index e84edf4ec4..f5551a1037 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -41,7 +41,7 @@ local_repository( new_local_repository( name = "cuda", build_file = "@//third_party/cuda:BUILD", - path = "/usr/local/cuda-11.7/", + path = "/usr/local/cuda-11.6/", ) new_local_repository( @@ -56,17 +56,17 @@ new_local_repository( http_archive( name = "libtorch", build_file = "@//third_party/libtorch:BUILD", - sha256 = "70bba99fea3ac8a18da35e759464f112007ee959803835119334d4be4f0147e0", + sha256 = "486106ddc5b5ad532f030f447940a571b924da821b9534d25c0cef5503cdfaea", strip_prefix = "libtorch", - urls = ["https://download.pytorch.org/libtorch/nightly/cu117/libtorch-cxx11-abi-shared-with-deps-1.13.0.dev20220921%2Bcu117.zip"], + urls = ["https://download.pytorch.org/libtorch/nightly/cu116/libtorch-cxx11-abi-shared-with-deps-1.13.0.dev20220921%2Bcu116.zip"], ) http_archive( name = "libtorch_pre_cxx11_abi", build_file = "@//third_party/libtorch:BUILD", - sha256 = "18efe95eb3c40a59cec6cb45539112a8f8e0cec75826d8f48fca49969664fafb", + sha256 = "b304ebf26effcbbefcec99134bcfb0127c499306343fbe2e2cd127213448a4a6", strip_prefix = "libtorch", - urls = ["https://download.pytorch.org/libtorch/nightly/cu117/libtorch-shared-with-deps-1.13.0.dev20220921%2Bcu117.zip"], + urls = ["https://download.pytorch.org/libtorch/nightly/cu116/libtorch-shared-with-deps-1.13.0.dev20220921%2Bcu116.zip"], ) # Download these tarballs manually from the NVIDIA website diff --git a/py/requirements.txt b/py/requirements.txt index e64f960d0a..589d991e4a 100644 --- a/py/requirements.txt +++ b/py/requirements.txt @@ -1,7 +1,7 @@ numpy pybind11==2.6.2 ---extra-index-url https://download.pytorch.org/whl/nightly/cu117 -torch==1.13.0.dev20220921+cu117 -torchvision==0.14.0.dev20220921+cu117 +--extra-index-url https://download.pytorch.org/whl/nightly/cu116 +torch==1.13.0.dev20220921+cu116 +torchvision==0.14.0.dev20220921+cu116 --extra-index-url https://pypi.ngc.nvidia.com nvidia-tensorrt==8.4.3.1