Merge branch 'master' into partitioning_ctx

Author: narendasan

.circleci/config.yml

@@ -19,6 +19,81 @@ commands:
             sudo wget -q https://github.com/bazelbuild/bazel/releases/download/<< parameters.version >>/bazel-<< parameters.version >>-linux-<< parameters.platform >> -O /usr/bin/bazel
             sudo chmod a+x /usr/bin/bazel
 
+  install-cmake:
+    description: Install CMake.
+    parameters:
+        cache:
+            default: true
+            description: Whether or not to cache the installation.
+            type: boolean
+        cache-key:
+            default: v1
+            description: String to use in cache key. Typically overridden when needed to bust cache.
+            type: string
+        install-dir:
+            default: $HOME/cmake
+            description: The path to install CMake to.
+            type: string
+        version:
+            default: 3.18.2
+            description: The version of CMake to install.
+            type: string
+    steps:
+        - when:
+            condition:
+                equal:
+                    - << parameters.cache >>
+                    - true
+            steps:
+                - run:
+                    command: mkdir -pv << parameters.install-dir >>
+                    name: Prep cache restore
+                - restore_cache:
+                    keys:
+                        - cmake-<< parameters.cache-key >>-<< parameters.version >>
+        - run:
+            command: |
+                echo 'export PATH="<< parameters.install-dir >>/bin:$PATH"' >> $BASH_ENV
+            name: Add CMake to PATH
+        - run:
+            command: |
+                if which cmake; then
+                  if cmake --version | grep "<< parameters.version >>"; then
+                    echo "CMake is already installed."
+                    exit 0
+                  else
+                    echo "CMake is already installed but it is the wrong version."
+                  fi
+                fi
+
+                rm -rf << parameters.install-dir >>/*
+                echo "Installing the requested version of CMake."
+                baseUrl="https://github.com/Kitware/CMake/releases/download/"
+                url="${baseUrl}/v<< parameters.version >>/cmake-<< parameters.version >>-Linux-x86_64.tar.gz"
+                curl -sSL -o /tmp/cmake.tar.gz $url
+                tar -C << parameters.install-dir >> --strip-components 1 -zxf /tmp/cmake.tar.gz
+            name: Install CMake
+        - run:
+            command: rm -rf << parameters.install-dir >>/{doc,man}
+            name: Remove unnecessary files
+        - run:
+            command: |
+                ls -l << parameters.install-dir >>/bin
+                echo $PATH
+                cmake --version
+            name: Verify CMake installation
+        - when:
+            condition:
+                equal:
+                    - << parameters.cache >>
+                    - true
+            steps:
+                - save_cache:
+                    key: cmake-<< parameters.cache-key >>-<< parameters.version >>
+                    paths:
+                        - << parameters.install-dir >>
+
+
   install-cuda:
     description: "Install CUDA"
     parameters:
@@ -207,6 +282,30 @@ commands:
             mkdir -p /tmp/dist/builds
             cp dist/* /tmp/dist/builds
 
+  build-cmake:
+    description: "Build the torch-tensorrt using CMake"
+    parameters:
+      platform:
+        type: string
+        default: "x86_64"
+    steps:
+      - run:
+          name: Build torch-tensorrt library with CMake
+          command: |
+            mkdir build
+            export PATH=$PATH:/usr/local/cuda/bin
+            ~/cmake/bin/cmake -S. -Bbuild \
+              -DCMAKE_MODULE_PATH=cmake/Module \
+              -DTorch_DIR=/opt/circleci/.pyenv/versions/3.9.4/lib/python3.9/site-packages/torch/share/cmake/Torch \
+              -DTensorRT_ROOT=/usr \
+              -DCMAKE_BUILD_TYPE=Debug
+            cmake --build build -- -j12
+            mkdir -p /tmp/dist/builds
+            cp -r build/bin /tmp/dist/builds
+            cp -r build/lib /tmp/dist/builds
+            cp -r cpp/include /tmp/dist/builds
+
+
   dump-test-env:
     description: "Dump the test env to console"
     steps:
@@ -632,7 +731,7 @@ jobs:
                 platform: "x86_64"
                 cudnn-version: << pipeline.parameters.cudnn-release-version >>
                 trt-version-short:  << pipeline.parameters.trt-release-version-short >>
-                bazel-version: "5.1.1"
+                bazel-version: << pipeline.parameters.bazel-version >>
                 bazel-platform: "x86_64"
             - run:
                 name: Build cxx11-abi tarball
@@ -703,7 +802,7 @@ jobs:
           platform: "sbsa"
           cudnn-version: << pipeline.parameters.cudnn-jetson-version >>
           trt-version-short:  << pipeline.parameters.trt-jetson-version-short >>
-          bazel-version: "5.1.1"
+          bazel-version: << pipeline.parameters.bazel-version >>
           bazel-platform: "arm64"
       - run:
           name: Set python version
@@ -742,6 +841,45 @@ jobs:
           path: /tmp/dist/jetson
           destination: aarch64-release-pkgs
 
+  build-x86_64-cmake:
+    parameters:
+      cudnn-version:
+        type: string
+      trt-version-short:
+        type: string
+      torch-build:
+        type: string
+      torch-build-index:
+        type: string
+    machine:
+      image: ubuntu-2004-cuda-11.4:202110-01
+    resource_class: xlarge
+    steps:
+      - checkout
+      - create-env:
+          os: "ubuntu2004"
+          platform: "x86_64"
+          cudnn-version: << parameters.cudnn-version >>
+          trt-version-short:  << parameters.trt-version-short >>
+          bazel-platform: "x86_64"
+      - install-cmake:
+          version: 3.24.1
+      - install-torch-from-index:
+          torch-build:  << parameters.torch-build >>
+          torch-build-index: << parameters.torch-build-index >>
+      - build-cmake
+      - run:
+          name: Move to cmake build dir
+          command: |
+            mkdir -p /tmp/dist/cmake
+            cp -r /tmp/dist/builds/* /tmp/dist/cmake
+      - persist_to_workspace:
+          root: /tmp/dist
+          paths:
+            - cmake
+      - store_artifacts:
+          path: /tmp/dist/cmake
+          destination: x86_64-cmake
 
 parameters:
   bazel-version:
@@ -751,7 +889,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"
@@ -821,7 +959,6 @@ workflows:
           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 >>
@@ -855,7 +992,6 @@ workflows:
           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 >>
@@ -901,7 +1037,6 @@ workflows:
           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"
@@ -958,7 +1093,6 @@ workflows:
           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 >>
@@ -1025,3 +1159,17 @@ workflows:
           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 >>

.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,66 @@ 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: Set up Python 3.9.4
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9.4 
       - 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: |
+          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
+          echo $(which python3)
+          echo $(python3 -c 'import site; print(site.getsitepackages()[0])')
+          mkdir -p /opt/circleci/.pyenv/versions/3.9.4/lib/python3.9/
+          ln -s $(python3 -c 'import site; print(site.getsitepackages()[0])') /opt/circleci/.pyenv/versions/3.9.4/lib/python3.9/site-packages
           python3 setup.py install
+          cd ..
       - name: Generate New Docs
         run: |
           cd docsrc
-          pip3 install -r requirements.txt
+          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