chore: update CI for new build path

Signed-off-by: Naren Dasan <[email protected]>
Signed-off-by: Naren Dasan <[email protected]>

Author: narendasan

.circleci/config.yml

@@ -282,46 +282,54 @@ commands:
   build-py:
     description: "Build the torch-tensorrt python release (pre-cxx11-abi)"
     parameters:
+      cuda-version:
+        type: string
+      torch-build-index:
+        type: string
       platform:
         type: string
         default: "x86_64"
     steps:
       - run:
           name: Build torch-tensorrt python release (pre-cxx11-abi)
           command: |
-            export CUDA_HOME=/usr/local/cuda-11.8/
+            export CUDA_HOME=/usr/local/cuda-<< parameters.cuda-version >>/
             mv toolchains/ci_workspaces/WORKSPACE.<< parameters.platform >> WORKSPACE
-            cd py
-            python3 -m pip install wheel setuptools
-            python3 -m pip install pybind11==2.6.2
-            python3 setup.py bdist_wheel
-            python3 setup.py install
+            python3 -m pip install pip==21.3.1
+            python3 -m pip wheel --verbose --pre . --extra-index-url << parameters.torch-build-index >> -w dist
+            python3 -m pip install dist/torch_tensorrt*
             mkdir -p /tmp/dist/builds
