From 76e2d2052cdd21333b04ee4b1ac734a307723725 Mon Sep 17 00:00:00 2001 From: shawnz Date: Fri, 17 Jan 2025 12:04:27 +0800 Subject: [PATCH 1/6] Update separate SM list for cdp samples and update the watershedSegmentationNPP for build failed of Bug 4668487 --- .../3_CUDA_Features/cdpAdvancedQuicksort/CMakeLists.txt | 7 ++++++- .../3_CUDA_Features/cdpBezierTessellation/CMakeLists.txt | 7 ++++++- Samples/3_CUDA_Features/cdpQuadtree/CMakeLists.txt | 7 ++++++- Samples/3_CUDA_Features/cdpSimplePrint/CMakeLists.txt | 7 ++++++- Samples/3_CUDA_Features/cdpSimpleQuicksort/CMakeLists.txt | 7 ++++++- .../watershedSegmentationNPP/watershedSegmentationNPP.cpp | 2 +- 6 files changed, 31 insertions(+), 6 deletions(-) diff --git a/Samples/3_CUDA_Features/cdpAdvancedQuicksort/CMakeLists.txt b/Samples/3_CUDA_Features/cdpAdvancedQuicksort/CMakeLists.txt index cf202b04..490a9840 100644 --- a/Samples/3_CUDA_Features/cdpAdvancedQuicksort/CMakeLists.txt +++ b/Samples/3_CUDA_Features/cdpAdvancedQuicksort/CMakeLists.txt @@ -9,7 +9,12 @@ find_package(CUDAToolkit REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") - set(CMAKE_CUDA_ARCHITECTURES 61 70 75 80 86 87 90) + # Need to differentiate Tegra_aarch64 and other aarch64 systems(sbsa_aarch64) as they have different CUDA_ARCHITECTURES list + if(${BUILD_TEGRA}) + set(CMAKE_CUDA_ARCHITECTURES 72 87 101) + else() + set(CMAKE_CUDA_AR./CCHITECTURES 61 70 75 80 86 90) + endif() else() set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90) endif() diff --git a/Samples/3_CUDA_Features/cdpBezierTessellation/CMakeLists.txt b/Samples/3_CUDA_Features/cdpBezierTessellation/CMakeLists.txt index a3240953..c5009940 100644 --- a/Samples/3_CUDA_Features/cdpBezierTessellation/CMakeLists.txt +++ b/Samples/3_CUDA_Features/cdpBezierTessellation/CMakeLists.txt @@ -9,7 +9,12 @@ find_package(CUDAToolkit REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") - set(CMAKE_CUDA_ARCHITECTURES 61 70 75 80 86 87 90) + # Need to differentiate Tegra_aarch64 and other aarch64 systems(sbsa_aarch64) as they have different CUDA_ARCHITECTURES list + if(${BUILD_TEGRA}) + set(CMAKE_CUDA_ARCHITECTURES 72 87 101) + else() + set(CMAKE_CUDA_AR./CCHITECTURES 61 70 75 80 86 90) + endif() else() set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90) endif() diff --git a/Samples/3_CUDA_Features/cdpQuadtree/CMakeLists.txt b/Samples/3_CUDA_Features/cdpQuadtree/CMakeLists.txt index 80e6dc87..1482d98e 100644 --- a/Samples/3_CUDA_Features/cdpQuadtree/CMakeLists.txt +++ b/Samples/3_CUDA_Features/cdpQuadtree/CMakeLists.txt @@ -9,7 +9,12 @@ find_package(CUDAToolkit REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") - set(CMAKE_CUDA_ARCHITECTURES 61 70 75 80 86 87 90) + # Need to differentiate Tegra_aarch64 and other aarch64 systems(sbsa_aarch64) as they have different CUDA_ARCHITECTURES list + if(${BUILD_TEGRA}) + set(CMAKE_CUDA_ARCHITECTURES 72 87 101) + else() + set(CMAKE_CUDA_AR./CCHITECTURES 61 70 75 80 86 90) + endif() else() set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90) endif() diff --git a/Samples/3_CUDA_Features/cdpSimplePrint/CMakeLists.txt b/Samples/3_CUDA_Features/cdpSimplePrint/CMakeLists.txt index 84a3ce6a..1c1ce00a 100644 --- a/Samples/3_CUDA_Features/cdpSimplePrint/CMakeLists.txt +++ b/Samples/3_CUDA_Features/cdpSimplePrint/CMakeLists.txt @@ -9,7 +9,12 @@ find_package(CUDAToolkit REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") - set(CMAKE_CUDA_ARCHITECTURES 61 70 75 80 86 87 90) + # Need to differentiate Tegra_aarch64 and other aarch64 systems(sbsa_aarch64) as they have different CUDA_ARCHITECTURES list + if(${BUILD_TEGRA}) + set(CMAKE_CUDA_ARCHITECTURES 72 87 101) + else() + set(CMAKE_CUDA_AR./CCHITECTURES 61 70 75 80 86 90) + endif() else() set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90) endif() diff --git a/Samples/3_CUDA_Features/cdpSimpleQuicksort/CMakeLists.txt b/Samples/3_CUDA_Features/cdpSimpleQuicksort/CMakeLists.txt index 7b0e1118..61d60fd2 100644 --- a/Samples/3_CUDA_Features/cdpSimpleQuicksort/CMakeLists.txt +++ b/Samples/3_CUDA_Features/cdpSimpleQuicksort/CMakeLists.txt @@ -9,7 +9,12 @@ find_package(CUDAToolkit REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") - set(CMAKE_CUDA_ARCHITECTURES 61 70 75 80 86 87 90) + # Need to differentiate Tegra_aarch64 and other aarch64 systems(sbsa_aarch64) as they have different CUDA_ARCHITECTURES list + if(${BUILD_TEGRA}) + set(CMAKE_CUDA_ARCHITECTURES 72 87 101) + else() + set(CMAKE_CUDA_AR./CCHITECTURES 61 70 75 80 86 90) + endif() else() set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90) endif() diff --git a/Samples/4_CUDA_Libraries/watershedSegmentationNPP/watershedSegmentationNPP.cpp b/Samples/4_CUDA_Libraries/watershedSegmentationNPP/watershedSegmentationNPP.cpp index f3de8b1e..e6800ab2 100644 --- a/Samples/4_CUDA_Libraries/watershedSegmentationNPP/watershedSegmentationNPP.cpp +++ b/Samples/4_CUDA_Libraries/watershedSegmentationNPP/watershedSegmentationNPP.cpp @@ -173,7 +173,7 @@ int main( int argc, char** argv ) { - int aSegmentationScratchBufferSize[NUMBER_OF_IMAGES]; + size_t aSegmentationScratchBufferSize[NUMBER_OF_IMAGES]; int aSegmentLabelsOutputBufferSize[NUMBER_OF_IMAGES]; cudaError_t cudaError; From 970a6a115177d335c242d16ed33944d850331414 Mon Sep 17 00:00:00 2001 From: XSShawnZeng Date: Mon, 20 Jan 2025 10:04:02 +0800 Subject: [PATCH 2/6] Update CMakeLists.txt --- Samples/3_CUDA_Features/cdpAdvancedQuicksort/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Samples/3_CUDA_Features/cdpAdvancedQuicksort/CMakeLists.txt b/Samples/3_CUDA_Features/cdpAdvancedQuicksort/CMakeLists.txt index 490a9840..3dceb61d 100644 --- a/Samples/3_CUDA_Features/cdpAdvancedQuicksort/CMakeLists.txt +++ b/Samples/3_CUDA_Features/cdpAdvancedQuicksort/CMakeLists.txt @@ -13,7 +13,7 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") if(${BUILD_TEGRA}) set(CMAKE_CUDA_ARCHITECTURES 72 87 101) else() - set(CMAKE_CUDA_AR./CCHITECTURES 61 70 75 80 86 90) + set(CMAKE_CUDA_ARCHITECTURES 61 70 75 80 86 90) endif() else() set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90) From 576c24f97e008bebb4c425177834c8ee4df052fb Mon Sep 17 00:00:00 2001 From: XSShawnZeng Date: Mon, 20 Jan 2025 10:04:24 +0800 Subject: [PATCH 3/6] Update CMakeLists.txt --- Samples/3_CUDA_Features/cdpBezierTessellation/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Samples/3_CUDA_Features/cdpBezierTessellation/CMakeLists.txt b/Samples/3_CUDA_Features/cdpBezierTessellation/CMakeLists.txt index c5009940..fcc4db95 100644 --- a/Samples/3_CUDA_Features/cdpBezierTessellation/CMakeLists.txt +++ b/Samples/3_CUDA_Features/cdpBezierTessellation/CMakeLists.txt @@ -13,7 +13,7 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") if(${BUILD_TEGRA}) set(CMAKE_CUDA_ARCHITECTURES 72 87 101) else() - set(CMAKE_CUDA_AR./CCHITECTURES 61 70 75 80 86 90) + set(CMAKE_CUDA_ARCHITECTURES 61 70 75 80 86 90) endif() else() set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90) From d9633314f8c68c5ae83cf0c3aae7270560e0eee0 Mon Sep 17 00:00:00 2001 From: XSShawnZeng Date: Mon, 20 Jan 2025 10:04:50 +0800 Subject: [PATCH 4/6] Update CMakeLists.txt --- Samples/3_CUDA_Features/cdpQuadtree/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Samples/3_CUDA_Features/cdpQuadtree/CMakeLists.txt b/Samples/3_CUDA_Features/cdpQuadtree/CMakeLists.txt index 1482d98e..7e551718 100644 --- a/Samples/3_CUDA_Features/cdpQuadtree/CMakeLists.txt +++ b/Samples/3_CUDA_Features/cdpQuadtree/CMakeLists.txt @@ -13,7 +13,7 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") if(${BUILD_TEGRA}) set(CMAKE_CUDA_ARCHITECTURES 72 87 101) else() - set(CMAKE_CUDA_AR./CCHITECTURES 61 70 75 80 86 90) + set(CMAKE_CUDA_ARCHITECTURES 61 70 75 80 86 90) endif() else() set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90) From 3848a7c63c618543adf2d920ccca92d2f819828c Mon Sep 17 00:00:00 2001 From: XSShawnZeng Date: Mon, 20 Jan 2025 10:05:18 +0800 Subject: [PATCH 5/6] Update CMakeLists.txt --- Samples/3_CUDA_Features/cdpSimplePrint/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Samples/3_CUDA_Features/cdpSimplePrint/CMakeLists.txt b/Samples/3_CUDA_Features/cdpSimplePrint/CMakeLists.txt index 1c1ce00a..70789b9d 100644 --- a/Samples/3_CUDA_Features/cdpSimplePrint/CMakeLists.txt +++ b/Samples/3_CUDA_Features/cdpSimplePrint/CMakeLists.txt @@ -13,7 +13,7 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") if(${BUILD_TEGRA}) set(CMAKE_CUDA_ARCHITECTURES 72 87 101) else() - set(CMAKE_CUDA_AR./CCHITECTURES 61 70 75 80 86 90) + set(CMAKE_CUDA_ARCHITECTURES 61 70 75 80 86 90) endif() else() set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90) From 95128a1cf32ff8da93c2ab098b9f49f2dd2a7752 Mon Sep 17 00:00:00 2001 From: XSShawnZeng Date: Mon, 20 Jan 2025 10:05:45 +0800 Subject: [PATCH 6/6] Update CMakeLists.txt --- Samples/3_CUDA_Features/cdpSimpleQuicksort/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Samples/3_CUDA_Features/cdpSimpleQuicksort/CMakeLists.txt b/Samples/3_CUDA_Features/cdpSimpleQuicksort/CMakeLists.txt index 61d60fd2..c9bddff3 100644 --- a/Samples/3_CUDA_Features/cdpSimpleQuicksort/CMakeLists.txt +++ b/Samples/3_CUDA_Features/cdpSimpleQuicksort/CMakeLists.txt @@ -13,7 +13,7 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") if(${BUILD_TEGRA}) set(CMAKE_CUDA_ARCHITECTURES 72 87 101) else() - set(CMAKE_CUDA_AR./CCHITECTURES 61 70 75 80 86 90) + set(CMAKE_CUDA_ARCHITECTURES 61 70 75 80 86 90) endif() else() set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90)