chore: Fix merge conflicts

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

Author: peri044

.circleci/config.yml

@@ -751,7 +751,7 @@ parameters:
   # Nightly platform config
   torch-nightly-build:
     type: string
-    default: "1.13.0.dev20220731+cu113"
+    default: "1.13.0.dev20220810+cu113"
   torch-nightly-build-index:
     type: string
     default: "https://download.pytorch.org/whl/nightly/cu113"

.github/actions/assigner/package-lock.json

@@ -19,7 +19,7 @@
   "license": "BSD-3-Clause",
   "repository": "https://www.github.com/pytorch/TensorRT",
   "dependencies": {
-    "@actions/core": "^1.8.2",
+    "@actions/core": "^1.9.1",
     "@actions/github": "^5.0.3",
     "fs": "^0.0.1-security",
     "js-yaml": "^4.1.0"

.github/actions/assigner/package.json

@@ -10,9 +10,9 @@ on:
 
 jobs:
   build-docs:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     container:
-      image: docker.pkg.github.com/pytorch/tensorrt/docgen:latest
+      image: ghcr.io/pytorch/tensorrt/docgen:latest
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -22,23 +22,77 @@ jobs:
           rm -rf /usr/share/dotnet
           rm -rf /opt/ghc
           rm -rf "/usr/local/share/boost"
+          rm -rf /usr/local/cuda/cuda-*
+      - name: Install base deps
+        run: |
+          apt update
+          DEBIAN_FRONTEND=noninteractive apt install -y software-properties-common gcc git curl wget make zlib1g-dev bzip2 libbz2-dev lzma lzma-dev libreadline-dev libsqlite3-dev libssl-dev libffi-dev doxygen pandoc
+          git config --global --add safe.directory '*'
+      - name: Install Python
+        run: |
+          mkdir -p /opt/circleci
+          git clone https://github.com/pyenv/pyenv.git /opt/circleci/.pyenv
+          export PYENV_ROOT="/opt/circleci/.pyenv"
+          export PATH="$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH"
+          pyenv install 3.9.4
+          pyenv global 3.9.4
+          python3 -m pip install --upgrade pip
+          python3 -m pip install wheel
       - uses: actions/checkout@v2
         with:
           ref: ${{github.head_ref}}
       - name: Get HEAD SHA
         id: vars
         run: echo "::set-output name=sha::$(git rev-parse --short HEAD)"
+      - name: Get Bazel version
+        id: bazel_info
+        run: echo "::set-output name=version::$(cat .bazelversion)"
+      - name: Install Bazel
+        run: |
+          wget -q https://github.com/bazelbuild/bazel/releases/download/${{ steps.bazel_info.outputs.version }}/bazel-${{ steps.bazel_info.outputs.version }}-linux-x86_64 -O /usr/bin/bazel
+          chmod a+x /usr/bin/bazel
+      - name: Install cudnn + tensorrt
+        run: |
+          apt-get update
+          wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin
+          mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600
+          apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub
+          apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 536F8F1DE80F6A35
+          apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A4B469963BF863CC
+          add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /"
+          apt-get update
+          apt-get install -y libcudnn8 libcudnn8-dev
+
+          apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub
+          add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /"
+          apt-get update
+
+          apt-get install -y libnvinfer8 libnvinfer-plugin8 libnvinfer-dev libnvinfer-plugin-dev
+      - name: Install Torch
+        run: |
+          export PYENV_ROOT="/opt/circleci/.pyenv"
+          export PATH="$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH"
+          pyenv global 3.9.4
+          python3 -m pip install -r py/requirements.txt
       - name: Build Python Package
         run: |
-          cp docker/WORKSPACE.docker WORKSPACE
+          cp toolchains/ci_workspaces/WORKSPACE.x86_64 WORKSPACE
           cd py
+          export PYENV_ROOT="/opt/circleci/.pyenv"
+          export PATH="$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH"
+          pyenv global 3.9.4
           python3 setup.py install
+          cd ..
       - name: Generate New Docs
         run: |
           cd docsrc
-          pip3 install -r requirements.txt
+          export PYENV_ROOT="/opt/circleci/.pyenv"
+          export PATH="$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH"
+          pyenv global 3.9.4
+          python3 -m pip install -r requirements.txt
           python3 -c "import torch_tensorrt; print(torch_tensorrt.__version__)"
           make html
+          cd ..
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
         # Required

.github/workflows/docgen.yml

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

.gitmodules

@@ -27,4 +27,13 @@ repos:
     -   id: buildifier
         args:
           - --warnings=all
-    -   id: buildifier-lint
+    -   id: buildifier-lint
+  - repo: local
+    hooks:
+    -   id: dont-commit-upstream
+        name: NVIDIA-INTERNAL check
+        entry: "!NVIDIA-INTERNAL"
+        exclude: "^.pre-commit-config.yaml"
+        language: pygrep
+        types: [text]
+

.pre-commit-config.yaml

@@ -18,20 +18,12 @@ We use the PyTorch Slack for communication about core development, integration w
 
 - We generally follow the coding guidelines used in PyTorch
 
-    - Use the built in linting tools to ensure that your code matches the style guidelines
-      ```sh
-      # C++ Linting (After installing clang-format [Version 9.0.0])
-      # Print non-conforming sections of code
-      bazel run //tools/linter:cpplint_diff -- //...
-      # Modify code to conform with style guidelines
-      bazel run //tools/linter:cpplint -- //...
-
-      # Python Linting
-      # Print non-conforming sections of code
-      bazel run //tools/linter:pylint_diff -- //...
-      # Modify code to conform with style guidelines
-      bazel run //tools/linter:pylint -- //...
-      ```
+    - Linting your code is essential to ensure code matches the style guidelines.
+      To begin with, please install the following dependencies
+      * `pip install -r requirements-dev.txt`
+      * Install Bazel buildifier https://github.com/bazelbuild/buildtools/blob/master/buildifier/README.md#setup
+
+      Once the above dependencies are installed, `git commit` command will perform linting before committing your code.
 
 - Avoid introducing unnecessary complexity into existing code so that maintainability and readability are preserved
 

CONTRIBUTING.md

@@ -80,7 +80,8 @@ trt_ts_module = torch_tensorrt.compile(torch_script_module,
             # For static size shape=[1, 3, 224, 224]
             dtype=torch.half) # Datatype of input tensor. Allowed options torch.(float|half|int8|int32|bool)
     ],
