feat: patch to v0.13.1: add QNX support (#227)

Author: dlesage-nvidia

CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,7 +23,7 @@ endif()
 
 project(cvcuda
         LANGUAGES C CXX
-        VERSION 0.13.0
+        VERSION 0.13.1
         DESCRIPTION "CUDA-accelerated Computer Vision algorithms"
 )
 

README.md

@@ -18,7 +18,7 @@
 
 [![License](https://img.shields.io/badge/License-Apache_2.0-yellogreen.svg)](https://opensource.org/licenses/Apache-2.0)
 
-![Version](https://img.shields.io/badge/Version-v0.13.0--beta-blue)
+![Version](https://img.shields.io/badge/Version-v0.13.1--beta-blue)
 
 ![Platform](https://img.shields.io/badge/Platform-linux--64_%7C_win--64_wsl2%7C_aarch64-gray)
 

cmake/PrintConfig.cmake

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -67,6 +67,12 @@ else()
     message(STATUS "    ENABLE_TEGRA             : off")
 endif()
 
+if(ENABLE_QNX)
+    message(STATUS "    ENABLE_QNX             : ON")
+else()
+    message(STATUS "    ENABLE_QNX             : off")
+endif()
+
 message(STATUS "    Compilers used in public API header compatibility tests:")
 if(PUBLIC_API_COMPILERS)
     foreach(comp ${PUBLIC_API_COMPILERS})

docs/sphinx/index.rst

@@ -123,6 +123,7 @@ Copyright
     :maxdepth: 1
     :hidden:
 
+    v0.13.1-beta <relnotes/v0.13.1-beta>
     v0.13.0-beta <relnotes/v0.13.0-beta>
     v0.12.0-beta <relnotes/v0.12.0-beta>
     v0.11.0-beta <relnotes/v0.11.0-beta>

docs/sphinx/relnotes/v0.13.1-beta.rst

@@ -0,0 +1,53 @@
+ ..
+  # SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+  # SPDX-License-Identifier: Apache-2.0
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  # http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+.. _v0.13.1-beta:
+
+v0.13.1-beta
+============
+
+Release Highlights
+------------------
+
+CV-CUDA v0.13.1 includes the following changes:​
+
+* **New Features**:​
+
+  * Added support for QNX compilation of NVCV
+
+
+Compatibility and Known Limitations
+-----------------------------------
+
+For the full list, see main README on `CV-CUDA GitHub <https://github.com/CVCUDA/CV-CUDA>`_.
+
+License
+-------
+
+CV-CUDA is licensed under the `Apache 2.0 <https://github.com/CVCUDA/CV-CUDA/blob/main/LICENSE.md>`_ license.
+
+Resources
+---------
+
+1. `CV-CUDA GitHub <https://github.com/CVCUDA/CV-CUDA>`_
+2. `CV-CUDA Increasing Throughput and Reducing Costs for AI-Based Computer Vision with CV-CUDA <https://developer.nvidia.com/blog/increasing-throughput-and-reducing-costs-for-computer-vision-with-cv-cuda/>`_
+3. `NVIDIA Announces Microsoft, Tencent, Baidu Adopting CV-CUDA for Computer Vision AI <https://blogs.nvidia.com/blog/2023/03/21/cv-cuda-ai-computer-vision/>`_
+4. `CV-CUDA helps Tencent Cloud audio and video PaaS platform achieve full-process GPU acceleration for video enhancement AI <https://developer.nvidia.com/zh-cn/blog/cv-cuda-high-performance-image-processing/>`_
+
+Acknowledgements
+----------------
+
+CV-CUDA is developed jointly by NVIDIA and the ByteDance Machine Learning team.

src/nvcv/cmake/ConfigBuildTree.cmake

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -57,6 +57,13 @@ option(EXPOSE_CODE "Expose in resulting binaries parts of our code" ${DEFAULT_EX
 option(WARNINGS_AS_ERRORS "Treat compilation warnings as errors" OFF)
 cmake_dependent_option(ENABLE_TEGRA "Enable tegra support" ON "PLATFORM_IS_ARM64" OFF)
 cmake_dependent_option(ENABLE_COMPAT_OLD_GLIBC "Generates binaries that work with old distros, with old glibc" ON "NOT ENABLE_TEGRA" OFF)
+cmake_dependent_option(ENABLE_QNX "Enable QNX support" OFF "PLATFORM_IS_ARM64" OFF)
+
+if(ENABLE_QNX)
+    set(PLATFORM_IS_QNX ON)
+else()
+    set(PLATFORM_IS_QNX OFF)
+endif()
 
 # Needed to get cuda version
 find_package(CUDAToolkit REQUIRED)
@@ -94,11 +101,19 @@ function(setup_dso target version)
     # Put each function and it's data into separate linker sections
     target_compile_options(${target} PRIVATE -ffunction-sections -fdata-sections)
 
-    # Link with static C/C++ libs ==========================
-    target_link_libraries(${target} PRIVATE
-        -static-libstdc++
-        -static-libgcc
-    )
+    if(PLATFORM_IS_QNX)
+        # For QNX, explicitly link libc++ as the C++ Standard Library and Math library
+        target_link_libraries(${target} PRIVATE
+            c++
+            m
+        )
+    else()
+        # Link with static C/C++ libs
+        target_link_libraries(${target} PRIVATE
+            -static-libstdc++
+            -static-libgcc
+        )
+    endif()
 
     #   Configure symbol visibility ---------------------------------------------
     set_target_properties(${target} PROPERTIES VISIBILITY_INLINES_HIDDEN on

src/nvcv/src/priv/CMakeLists.txt

@@ -53,5 +53,10 @@ target_link_libraries(nvcv_types_priv
         nvcv_types_headers
         nvcv_util_sanitizer
         CUDA::cudart_static
-        -lrt
 )
+
+if(NOT PLATFORM_IS_QNX)
+    # Realtime extensions library don't need to be linked on QNX.
+    target_link_libraries(nvcv_types_priv
+        PUBLIC -lrt)
+endif()

src/nvcv/util/CMakeLists.txt

@@ -194,9 +194,14 @@ target_link_libraries(nvcv_util
         nvcv_types_headers
         CUDA::cudart_static
         nvcv_util_compat
-        -lrt
 )
 
+if(NOT PLATFORM_IS_QNX)
+    # Realtime extensions library don't need to be linked on QNX.
+    target_link_libraries(nvcv_util
+        PUBLIC -lrt)
+endif()
+
 target_compile_definitions(nvcv_util
     PUBLIC
         # Must always be enabled so that we can check assertion

src/nvcv/util/CheckError.cpp

@@ -21,6 +21,7 @@
 
 #include <cstdarg>
 #include <regex>
+#include <sstream>
 
 namespace nvcv::util {