From 7b35a7a815d26198ca4f5081c5594e7987802a74 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 28 Mar 2025 09:19:55 +0100 Subject: [PATCH 1/5] docs --- docsrc/getting_started/jetpack.rst | 28 ++++++++++++++-------------- toolchains/jetpack/BUILD | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docsrc/getting_started/jetpack.rst b/docsrc/getting_started/jetpack.rst index ddbf89dc63..45016ad10d 100644 --- a/docsrc/getting_started/jetpack.rst +++ b/docsrc/getting_started/jetpack.rst @@ -1,18 +1,18 @@ -.. _Torch_TensorRT_in_JetPack_6.1 +.. _Torch_TensorRT_in_JetPack_6.2 Overview ################## -JetPack 6.1 +JetPack 6.2 --------------------- -Nvida JetPack 6.1 is the latest production release ofJetPack 6. +Nvida JetPack 6.2 is the latest production release ofJetPack 6. With this release it incorporates: CUDA 12.6 TensorRT 10.3 cuDNN 9.3 DLFW 24.09 -You can find more details for the JetPack 6.1: +You can find more details for the JetPack 6.2: * https://docs.nvidia.com/jetson/jetpack/release-notes/index.html * https://docs.nvidia.com/deeplearning/frameworks/install-pytorch-jetson-platform/index.html @@ -22,7 +22,7 @@ Prerequisites ~~~~~~~~~~~~~~ -Ensure your jetson developer kit has been flashed with the latest JetPack 6.1. You can find more details on how to flash Jetson board via sdk-manager: +Ensure your jetson developer kit has been flashed with the latest JetPack 6.2. You can find more details on how to flash Jetson board via sdk-manager: * https://developer.nvidia.com/sdk-manager @@ -57,10 +57,10 @@ Ensure libcusparseLt.so exists at /usr/local/cuda/lib64/: .. code-block:: sh # if not exist, download and copy to the directory - wget https://developer.download.nvidia.com/compute/cusparselt/redist/libcusparse_lt/linux-sbsa/libcusparse_lt-linux-sbsa-0.5.2.1-archive.tar.xz - tar xf libcusparse_lt-linux-sbsa-0.5.2.1-archive.tar.xz - sudo cp -a libcusparse_lt-linux-sbsa-0.5.2.1-archive/include/* /usr/local/cuda/include/ - sudo cp -a libcusparse_lt-linux-sbsa-0.5.2.1-archive/lib/* /usr/local/cuda/lib64/ + wget https://developer.download.nvidia.com/compute/cusparselt/redist/libcusparse_lt/linux-aarch64/libcusparse_lt-linux-aarch64-0.7.1.0-archive.tar.xz + tar xf libcusparse_lt-linux-aarch64-0.7.1.0-archive.tar.xz + sudo cp -a libcusparse_lt-linux-aarch64-0.7.1.0-archive/include/* /usr/local/cuda/include/ + sudo cp -a libcusparse_lt-linux-aarch64-0.7.1.0-archive/lib/* /usr/local/cuda/lib64/ Build torch_tensorrt @@ -71,7 +71,7 @@ Install bazel .. code-block:: sh - wget -v https://github.com/bazelbuild/bazelisk/releases/download/v1.20.0/bazelisk-linux-arm64 + wget -v https://github.com/bazelbuild/bazelisk/releases/download/v1.25.0/bazelisk-linux-arm64 sudo mv bazelisk-linux-arm64 /usr/bin/bazel chmod +x /usr/bin/bazel @@ -86,8 +86,8 @@ Install pip and required python packages: .. code-block:: sh - # install pytorch from nvidia jetson distribution: https://developer.download.nvidia.com/compute/redist/jp/v61/pytorch - python -m pip install torch https://developer.download.nvidia.com/compute/redist/jp/v61/pytorch/torch-2.5.0a0+872d972e41.nv24.08.17622132-cp310-cp310-linux_aarch64.whl + # install pytorch from nvidia jetson distribution: https://pypi.jetson-ai-lab.dev/jp6/cu126/ + pip3 install torch --index-url https://pypi.jetson-ai-lab.dev/jp6/cu126/ .. code-block:: sh @@ -101,9 +101,9 @@ Install pip and required python packages: Build and Install torch_tensorrt wheel file -Since torch_tensorrt version has dependencies on torch version. torch version supported by JetPack6.1 is from DLFW 24.08/24.09(torch 2.5.0). +Since torch_tensorrt version has dependencies on torch version. torch version supported by JetPack6.2 is from DLFW 24.08/24.09(torch 2.6.0). -Please make sure to build torch_tensorrt wheel file from source release/2.5 branch +Please make sure to build torch_tensorrt wheel file from source release/2.6 branch (TODO: lanl to update the branch name once release/ngc branch is available) .. code-block:: sh diff --git a/toolchains/jetpack/BUILD b/toolchains/jetpack/BUILD index ed37a864b6..2523059715 100644 --- a/toolchains/jetpack/BUILD +++ b/toolchains/jetpack/BUILD @@ -13,6 +13,6 @@ constraint_value( ) constraint_value( - name = "6.1", + name = "6.2", constraint_setting = ":jetpack", ) \ No newline at end of file From 87082d5016056884a80f54f6b7f4f3ee2ccbc693 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 28 Mar 2025 09:27:49 +0100 Subject: [PATCH 2/5] jetpack 6.2 official --- setup.py | 14 +++++++------- toolchains/jp_workspaces/MODULE.bazel.tmpl | 12 ++++++------ toolchains/jp_workspaces/requirements.txt | 5 +++-- toolchains/jp_workspaces/test_requirements.txt | 11 +++++++---- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/setup.py b/setup.py index 09933307c8..2dbc19968a 100644 --- a/setup.py +++ b/setup.py @@ -156,14 +156,14 @@ def load_dep_info(): JETPACK_VERSION = "4.6" elif version == "5.0": JETPACK_VERSION = "5.0" - elif version == "6.1": - JETPACK_VERSION = "6.1" + elif version == "6.2": + JETPACK_VERSION = "6.2" if not JETPACK_VERSION: warnings.warn( - "Assuming jetpack version to be 6.1, if not use the --jetpack-version option" + "Assuming jetpack version to be 6.2, if not use the --jetpack-version option" ) - JETPACK_VERSION = "6.1" + JETPACK_VERSION = "6.2" if PRE_CXX11_ABI: warnings.warn( @@ -225,9 +225,9 @@ def build_libtorchtrt_cxx11_abi( elif JETPACK_VERSION == "5.0": cmd.append("--platforms=//toolchains:jetpack_5.0") print("Jetpack version: 5.0") - elif JETPACK_VERSION == "6.1": - cmd.append("--platforms=//toolchains:jetpack_6.1") - print("Jetpack version: 6.1") + elif JETPACK_VERSION == "6.2": + cmd.append("--platforms=//toolchains:jetpack_6.2") + print("Jetpack version: 6.2") if CI_BUILD: cmd.append("--platforms=//toolchains:ci_rhel_x86_64_linux") diff --git a/toolchains/jp_workspaces/MODULE.bazel.tmpl b/toolchains/jp_workspaces/MODULE.bazel.tmpl index dd694b91d2..f76fa1b948 100644 --- a/toolchains/jp_workspaces/MODULE.bazel.tmpl +++ b/toolchains/jp_workspaces/MODULE.bazel.tmpl @@ -4,18 +4,18 @@ module( version = "${BUILD_VERSION}" ) -bazel_dep(name = "googletest", version = "1.14.0") -bazel_dep(name = "platforms", version = "0.0.10") -bazel_dep(name = "rules_cc", version = "0.0.9") -bazel_dep(name = "rules_python", version = "0.34.0") +bazel_dep(name = "googletest", version = "1.16.0") +bazel_dep(name = "platforms", version = "0.0.11") +bazel_dep(name = "rules_cc", version = "0.1.1") +bazel_dep(name = "rules_python", version = "1.3.0") python = use_extension("@rules_python//python/extensions:python.bzl", "python") python.toolchain( ignore_root_user_error = True, - python_version = "3.11", + python_version = "3.10", ) -bazel_dep(name = "rules_pkg", version = "1.0.1") +bazel_dep(name = "rules_pkg", version = "1.1.0") git_override( module_name = "rules_pkg", commit = "17c57f4", diff --git a/toolchains/jp_workspaces/requirements.txt b/toolchains/jp_workspaces/requirements.txt index a934d2e75d..075cca8919 100644 --- a/toolchains/jp_workspaces/requirements.txt +++ b/toolchains/jp_workspaces/requirements.txt @@ -1,4 +1,5 @@ -setuptools==70.2.0 -numpy<2.0.0 +--index-url https://pypi.jetson-ai-lab.dev/jp6/cu126 +setuptools>=70.2.0 +numpy packaging pyyaml diff --git a/toolchains/jp_workspaces/test_requirements.txt b/toolchains/jp_workspaces/test_requirements.txt index 1d8a5eb97d..625244ab5b 100644 --- a/toolchains/jp_workspaces/test_requirements.txt +++ b/toolchains/jp_workspaces/test_requirements.txt @@ -1,9 +1,12 @@ -expecttest==0.1.6 -networkx==2.8.8 -numpy<2.0.0 +--index-url https://pypi.jetson-ai-lab.dev/jp6/cu126 +expecttest>=0.1.6 +networkx>=2.8.8 +numpy parameterized>=0.2.0 pytest>=8.2.1 pytest-xdist>=3.6.1 pyyaml transformers -# TODO: currently timm torchvision nvidia-modelopt does not have distributions for jetson \ No newline at end of file +timm +torchvision +# TODO: currently nvidia-modelopt does not have distributions for jetson \ No newline at end of file From 6e21064057b93a44a4b7121ff33aeddc99bf6a73 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 28 Mar 2025 09:30:21 +0100 Subject: [PATCH 3/5] Update jetpack.rst --- docsrc/getting_started/jetpack.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docsrc/getting_started/jetpack.rst b/docsrc/getting_started/jetpack.rst index 45016ad10d..9d7605f0f6 100644 --- a/docsrc/getting_started/jetpack.rst +++ b/docsrc/getting_started/jetpack.rst @@ -87,7 +87,7 @@ Install pip and required python packages: .. code-block:: sh # install pytorch from nvidia jetson distribution: https://pypi.jetson-ai-lab.dev/jp6/cu126/ - pip3 install torch --index-url https://pypi.jetson-ai-lab.dev/jp6/cu126/ + pip3 install torch torchvision torchaudio --index-url https://pypi.jetson-ai-lab.dev/jp6/cu126/ .. code-block:: sh From 68d48eb3fb4ec34b63a21289ac16ec46e9dd0a06 Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 10 Apr 2025 23:37:25 +0200 Subject: [PATCH 4/5] Update jetpack.rst --- docsrc/getting_started/jetpack.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docsrc/getting_started/jetpack.rst b/docsrc/getting_started/jetpack.rst index 9d7605f0f6..2e83b0a625 100644 --- a/docsrc/getting_started/jetpack.rst +++ b/docsrc/getting_started/jetpack.rst @@ -10,7 +10,7 @@ With this release it incorporates: CUDA 12.6 TensorRT 10.3 cuDNN 9.3 -DLFW 24.09 +DLFW 24.0 You can find more details for the JetPack 6.2: @@ -101,10 +101,9 @@ Install pip and required python packages: Build and Install torch_tensorrt wheel file -Since torch_tensorrt version has dependencies on torch version. torch version supported by JetPack6.2 is from DLFW 24.08/24.09(torch 2.6.0). +Since torch_tensorrt version has dependencies on torch version. torch version supported by JetPack 6.2 is from DLFW 24.0 (torch 2.6.0) or distributed wheels https://pypi.jetson-ai-lab.dev/jp6/cu126 Please make sure to build torch_tensorrt wheel file from source release/2.6 branch -(TODO: lanl to update the branch name once release/ngc branch is available) .. code-block:: sh From efa9795d69a3c73d38b34b6b46a9e0a0c9b1505a Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 10 Apr 2025 23:49:09 +0200 Subject: [PATCH 5/5] Update jetpack.rst --- docsrc/getting_started/jetpack.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docsrc/getting_started/jetpack.rst b/docsrc/getting_started/jetpack.rst index 2e83b0a625..91dd4ba7f4 100644 --- a/docsrc/getting_started/jetpack.rst +++ b/docsrc/getting_started/jetpack.rst @@ -101,7 +101,7 @@ Install pip and required python packages: Build and Install torch_tensorrt wheel file -Since torch_tensorrt version has dependencies on torch version. torch version supported by JetPack 6.2 is from DLFW 24.0 (torch 2.6.0) or distributed wheels https://pypi.jetson-ai-lab.dev/jp6/cu126 +Since torch_tensorrt version has dependencies on torch version. torch version supported by JetPack 6.2 is from NVIDA NGC 24.0 (torch 2.6.0) or distributed wheels https://pypi.jetson-ai-lab.dev/jp6/cu126 Please make sure to build torch_tensorrt wheel file from source release/2.6 branch