-            cp dist/* /tmp/dist/builds
+            cp dist/torch_tensorrt* /tmp/dist/builds
 
   build-py-legacy:
     description: "Build the torch-tensorrt python legacy release (pre-cxx11-abi)"
     parameters:
+      cuda-version:
+        type: string
+      torch-build-index:
+        type: string
       platform:
         type: string
         default: "x86_64"
     steps:
       - run:
           name: Build torch-tensorrt python legacy release (pre-cxx11-abi)
           command: |
-            export CUDA_HOME=/usr/local/cuda-11.8/
+            export CUDA_HOME=/usr/local/cuda-<< parameters.cuda-version >>/
             mv toolchains/ci_workspaces/WORKSPACE.<< parameters.platform >> WORKSPACE
-            cd py
-            python3 -m pip install wheel setuptools
-            python3 -m pip install pybind11==2.6.2
-            python3 setup.py bdist_wheel --legacy
-            python3 setup.py install --legacy
+            python3 -m pip install pip==21.3.1
+            python3 -m pip wheel --verbose --pre . --extra-index-url << parameters.torch-build-index >> --config-setting="--build-option=--legacy" -w dist
+            python3 -m pip install dist/torch_tensorrt*
             mkdir -p /tmp/dist/builds
-            cp dist/* /tmp/dist/builds
+            cp dist/torch_tensorrt* /tmp/dist/builds
 
   build-py-cxx11-abi:
     description: "Build the torch-tensorrt python release (cxx11-abi)"
     parameters:
+      cuda-version:
+        type: string
+      torch-build-index:
+        type: string
       platform:
         type: string
         default: "x86_64"
@@ -333,36 +341,38 @@ commands:
           name: Build setup
           command: |
             mv ~/project/toolchains/ci_workspaces/WORKSPACE.<< parameters.platform >> ~/project/WORKSPACE
-            python3 -m pip install wheel setuptools
-            python3 -m pip install pybind11==2.6.2
       - when:
           condition: << parameters.release >>
           steps:
             - run:
                 name: Build torch-tensorrt python release package
                 command: |
-                  export CUDA_HOME=/usr/local/cuda-11.8/
-                  cd ~/project/py
-                  python3 setup.py bdist_wheel --use-cxx11-abi --release
-                  python3 setup.py install --use-cxx11-abi --release
+                  export CUDA_HOME=/usr/local/cuda-<< parameters.cuda-version >>/
+                  python3 -m pip install pip==21.3.1
+                  python3 -m pip wheel --verbose --pre . --extra-index-url << parameters.torch-build-index >> --config-setting="--build-option=--release" --config-setting="--build-option=--use-cxx11-abi" -w dist
+                  python3 -m pip install dist/torch_tensorrt*
                   mkdir -p /tmp/dist/builds
-                  cp dist/* /tmp/dist/builds
+                  cp dist/torch_tensorrt* /tmp/dist/builds
       - unless:
           condition: << parameters.release >>
           steps:
             - run:
                 name: Build torch-tensorrt python package
                 command: |
-                  export CUDA_HOME=/usr/local/cuda-11.8/
-                  cd ~/project/py
-                  python3 setup.py bdist_wheel --use-cxx11-abi
-                  python3 setup.py install --use-cxx11-abi
+                  export CUDA_HOME=/usr/local/cuda-<< parameters.cuda-version >>/
+                  python3 -m pip install pip==21.3.1
+                  python3 -m pip wheel --verbose --pre . --extra-index-url << parameters.torch-build-index >> --config-setting="--build-option=--use-cxx11-abi" -w dist
+                  python3 -m pip install dist/torch_tensorrt*
                   mkdir -p /tmp/dist/builds
-                  cp dist/* /tmp/dist/builds
+                  cp dist/torch_tensorrt* /tmp/dist/builds
 
   build-py-fx-only:
     description: "Build the torch-tensorrt python release with only the fx backend"
     parameters:
+      cuda-version:
+        type: string
+      torch-build-index:
+        type: string
       platform:
         type: string
         default: "x86_64"
@@ -371,15 +381,13 @@ commands:
       - run:
           name: Build torch-tensorrt python release with only the fx backend
           command: |
-            export CUDA_HOME=/usr/local/cuda-11.8/
+            export CUDA_HOME=/usr/local/cuda-<< parameters.cuda-version >>/
             mv toolchains/ci_workspaces/WORKSPACE.<< parameters.platform >> WORKSPACE
-            cd py
-            python3 -m pip install wheel setuptools
-            python3 -m pip install pybind11==2.6.2
-            python3 setup.py bdist_wheel --fx-only
-            python3 setup.py install --fx-only
+            python3 -m pip install pip==21.3.1
+            python3 -m pip wheel --verbose --pre . --extra-index-url << parameters.torch-build-index >> --config-setting="--build-option=--fx-only" -w dist
+            python3 -m pip install dist/torch_tensorrt*
             mkdir -p /tmp/dist/builds
-            cp dist/* /tmp/dist/builds
+            cp dist/torch_tensorrt* /tmp/dist/builds
 
   build-py-ngc:
     description: "Build the torch-tensorrt python release for NGC PyTorch (cxx11-abi)"
@@ -410,22 +418,21 @@ commands:
             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"
+                  docker exec ngc_build_container bash -c "cd /workspace/ && python3 -m pip wheel --verbose --pre . --config-setting="--build-option=--release" --config-setting="--build-option=--use-cxx11-abi" -w dist"
       - 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"
+                  docker exec ngc_build_container bash -c "cd /workspace/py && python3 -m pip wheel --verbose --pre . --config-setting="--build-option=--use-cxx11-abi" -w dist"
       - run:
           name: Collect builds
           command: |
@@ -808,6 +815,8 @@ jobs:
         type: string
       python-version:
         type: string
+      cuda-version:
+        type: string
       cxx11-abi:
         type: boolean
         default: false
@@ -834,18 +843,24 @@ jobs:
       - when:
           condition: << parameters.cxx11-abi >>
           steps:
-            - build-py-cxx11-abi
+            - build-py-cxx11-abi:
+                cuda-version: << parameters.cuda-version >>
+                torch-build-index: << parameters.torch-build-index >>
       - unless:
           condition: << parameters.cxx11-abi >>
           steps:
             - when:
                 condition: << parameters.legacy >>
                 steps:
-                  - build-py-legacy
+                  - build-py-legacy:
+                      cuda-version: << parameters.cuda-version >>
+                      torch-build-index: << parameters.torch-build-index >>
             - unless:
                 condition: << parameters.legacy >>
                 steps:
-                  - build-py
+                  - build-py:
+                      cuda-version: << parameters.cuda-version >>
+                      torch-build-index: << parameters.torch-build-index >>
       - run:
           name: Move to build dir
           command: |
@@ -1140,8 +1155,8 @@ jobs:
                   TRT_VERSION=$(python3 -c "from versions import __tensorrt_version__;print(__tensorrt_version__)")
                   CUDNN_VERSION=$(python3 -c "from versions import __cudnn_version__;print(__cudnn_version__)")
                   TORCH_VERSION=$(python3 -c "from torch import __version__;print(__version__.split('+')[0])")
-                  pip3 install --upgrade pip
-                  pip3 install -r ~/project/py/requirements.txt
+                  python3 -m pip install pip==21.3.1
+                  python3 -m pip install -r ~/project/py/requirements.txt
                   TORCH_VERSION=$(python3 -c "from torch import __version__;print(__version__.split('+')[0])")
                   mkdir -p ~/project/py/dist/
                   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}-x86_64-linux.tar.gz
@@ -1338,6 +1353,10 @@ parameters:
     type: string
     default: "3.9.4"
 
+  cuda-version:
+    type: string
+    default: "11.8"
+
   # Nightly platform config
   torch-build:
     type: string
@@ -1418,6 +1437,7 @@ workflows:
           torchvision-build: << pipeline.parameters.torchvision-build >>
           torch-build-index: << pipeline.parameters.torch-build-index >>
           python-version: << pipeline.parameters.python-version >>
+          cuda-version: << pipeline.parameters.cuda-version >>
 
       - test-core-cpp-x86_64-linux:
           torch-build: << pipeline.parameters.torch-build >>
@@ -1459,6 +1479,7 @@ workflows:
 
       - build-x86_64-linux:
           name: build-x86_64-linux-legacy
+          cuda-version: << pipeline.parameters.cuda-version >>
           torch-build: << pipeline.parameters.torch-build-legacy >>
           torchvision-build: << pipeline.parameters.torchvision-build-legacy >>
           torch-build-index: << pipeline.parameters.torch-build-index-legacy >>
@@ -1551,6 +1572,7 @@ workflows:
   on-push:
     jobs:
       - build-x86_64-linux:
+          cuda-version: << pipeline.parameters.cuda-version >>
           torch-build: << pipeline.parameters.torch-build >>
           torchvision-build: << pipeline.parameters.torchvision-build >>
           torch-build-index: << pipeline.parameters.torch-build-index >>

pyproject.toml

@@ -11,8 +11,8 @@ requires = [
     "typing_extensions",
     "future",
     "tensorrt>=8.6,<8.7",
-    "torch >=2.0.0,<2.1.0",
-    #"torch==2.1.0.dev20230605+cu118",
+    #"torch >=2.0.0,<2.1.0",
+    "torch==2.1.0.dev20230605+cu118",
     "pybind11==2.6.2"
 ]
 build-backend = "setuptools.build_meta"
@@ -75,6 +75,40 @@ no_implicit_optional = true
 
 [tool.setuptools]
 package-dir = {"" = "py"}
+include-package-data = true
+
+[tool.setuptools.package-data]
+torch_tensorrt = [
+    "BUILD",
+    "WORKSPACE",
+]
+"torch_tensorrt.include" = [
+    "include/torch_tensorrt/*.h",
+    "include/torch_tensorrt/core/*.h",
+    "include/torch_tensorrt/core/conversion/*.h",
+    "include/torch_tensorrt/core/conversion/conversionctx/*.h",
+    "include/torch_tensorrt/core/conversion/converters/*.h",
+    "include/torch_tensorrt/core/conversion/evaluators/*.h",
+    "include/torch_tensorrt/core/conversion/tensorcontainer/*.h",
+    "include/torch_tensorrt/core/conversion/var/*.h",
+    "include/torch_tensorrt/core/ir/*.h",
+    "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",
+    "include/torch_tensorrt/core/util/*.h",
+    "include/torch_tensorrt/core/util/logging/*.h",
+]
+"torch_tensorrt.lib" = ["*"]
+"torch_tensorrt.bin" = ["*"]
+
+[tool.setuptools.exclude-package-data]
+torch_tensorrt = ["csrc/"]
 
 [tool.setuptools.packages.find]
 where = ["py"]