-    enabled_precisions = {torch.half}, # Run with FP16)
+    enabled_precisions = {torch.half}, # Run with FP16
+)
 
 result = trt_ts_module(input_data) # run inference
 torch.jit.save(trt_ts_module, "trt_torchscript_module.ts") # save the TRT embedded Torchscript

README.md

@@ -76,8 +76,8 @@ http_archive(
 http_archive(
     name = "cudnn",
     build_file = "@//third_party/cudnn/archive:BUILD",
-    sha256 = "7f3fbe6201708de409532a32d647af6b4bdb10d7f045d557270549e286487289",
-    strip_prefix = "cudnn-linux-x86_64-8.4.1.114_cuda11.4-archive",
+    sha256 = "ec96d2376d81fca42bdd3d4c3d705a99b29a065bab57f920561c763e29c67d01",
+    strip_prefix = "cudnn-linux-x86_64-8.4.1.50_cuda11.6-archive",
     urls = [
         "https://developer.nvidia.com/compute/cudnn/secure/8.4.1/local_installers/11.6/cudnn-linux-x86_64-8.4.1.50_cuda11.6-archive.tar.xz",
     ],

WORKSPACE

@@ -426,7 +426,8 @@ torch::jit::Module CompileGraph(const torch::jit::Module& mod, CompileSpec cfg)
       auto outputIsCollection = conversion::OutputIsCollection(g->block());
       if (cfg.partition_info.enabled &&
           (cfg.lower_info.forced_fallback_modules.size() == 0 &&
-           cfg.partition_info.forced_fallback_operators.size() == 0 && isBlockConvertible)) {
+           cfg.partition_info.forced_fallback_operators.size() == 0 && isBlockConvertible) &&
+          !outputIsCollection) {
         LOG_INFO("Skipping partitioning since model is fully supported");
       }