Skip to content

Commit ed3d677

Browse files
jaiveersinghNVjaiveersinghNV
authored
Merge pull request #21 from NVIDIA-ISAAC-ROS/release-2.0.0
Isaac ROS 2.0.0
2 parents 119ac00 + 61bf373 commit ed3d677

23 files changed

+279
-475
lines changed

‎README.md‎

Lines changed: 42 additions & 278 deletions
Large diffs are not rendered by default.

‎docs/tutorial-isaac-sim.md‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎docs/tutorial-nitros-graph.md‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎isaac_ros_unet/CMakeLists.txt‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
2-
# Copyright (c) 2021-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# Copyright (c) 2021-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
1515
#
1616
# SPDX-License-Identifier: Apache-2.0
1717

18-
cmake_minimum_required(VERSION 3.23.2)
18+
cmake_minimum_required(VERSION 3.22.1)
1919
project(isaac_ros_unet LANGUAGES C CXX)
2020

2121
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -45,6 +45,12 @@ if(BUILD_TESTING)
4545
find_package(ament_lint_auto REQUIRED)
4646
ament_lint_auto_find_test_dependencies()
4747

48+
49+
# The FindPythonInterp and FindPythonLibs modules are removed
50+
if(POLICY CMP0148)
51+
cmake_policy(SET CMP0148 OLD)
52+
endif()
53+
4854
find_package(launch_testing_ament_cmake REQUIRED)
4955
add_launch_test(test/isaac_ros_unet_pol_test.py TIMEOUT "400")
5056
endif()

‎isaac_ros_unet/gxf/image_segmentation/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ find_package(GXF ${ISAAC_ROS_GXF_VERSION} MODULE REQUIRED
3131
serialization
3232
std
3333
)
34-
include(YamlCpp)
34+
find_package(yaml-cpp)
3535

3636
# Create extension
3737
add_library(gxf_segmentation_postprocessor SHARED

‎isaac_ros_unet/include/isaac_ros_unet/unet_decoder_node.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
2-
// Copyright (c) 2021-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
// Copyright (c) 2021-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
//
44
// Licensed under the Apache License, Version 2.0 (the "License");
55
// you may not use this file except in compliance with the License.

‎isaac_ros_unet/launch/isaac_ros_argus_unet_triton.launch.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
2-
# Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# Copyright (c) 2022-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -141,9 +141,11 @@ def generate_launch_description():
141141
# Parameters preconfigured for PeopleSemSegNet.
142142
encoder_node = ComposableNode(
143143
name='dnn_image_encoder',
144-
package='isaac_ros_dnn_encoders',
144+
package='isaac_ros_dnn_image_encoder',
145145
plugin='nvidia::isaac_ros::dnn_inference::DnnImageEncoderNode',
146146
parameters=[{
147+
'input_image_width': 1920,
148+
'input_image_height': 1200,
147149
'network_image_width': network_image_width,
148150
'network_image_height': network_image_height,
149151
'image_mean': encoder_image_mean,

‎isaac_ros_unet/launch/isaac_ros_unet_tensor_rt.launch.py‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
2-
# Copyright (c) 2021-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# Copyright (c) 2021-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -25,6 +25,14 @@
2525
def generate_launch_description():
2626
"""Launch the DNN Image encoder, TensorRT node and UNet decoder node."""
2727
launch_args = [
28+
DeclareLaunchArgument(
29+
'input_image_width',
30+
default_value='1920',
31+
description='The input image width'),
32+
DeclareLaunchArgument(
33+
'input_image_height',
34+
default_value='1080',
35+
description='The input image height'),
2836
DeclareLaunchArgument(
2937
'network_image_width',
3038
default_value='960',
@@ -100,6 +108,8 @@ def generate_launch_description():
100108
]
101109

102110
# DNN Image Encoder parameters
111+
input_image_width = LaunchConfiguration('input_image_width')
112+
input_image_height = LaunchConfiguration('input_image_height')
103113
network_image_width = LaunchConfiguration('network_image_width')
104114
network_image_height = LaunchConfiguration('network_image_height')
105115
encoder_image_mean = LaunchConfiguration('encoder_image_mean')
@@ -126,9 +136,11 @@ def generate_launch_description():
126136
# Parameters preconfigured for PeopleSemSegNet.
127137
encoder_node = ComposableNode(
128138
name='dnn_image_encoder',
129-
package='isaac_ros_dnn_encoders',
139+
package='isaac_ros_dnn_image_encoder',
130140
plugin='nvidia::isaac_ros::dnn_inference::DnnImageEncoderNode',
131141
parameters=[{
142+
'input_image_width': input_image_width,
143+
'input_image_height': input_image_height,
132144
'network_image_width': network_image_width,
133145
'network_image_height': network_image_height,
134146
'image_mean': encoder_image_mean,

‎isaac_ros_unet/launch/isaac_ros_unet_triton.launch.py‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
2-
# Copyright (c) 2021-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# Copyright (c) 2021-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -25,6 +25,14 @@
2525
def generate_launch_description():
2626
"""Launch the DNN Image encoder, Triton node and UNet decoder node."""
2727
launch_args = [
28+
DeclareLaunchArgument(
29+
'input_image_width',
30+
default_value='1920',
31+
description='The input image width'),
32+
DeclareLaunchArgument(
33+
'input_image_height',
34+
default_value='1080',
35+
description='The input image height'),
2836
DeclareLaunchArgument(
2937
'network_image_width',
3038
default_value='960',
@@ -96,6 +104,8 @@ def generate_launch_description():
96104
]
97105

98106
# DNN Image Encoder parameters
107+
input_image_width = LaunchConfiguration('input_image_width')
108+
input_image_height = LaunchConfiguration('input_image_height')
99109
network_image_width = LaunchConfiguration('network_image_width')
100110
network_image_height = LaunchConfiguration('network_image_height')
101111
encoder_image_mean = LaunchConfiguration('encoder_image_mean')
@@ -121,9 +131,11 @@ def generate_launch_description():
121131
# Parameters preconfigured for PeopleSemSegNet.
122132
encoder_node = ComposableNode(
123133
name='dnn_image_encoder',
124-
package='isaac_ros_dnn_encoders',
134+
package='isaac_ros_dnn_image_encoder',
125135
plugin='nvidia::isaac_ros::dnn_inference::DnnImageEncoderNode',
126136
parameters=[{
137+
'input_image_width': input_image_width,
138+
'input_image_height': input_image_height,
127139
'network_image_width': network_image_width,
128140
'network_image_height': network_image_height,
129141
'image_mean': encoder_image_mean,

0 commit comments

Comments
 (0)