Skip to content

Commit

Permalink
Merge pull request #103 from NVIDIA-ISAAC-ROS/release-2.1
Browse files Browse the repository at this point in the history 
Isaac ROS 2.1.0
  • Loading branch information
@hemalshahNV
hemalshahNV authored Nov 17, 2023
2 parents 6d3c5c0 + cb6347a commit a303702
Show file tree
Hide file tree
Showing 12 changed files with 55 additions and 9 deletions.
30 changes: 30 additions & 0 deletions docker/Dockerfile.cvcuda
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Copyright (c) 2023, NVIDIA CORPORATION. All rights reserved.
#
# NVIDIA CORPORATION and its licensors retain all intellectual property
# and proprietary rights in and to this software, related documentation
# and any modifications thereto. Any use, reproduction, disclosure or
# distribution of this software and related documentation without an express
# license agreement from NVIDIA CORPORATION is strictly prohibited.

# Install cvCUDA into the dev image

ARG BASE_IMAGE
FROM ${BASE_IMAGE}

RUN if [ "$(uname -m)" = "x86_64" ]; then \
cd /tmp; \
wget https://github.com/CVCUDA/CV-CUDA/releases/download/v0.4.0-beta/nvcv-lib-0.4.0_beta-cuda11-x86_64-linux.deb; \
dpkg -i nvcv-lib-0.4.0_beta-cuda11-x86_64-linux.deb; \
wget https://github.com/CVCUDA/CV-CUDA/releases/download/v0.4.0-beta/nvcv-dev-0.4.0_beta-cuda11-x86_64-linux.deb; \
dpkg -i nvcv-dev-0.4.0_beta-cuda11-x86_64-linux.deb; \
wget https://github.com/CVCUDA/CV-CUDA/releases/download/v0.4.0-beta/nvcv-lib-0.4.0_beta-cuda11-x86_64-linux.deb; \
dpkg -i nvcv-lib-0.4.0_beta-cuda11-x86_64-linux.deb; \
else \
echo "Not available on aarch64 pending availability of https://github.com/CVCUDA/CV-CUDA/releases/download/v0.4.0-beta/nvcv-lib-0.4.0_beta-cuda11-aarch64-linux.deb" ; \
# cd /tmp; \
# wget https://github.com/CVCUDA/CV-CUDA/releases/download/v0.4.0-beta/nvcv-lib-0.4.0_beta-cuda11-aarch64-linux.deb; \
# dpkg -i nvcv-lib-0.4.0_beta-cuda11-aarch64-linux.deb; \
# wget https://github.com/CVCUDA/CV-CUDA/releases/download/v0.4.0-beta/nvcv-dev-0.4.0_beta-cuda11-aarch64-linux.deb; \
# dpkg -i nvcv-dev-0.4.0_beta-cuda11-aarch64-linux.deb; \
fi

8 changes: 8 additions & 0 deletions docker/Dockerfile.realsense
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# Copyright (c) 2023, NVIDIA CORPORATION. All rights reserved.
#
# NVIDIA CORPORATION and its licensors retain all intellectual property
# and proprietary rights in and to this software, related documentation
# and any modifications thereto. Any use, reproduction, disclosure or
# distribution of this software and related documentation without an express
# license agreement from NVIDIA CORPORATION is strictly prohibited.

# Dockerfile for setting up Realsense driver
# https://github.com/jetsonhacks/installRealSenseSDK
ARG BASE_IMAGE
Expand Down
8 changes: 8 additions & 0 deletions docker/Dockerfile.zed
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# Copyright (c) 2023, NVIDIA CORPORATION. All rights reserved.
#
# NVIDIA CORPORATION and its licensors retain all intellectual property
# and proprietary rights in and to this software, related documentation
# and any modifications thereto. Any use, reproduction, disclosure or
# distribution of this software and related documentation without an express
# license agreement from NVIDIA CORPORATION is strictly prohibited.

ARG BASE_IMAGE
FROM ${BASE_IMAGE}

Expand Down
2 changes: 1 addition & 1 deletion isaac_ros_apriltag_interfaces/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ license agreement from NVIDIA CORPORATION is strictly prohibited.
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>isaac_ros_apriltag_interfaces</name>
<version>2.0.0</version>
<version>2.1.0</version>
<description>Interfaces for performing Isaac ROS AprilTag detection</description>

<maintainer email="[email protected]">Hemal Shah</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion isaac_ros_bi3d_interfaces/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ license agreement from NVIDIA CORPORATION is strictly prohibited.
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>isaac_ros_bi3d_interfaces</name>
<version>2.0.0</version>
<version>2.1.0</version>
<description>Interfaces for Isaac ROS Bi3D</description>

<maintainer email="[email protected]">Hemal Shah</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion isaac_ros_common/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ license agreement from NVIDIA CORPORATION is strictly prohibited.
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>isaac_ros_common</name>
<version>2.0.0</version>
<version>2.1.0</version>
<description>Utilities for performing common functions in Isaac ROS packages</description>

<maintainer email="[email protected]">Hemal Shah</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion isaac_ros_nitros_bridge_interfaces/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ license agreement from NVIDIA CORPORATION is strictly prohibited.
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>isaac_ros_nitros_bridge_interfaces</name>
<version>2.0.0</version>
<version>2.1.0</version>
<description>Interfaces for Isaac ROS NITROS Bridge Msgs</description>

<maintainer email="[email protected]">Yuankun Zhu</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion isaac_ros_nova_interfaces/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ license agreement from NVIDIA CORPORATION is strictly prohibited.
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>isaac_ros_nova_interfaces</name>
<version>2.0.0</version>
<version>2.1.0</version>
<description>Interfaces for Isaac ROS Nova</description>

<maintainer email="[email protected]">Ashwin Varghese Kuruttukulam</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion isaac_ros_pointcloud_interfaces/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>isaac_ros_pointcloud_interfaces</name>
<version>2.0.0</version>
<version>2.1.0</version>
<description>Pointcloud interfaces for Isaac ROS NITROS</description>

<maintainer email="[email protected]">Ashwin Varghese Kuruttukulam</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion isaac_ros_tensor_list_interfaces/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ license agreement from NVIDIA CORPORATION is strictly prohibited.
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>isaac_ros_tensor_list_interfaces</name>
<version>2.0.0</version>
<version>2.1.0</version>
<description>Interfaces for Isaac ROS tensor list</description>

<maintainer email="[email protected]">CY Chen</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion isaac_ros_test/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ license agreement from NVIDIA CORPORATION is strictly prohibited.
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>isaac_ros_test</name>
<version>2.0.0</version>
<version>2.1.0</version>
<description>Isaac ROS testing utilities</description>

<maintainer email="[email protected]">Hemal Shah</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion scripts/run_dev.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ if [[ -z "$ISAAC_ROS_DEV_DIR" ]]; then
done

if [[ ! -d "$ISAAC_ROS_DEV_DIR" ]]; then
ISAAC_ROS_DEV_DIR=$(realpath "$ROOT/../../")
ISAAC_ROS_DEV_DIR=$(realpath "$ROOT/../")
fi
print_warning "isaac_ros_dev not specified, assuming $ISAAC_ROS_DEV_DIR"
else
Expand Down

0 comments on commit a303702

Please sign in to comment.