Updated config.yml

Author: narendasan

.circleci/config.yml

@@ -662,9 +662,6 @@ jobs:
 
   package-jetson:
     parameters:
-      enabled:
-        type: boolean
-        default: false
       torch-build:
         type: string
       jetpack-version:
@@ -679,72 +676,63 @@ jobs:
       image: ubuntu-2004:202201-02
     resource_class: arm.xlarge
     steps:
-      - when:
-          condition: << parameters.enabled >>
-          steps:
-            - checkout
-            #- run:
-            #    name: Upgrade base
-            #    command: |
-            #      sudo apt clean
-            #      sudo apt update
-            #      sudo apt upgrade
-            #      sudo apt install software-properties-common
-            - install-cuda:
-                os: "ubuntu2004"
-                platform: "sbsa"
-                cuda-pkg-name: "cuda-toolkit-11-4"
-            - run:
-                name: Install openblas
-                command: sudo apt install libopenblas-dev
-            - create-env:
-                os: "ubuntu2004"
-                platform: "sbsa"
-                cudnn-version: << pipeline.parameters.cudnn-jetson-version >>
-                trt-version-short:  << pipeline.parameters.trt-jetson-version-short >>
-                bazel-version: "5.1.1"
-                bazel-platform: "arm64"
-            - run:
-                name: Set python version
-                command: |
-                  pyenv install << parameters.python-version >>
-                  pyenv global << parameters.python-version >>
-            - run:
-                name: Install NGC Torch
-                environment:
-                  TORCH_INSTALL: https://developer.download.nvidia.com/compute/redist/jp/v<< parameters.jetpack-version >>/pytorch/<< parameters.torch-build >>
-                command: |
-                  set -e
-                  python3 -m pip install --upgrade pip; python3 -m pip install setuptools wheel; python3 -m pip install expecttest xmlrunner hypothesis aiohttp numpy=='1.19.4' pyyaml scipy=='1.5.3' ninja cython typing_extensions protobuf; export "LD_LIBRARY_PATH=/usr/lib/llvm-8/lib:$LD_LIBRARY_PATH"; python3 -m pip install --upgrade protobuf; python3 -m pip install --no-cache $TORCH_INSTALL
-            - build-py-cxx11-abi:
-                platform: "sbsa"
-                release: true
-            - run:
-                name: Build cxx11-abi tarball
-                command: |
-                  set -e
-                  bazel build //:libtorchtrt -c opt
-                  CUDA_VERSION=$(cd torch_tensorrt && python3 -c "from _version import __cuda_version__;print(__cuda_version__)")
-                  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
-                  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}.tar.gz
-            - run:
-                name: Move to release dir
-                command: |
-                  mkdir -p /tmp/dist/jetson
-                  cp -r ~/project/py/dist/* /tmp/dist/jetson
-            - store_artifacts:
-                path: /tmp/dist/jetson
-                destination: aarch64-release-pkgs
-      - unless:
-          condition: << parameters.enabled >>
-          steps:
-            - run:
-                name: Skipped packaging
-                command: echo -e "Packaging stage not enabled"
+      - checkout
+      #- run:
+      #    name: Upgrade base
+      #    command: |
+      #      sudo apt clean
+      #      sudo apt update
+      #      sudo apt upgrade
+      #      sudo apt install software-properties-common
+      - install-cuda:
+          os: "ubuntu2004"
+          platform: "sbsa"
+          cuda-pkg-name: "cuda-toolkit-11-4"
+      - run:
+          name: Install openblas
+          command: sudo apt install libopenblas-dev
+      - create-env:
+          os: "ubuntu2004"
+          platform: "sbsa"
+          cudnn-version: << pipeline.parameters.cudnn-jetson-version >>
+          trt-version-short:  << pipeline.parameters.trt-jetson-version-short >>
+          bazel-version: "5.1.1"
+          bazel-platform: "arm64"
+      - run:
+          name: Set python version
+          command: |
+            pyenv install << parameters.python-version >>
+            pyenv global << parameters.python-version >>
+      - run:
+          name: Install NGC Torch
+          environment:
+            TORCH_INSTALL: https://developer.download.nvidia.com/compute/redist/jp/v<< parameters.jetpack-version >>/pytorch/<< parameters.torch-build >>
+          command: |
+            set -e
+            python3 -m pip install --upgrade pip; python3 -m pip install setuptools wheel; python3 -m pip install expecttest xmlrunner hypothesis aiohttp numpy=='1.19.4' pyyaml scipy=='1.5.3' ninja cython typing_extensions protobuf; export "LD_LIBRARY_PATH=/usr/lib/llvm-8/lib:$LD_LIBRARY_PATH"; python3 -m pip install --upgrade protobuf; python3 -m pip install --no-cache $TORCH_INSTALL
+      - build-py-cxx11-abi:
+          platform: "sbsa"
+          release: true
+      - run:
+          name: Build cxx11-abi tarball
+          command: |
+            set -e
+            bazel build //:libtorchtrt -c opt
+            CUDA_VERSION=$(cd torch_tensorrt && python3 -c "from _version import __cuda_version__;print(__cuda_version__)")
+            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
+            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}.tar.gz
+      - run:
+          name: Move to release dir
+          command: |
+            mkdir -p /tmp/dist/jetson
+            cp -r ~/project/py/dist/* /tmp/dist/jetson
+      - store_artifacts:
+          path: /tmp/dist/jetson
+          destination: aarch64-release-pkgs
 
 
 parameters:
@@ -821,7 +809,6 @@ workflows:
           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 >>
@@ -846,7 +833,7 @@ workflows:
           requires:
             - build-x86_64-pyt-release
 
-      - test-py-ts-x86_64:
+      - test-py-fx-x86_64:
           name: test-py-fx-x86_64-pyt-release
           channel: "release"
           torch-build: << pipeline.parameters.torch-release-build >>
@@ -856,7 +843,6 @@ workflows:
             - 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 >>
@@ -889,6 +875,7 @@ workflows:
           trt-version-long: << pipeline.parameters.trt-nightly-version-long >>
           requires:
             - build-x86_64-pyt-nightly
+            
   release:
     when: << pipeline.parameters.packaging-enabled >>
     jobs:
@@ -901,6 +888,7 @@ 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"
@@ -921,7 +909,7 @@ workflows:
           requires:
             - build-x86_64-pyt-release
 
-      - test-py-ts-x86_64:
+      - test-py-fx-x86_64:
           name: test-py-fx-x86_64-pyt-release
           channel: "release"
           torch-build: << pipeline.parameters.torch-release-build >>
@@ -930,6 +918,7 @@ workflows:
           requires:
             - build-x86_64-pyt-release
 
+
       - package-x86_64:
           name: package-release-x86_64
           enabled: << pipeline.parameters.packaging-enabled >>
@@ -946,7 +935,6 @@ workflows:
           torch-build: << pipeline.parameters.torch-jetson-build >>
           jetpack-version: << pipeline.parameters.jetpack-version >>
           python-version: 3.8.10
-
           requires:
             - build-aarch64-pyt-jetson
 
@@ -958,7 +946,6 @@ workflows:
           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 >>
@@ -983,7 +970,7 @@ workflows:
           requires:
             - build-x86_64-pyt-release
 
-      - test-py-ts-x86_64:
+      - test-py-fx-x86_64:
           name: test-py-fx-x86_64-pyt-release
           channel: "release"
           torch-build: << pipeline.parameters.torch-release-build >>
@@ -992,14 +979,6 @@ workflows:
           requires:
             - build-x86_64-pyt-release
 
-      - deploy-py-x86_64:
-          name: deploy-release-x86_86-py
-          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 >>
-
-
 
       - build-x86_64-pyt-nightly:
           torch-build: << pipeline.parameters.torch-nightly-build >>
@@ -1032,4 +1011,4 @@ workflows:
           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-pyt-nightly