Skip to content

Commit 8b461fc

Browse files
authored
Merge pull request #24 from NVIDIA-ISAAC-ROS/release-dp3.1
Isaac ROS 0.31.0 (DP3.1)
2 parents 94059d4 + 6fe28fb commit 8b461fc

File tree

5 files changed

+24
-18
lines changed

5 files changed

+24
-18
lines changed

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ This package is powered by [NVIDIA Isaac Transport for ROS (NITROS)](https://dev
3030

3131
The performance results of benchmarking the prepared pipelines in this package on supported platforms are below:
3232

33-
| Pipeline | AGX Orin | Orin Nano | x86_64 w/ RTX 3060 Ti |
34-
| -------------------------- | ------------------ | ---------------- | --------------------- |
35-
| Isaac ROS Detectnet (544p) | 225 fps <br> 7.7ms | 72 fps <br> 18ms | 450 fps <br> 3.2ms |
33+
| Sample Graph | Input Size | AGX Orin | Orin NX | Orin Nano 8GB | x86_64 w/ RTX 4060 Ti |
34+
| --------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ---------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- |
35+
| [DetectNet Object Detection Graph](https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_benchmark/blob/main/scripts//isaac_ros_detectnet_graph.py) | 544p | [252 fps](https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_benchmark/blob/main/results/isaac_ros_detectnet_graph-agx_orin.json)<br>8.7 ms | [110 fps](https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_benchmark/blob/main/results/isaac_ros_detectnet_graph-orin_nx.json)<br>13 ms | [77.9 fps](https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_benchmark/blob/main/results/isaac_ros_detectnet_graph-orin_nano_emul.json)<br>18 ms | -- |
36+
3637

3738
> **Note**: These numbers are reported with defaults parameter values found in [params.yaml](./isaac_ros_detectnet/config/params.yaml).
3839
@@ -81,7 +82,7 @@ To run the DetectNet object detection inference, the following ROS 2 nodes shoul
8182

8283
## Latest Update
8384

84-
Update 2023-04-05: Source available GXF extensions
85+
Update 2023-05-25: Performance improvements.
8586

8687
## Supported Platforms
8788

@@ -249,6 +250,7 @@ For solutions to problems with using DNN models, please check [here](https://git
249250

250251
| Date | Changes |
251252
| ---------- | ------------------------------------------------------------------------------------- |
253+
| 2023-05-25 | Performance improvements |
252254
| 2023-04-05 | Source available GXF extensions |
253255
| 2022-10-19 | Updated OSS licensing |
254256
| 2022-08-31 | Update to use NITROS for improved performance and to be compatible with JetPack 5.0.2 |

isaac_ros_detectnet/config/detectnet_node.yaml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%YAML 1.2
22
# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
3-
# Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3+
# Copyright (c) 2022-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -58,35 +58,38 @@ components:
5858
transmitter: detections_out
5959
min_size: 1
6060
---
61-
name: vault
61+
name: sink
6262
components:
6363
- name: signal
6464
type: nvidia::gxf::DoubleBufferReceiver
6565
parameters:
66-
capacity: 1
66+
capacity: 2
6767
policy: 0
6868
- type: nvidia::gxf::MessageAvailableSchedulingTerm
6969
parameters:
7070
receiver: signal
7171
min_size: 1
72-
- name: vault
73-
type: nvidia::gxf::Vault
72+
- name: sink
73+
type: nvidia::isaac_ros::MessageRelay
7474
parameters:
7575
source: signal
76-
max_waiting_count: 1
77-
drop_waiting: false
7876
---
7977
components:
8078
- name: edge0
8179
type: nvidia::gxf::Connection
8280
parameters:
8381
source: detectnet_decoder/detections_out
84-
target: vault/signal
82+
target: sink/signal
8583
---
8684
components:
87-
- type: nvidia::gxf::GreedyScheduler
85+
- name: clock
86+
type: nvidia::gxf::RealtimeClock
87+
- type: nvidia::gxf::MultiThreadScheduler
8888
parameters:
8989
clock: clock
9090
stop_on_deadlock: false
91-
- name: clock
92-
type: nvidia::gxf::RealtimeClock
91+
check_recession_period_ms: 1
92+
worker_thread_number: 2
93+
- type: nvidia::gxf::JobStatistics
94+
parameters:
95+
clock: clock

isaac_ros_detectnet/gxf/detectnet/detectnet_decoder.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ gxf_result_t DetectnetDecoder::tick() noexcept
261261
return GXF_FAILURE;
262262
}
263263

264+
// TODO(ashwinvk): Do not copy data to host and perform decoding using cuda
264265
// copy memory to host
265266
float cov_tensor_arr[cov_tensor->size() / sizeof(float)]; // since data in tensor is kFloat32
266267
const cudaError_t cuda_error_cov_tensor = cudaMemcpy(

isaac_ros_detectnet/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ SPDX-License-Identifier: Apache-2.0
2121
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
2222
<package format="3">
2323
<name>isaac_ros_detectnet</name>
24-
<version>0.30.0</version>
24+
<version>0.31.0</version>
2525
<description>DetectNet model processing</description>
2626

2727
<maintainer email="[email protected]">Ashwin Varghese Kuruttukulam</maintainer>

isaac_ros_detectnet/src/detectnet_decoder_node.cpp

Lines changed: 2 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.
@@ -50,7 +50,7 @@ using nvidia::gxf::optimizer::GraphIOGroupSupportedDataTypesInfoList;
5050
#define INPUT_DEFAULT_TENSOR_FORMAT_TENSORLIST "nitros_tensor_list_nchw_rgb_f32"
5151
#define INPUT_TOPIC_NAME_TENSORLIST "tensor_sub"
5252

53-
#define OUTPUT_COMPONENT_KEY_DETECTIONS "vault/vault"
53+
#define OUTPUT_COMPONENT_KEY_DETECTIONS "sink/sink"
5454
#define OUTPUT_DEFAULT_TENSOR_FORMAT_DETECTIONS "nitros_detection2_d_array"
5555
#define OUTPUT_TOPIC_NAME_TAG_DETECTIONS "detectnet/detections"
5656

0 commit comments

Comments
 (0)