chore: Rebase with master

Signed-off-by: Dheeraj Peri <[email protected]>

Author: peri044

.circleci/config.yml

@@ -282,6 +282,56 @@ commands:
             mkdir -p /tmp/dist/builds
             cp dist/* /tmp/dist/builds
 
+  build-py-ngc:
+    description: "Build the torch-tensorrt python release for NGC PyTorch (cxx11-abi)"
+    parameters:
+      release:
+        type: boolean
+        default: false
+      torch-base-image:
+        type: string
+        default: nvcr.io/nvidia/pytorch:latest
+    steps:
+      - run:
+          name: Log into docker
+          command: |
+            docker login --username="\$oauthtoken" --password=$NGC_TOKEN nvcr.io
+      - run:
+          name: Pull image
+          command: |
+            docker pull << parameters.torch-base-image >>
+      - run:
+          name: Create container
+          command: |
+              docker run -it -d --name ngc_build_container -v /home/circleci/project:/workspace -e BAZEL_VERSION="$(cat /home/circleci/project/.bazelversion)" -w /workspace << parameters.torch-base-image >>
+      - run:
+          name: Install build deps
+          command: |
+            export BAZEL_VERSION="$(cat /home/circleci/project/.bazelversion)"
+            docker exec ngc_build_container bash -c "wget https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-linux-x86_64 -O /usr/bin/bazel && chmod a+x /usr/bin/bazel"
+            docker exec ngc_build_container bash -c "mv /workspace/docker/WORKSPACE.ngc /workspace/WORKSPACE"
+            docker exec ngc_build_container bash -c "cd /workspace/py && pip install wheel setuptools pybind11==2.6.2"
+            docker exec ngc_build_container bash -c "git config --global --add safe.directory /workspace"
+      - when:
+          condition: << parameters.release >>
+          steps:
+            - run:
+                name: Build torch-tensorrt release build for NGC
+                command: |
+                  docker exec ngc_build_container bash -c "cd /workspace/py && python3 setup.py bdist_wheel --use-cxx11-abi --release"
+      - unless:
+          condition: << parameters.release >>
+          steps:
+            - run:
+                name: Build torch-tensorrt debug build for NGC
+                command: |
+                  docker exec ngc_build_container bash -c "cd /workspace/py && python3 setup.py bdist_wheel --use-cxx11-abi"
+      - run:
+          name: Collect builds
+          command: |
+            mkdir -p /tmp/dist/builds
+            cp /home/circleci/project/py/dist/* /tmp/dist/builds
+
   build-cmake:
     description: "Build the torch-tensorrt using CMake"
     parameters:
@@ -385,6 +435,7 @@ commands:
             mkdir -p /tmp/artifacts/test_results
             cd tests/py
             pytest --junitxml=/tmp/artifacts/test_results/api/api_test_results.xml api/
+            pytest --junitxml=/tmp/artifacts/test_results/models/models_test_results.xml models/
             pytest --junitxml=/tmp/artifacts/test_results/integrations/integrations_test_results.xml integrations/
             cd ~/project
 
@@ -829,7 +880,7 @@ jobs:
             TORCHTRT_VERSION=$(cd torch_tensorrt && python3 -c "from _version import __version__;print(__version__)")
             TRT_VERSION=$(cd torch_tensorrt && python3 -c "from _version import __tensorrt_version__;print(__tensorrt_version__)")
             CUDNN_VERSION=$(cd torch_tensorrt && python3 -c "from _version import __cudnn_version__;print(__cudnn_version__)")
-            pip3 install -r ~/project/py/requirements.txt
+            python3 -m pip install pybind11==2.6.2
             TORCH_VERSION=$(python3 -c "from torch import __version__;print(__version__.split('+')[0])")
             cp ~/project/bazel-bin/libtorchtrt.tar.gz ~/project/py/dist/libtorchtrt-${TORCHTRT_VERSION}-cudnn${CUDNN_VERSION}-tensorrt${TRT_VERSION}-cuda${CUDA_VERSION}-libtorch${TORCH_VERSION}-aarch64-linux-jp<< parameters.jetpack-version >>.tar.gz
       - run:
@@ -881,6 +932,64 @@ jobs:
           path: /tmp/dist/cmake
           destination: x86_64-cmake
 
+  build-x86_64-pyt-ngc:
+    parameters:
+      torch-base-image:
+        type: string
+    machine:
+      image: ubuntu-2004-cuda-11.4:202110-01
+    resource_class: xlarge
+    steps:
+      - checkout
+      - build-py-ngc:
+          release: false
+          torch-base-image: << parameters.torch-base-image >>
+      - run:
+          name: Move to NGC dir
+          command: |
+            mkdir -p /tmp/dist/ngc
+            cp -r /tmp/dist/builds/* /tmp/dist/ngc
+      - persist_to_workspace:
+          root: /tmp/dist
+          paths:
+            - ngc
+      - store_artifacts:
+          path: /tmp/dist/ngc
+          destination: x86_64-pyt-ngc
+
+  package-x86_64-ngc:
+    parameters:
+      enabled:
+        type: boolean
+        default: false
+      torch-base-image:
+        type: string
+    machine:
+      image: ubuntu-2004-cuda-11.4:202110-01
+    resource_class: xlarge
+    steps:
+      - when:
+          condition: << parameters.enabled >>
+          steps:
+            - checkout
+            - build-py-ngc:
+                release: true
+                torch-base-image: << parameters.torch-base-image >>
+            - run:
+                name: Collect packages
+                command: |
+                  mkdir -p /tmp/dist/ngc
+                  cp -r ~/project/py/dist/* /tmp/dist/ngc
+            - store_artifacts:
+                path: /tmp/dist/ngc
+                destination: x86_64-ngc-pkgs
+      - unless:
+          condition: << parameters.enabled >>
+          steps:
+            - run:
+                name: Skipped packaging
+                command: echo -e "Packaging stage not enabled"
+
 parameters:
   bazel-version:
     type: string
@@ -889,10 +998,10 @@ parameters:
   # Nightly platform config
   torch-nightly-build:
     type: string
-    default: "1.13.0.dev20220810+cu113"
+    default: "1.13.0.dev20220825+cu116"
   torch-nightly-build-index:
     type: string
-    default: "https://download.pytorch.org/whl/nightly/cu113"
+    default: "https://download.pytorch.org/whl/nightly/cu116"
   cudnn-nightly-version:
     type: string
     default: "8.4.1"
@@ -901,15 +1010,15 @@ parameters:
     default: "8.4.1"
   trt-nightly-version-long:
     type: string
-    default: "8.4.1.5"
+    default: "8.4.3.1"
 
   # Release platform config
   torch-release-build:
     type: string
-    default: "1.12.0+cu113"
+    default: "1.12.1+cu116"
   torch-release-build-index:
     type: string
-    default: "https://download.pytorch.org/whl/cu113"
+    default: "https://download.pytorch.org/whl/cu116"
   cudnn-release-version:
     type: string
     default: "8.4.1"
@@ -918,15 +1027,15 @@ parameters:
     default: "8.4.1"
   trt-release-version-long:
     type: string
-    default: "8.4.1.5"
+    default: "8.4.3.1"
 
   # Jetson platform config
   torch-jetson-build:
     type: string
-    default: "torch-1.13.0a0+340c4120.nv22.06-cp38-cp38-linux_aarch64.whl"
+    default: "torch-1.13.0a0+08820cb0.nv22.07-cp38-cp38-linux_aarch64.whl"
   jetpack-version:
     type: string
-    default: "50"
+    default: "502"
   cudnn-jetson-version:
     type: string
     default: "8.3.2"
@@ -937,10 +1046,18 @@ parameters:
     type: string
     default: "8.4.1.5"
 
+  torch-ngc-base-image:
+    type: string
+    default: "nvcr.io/nvidia/pytorch:22.07-py3"
+
   enable-packaging:
     type: boolean
     default: false
 
+  enable-ngc-packaging:
+    type: boolean
+    default: false
+
 # Invoke jobs via workflows
 # See: https://circleci.com/docs/2.0/configuration-reference/#workflows
 workflows:
@@ -1028,10 +1145,6 @@ workflows:
   release:
     when: << pipeline.parameters.enable-packaging >>
     jobs:
-      - build-aarch64-pyt-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 >>
@@ -1077,9 +1190,26 @@ workflows:
             - test-py-ts-x86_64-pyt-release
             - test-py-fx-x86_64-pyt-release
 
+  ngc-release:
+    when: << pipeline.parameters.enable-ngc-packaging >>
+    jobs:
+      - build-aarch64-pyt-jetson:
+          torch-build: << pipeline.parameters.torch-jetson-build >>
+          jetpack-version: << pipeline.parameters.jetpack-version >>
+          python-version: 3.8.10
+
+      - build-x86_64-pyt-ngc:
+          torch-base-image: << pipeline.parameters.torch-ngc-base-image >>
+
+      - package-x86_64-ngc:
+          torch-base-image: << pipeline.parameters.torch-ngc-base-image >>
+          enabled: << pipeline.parameters.enable-ngc-packaging >>
+          requires:
+            - build-x86_64-pyt-ngc
+
       - package-jetson:
           name: package-release-aarch64-jetson
-          enabled: << pipeline.parameters.enable-packaging >>
+          enabled: << pipeline.parameters.enable-ngc-packaging >>
           torch-build: << pipeline.parameters.torch-jetson-build >>
           jetpack-version: << pipeline.parameters.jetpack-version >>
           python-version: 3.8.10

.github/workflows/docgen.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Set up Python 3.9.4
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9.4 
+          python-version: 3.9.4
       - uses: actions/checkout@v2
         with:
           ref: ${{github.head_ref}}

.github/workflows/linter.yml

@@ -39,7 +39,7 @@ jobs:
           pip3 install -r $GITHUB_WORKSPACE/.github/scripts/requirements.txt
           pip3 install -r $GITHUB_WORKSPACE/requirements-dev.txt
       - name: Lint C++
-        run: | 
+        run: |
           cd $GITHUB_WORKSPACE
           python3 $GITHUB_WORKSPACE/.github/scripts/run_cpp_linter.py
         env:

.gitmodules

@@ -1,5 +0,0 @@
-[submodule "toolchains/nv_workspaces"]
-	path = toolchains/nv_workspaces
-	url = ssh://[email protected]:12051/torch-tensorrt/WORKSPACES.git
-	branch = master
-	ignore = dirty

README.md

@@ -113,10 +113,10 @@ torch.jit.save(trt_ts_module, "trt_torchscript_module.ts") # save the TRT embedd
 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.
 
 - Bazel 5.2.0
-- Libtorch 1.12.0 (built with CUDA 11.3)
-- CUDA 11.3
+- Libtorch 1.12.1 (built with CUDA 11.6)
+- CUDA 11.6
 - cuDNN 8.4.1
-- TensorRT 8.4.1.5
+- TensorRT 8.4.3.1
 
 ## Prebuilt Binaries and Wheel files
 

WORKSPACE

@@ -56,17 +56,17 @@ new_local_repository(
 http_archive(
     name = "libtorch",
     build_file = "@//third_party/libtorch:BUILD",
-    sha256 = "80f089939de20e68e3fcad4dfa72a26c8bf91b5e77b11042f671f39ebac35865",
+    sha256 = "5a392132fbff9db1482eae72a30f74b09f53a47edf8305fe9688d4ce7ddb0b6b",
     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/cu116/libtorch-cxx11-abi-shared-with-deps-1.12.1%2Bcu116.zip"],
 )
 
 http_archive(
     name = "libtorch_pre_cxx11_abi",
     build_file = "@//third_party/libtorch:BUILD",
-    sha256 = "8e35371403f7052d9e9b43bcff383980dbde4df028986dc1dab539953481d55f",
+    sha256 = "5e044cc56a29cd4f3a7198c0fe5b2f0fa8f4c38cd71a0491274b6a914e8f24a7",
     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/cu116/libtorch-shared-with-deps-1.12.1%2Bcu116.zip"],
 )
 
 # Download these tarballs manually from the NVIDIA website
@@ -86,10 +86,10 @@ http_archive(
 http_archive(
     name = "tensorrt",
     build_file = "@//third_party/tensorrt/archive:BUILD",
-    sha256 = "8107861af218694130f170e071f49814fa3e27f1386ce7cb6d807ac05a7fcf0e",
-    strip_prefix = "TensorRT-8.4.1.5",
+    sha256 = "8d7c2085c1639dcc73875048c23598a8526ce3089136876e31d90258e49e4f61",
+    strip_prefix = "TensorRT-8.4.3.1",
     urls = [
-        "https://developer.nvidia.com/compute/machine-learning/tensorrt/secure/8.4.1/tars/tensorrt-8.4.1.5.linux.x86_64-gnu.cuda-11.6.cudnn8.4.tar.gz",
+        "https://developer.nvidia.com/compute/machine-learning/tensorrt/secure/8.4.3/tars/tensorrt-8.4.3.1.linux.x86_64-gnu.cuda-11.6.cudnn8.4.tar.gz",
     ],
 )