From 924d19eb65822983368395f2a86a1743ab082cfa Mon Sep 17 00:00:00 2001 From: Kiriti Gowda Date: Tue, 3 Dec 2024 13:03:26 -0800 Subject: [PATCH] Samples & Test - Compiler Updates (#468) * Compiler - set CXX Compiler if not set * CXX Compiler - Set CXX compiler in CTest * Test - Ctest cleanup * Samples - Update CXX Compiler option --- samples/videoDecode/CMakeLists.txt | 10 +++++++--- samples/videoDecodeBatch/CMakeLists.txt | 10 +++++++--- samples/videoDecodeMem/CMakeLists.txt | 10 +++++++--- samples/videoDecodeMultiFiles/CMakeLists.txt | 10 +++++++--- samples/videoDecodePerf/CMakeLists.txt | 10 +++++++--- samples/videoDecodeRGB/CMakeLists.txt | 10 +++++++--- samples/videoToSequence/CMakeLists.txt | 10 +++++++--- test/CMakeLists.txt | 12 ++++++------ 8 files changed, 55 insertions(+), 27 deletions(-) diff --git a/samples/videoDecode/CMakeLists.txt b/samples/videoDecode/CMakeLists.txt index 30dbd903d2..431d689187 100644 --- a/samples/videoDecode/CMakeLists.txt +++ b/samples/videoDecode/CMakeLists.txt @@ -22,8 +22,6 @@ ################################################################################ cmake_minimum_required(VERSION 3.10) -project(videodecode) -set(CMAKE_CXX_STANDARD 17) # ROCM Path if(DEFINED ENV{ROCM_PATH}) @@ -33,10 +31,16 @@ elseif(ROCM_PATH) else() set(ROCM_PATH /opt/rocm CACHE PATH "${White}${PROJECT_NAME}: Default ROCm installation path${ColourReset}") endif() +# Set AMD Clang as default compiler +if (NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) +endif() + +project(videodecode) +set(CMAKE_CXX_STANDARD 17) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH}) -set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/samples/videoDecodeBatch/CMakeLists.txt b/samples/videoDecodeBatch/CMakeLists.txt index d4458d1557..a9e4d7b9e2 100644 --- a/samples/videoDecodeBatch/CMakeLists.txt +++ b/samples/videoDecodeBatch/CMakeLists.txt @@ -22,8 +22,6 @@ ################################################################################ cmake_minimum_required(VERSION 3.10) -project(videodecodebatch) -set(CMAKE_CXX_STANDARD 17) # ROCM Path if(DEFINED ENV{ROCM_PATH}) @@ -33,10 +31,16 @@ elseif(ROCM_PATH) else() set(ROCM_PATH /opt/rocm CACHE PATH "${White}${PROJECT_NAME}: Default ROCm installation path${ColourReset}") endif() +# Set AMD Clang as default compiler +if (NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) +endif() + +project(videodecodebatch) +set(CMAKE_CXX_STANDARD 17) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH}) -set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/samples/videoDecodeMem/CMakeLists.txt b/samples/videoDecodeMem/CMakeLists.txt index c0eb2865c6..4f43b33e24 100644 --- a/samples/videoDecodeMem/CMakeLists.txt +++ b/samples/videoDecodeMem/CMakeLists.txt @@ -22,8 +22,6 @@ ################################################################################ cmake_minimum_required(VERSION 3.10) -project(videodecodemem) -set(CMAKE_CXX_STANDARD 17) # ROCM Path if(DEFINED ENV{ROCM_PATH}) @@ -33,10 +31,16 @@ elseif(ROCM_PATH) else() set(ROCM_PATH /opt/rocm CACHE PATH "${White}${PROJECT_NAME}: Default ROCm installation path${ColourReset}") endif() +# Set AMD Clang as default compiler +if (NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) +endif() + +project(videodecodemem) +set(CMAKE_CXX_STANDARD 17) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH}) -set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/samples/videoDecodeMultiFiles/CMakeLists.txt b/samples/videoDecodeMultiFiles/CMakeLists.txt index 2b9e90c7b2..bc381a8185 100644 --- a/samples/videoDecodeMultiFiles/CMakeLists.txt +++ b/samples/videoDecodeMultiFiles/CMakeLists.txt @@ -22,8 +22,6 @@ ################################################################################ cmake_minimum_required(VERSION 3.10) -project(videodecodemultifiles) -set(CMAKE_CXX_STANDARD 17) # ROCM Path if(DEFINED ENV{ROCM_PATH}) @@ -33,10 +31,16 @@ elseif(ROCM_PATH) else() set(ROCM_PATH /opt/rocm CACHE PATH "${White}${PROJECT_NAME}: Default ROCm installation path${ColourReset}") endif() +# Set AMD Clang as default compiler +if (NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) +endif() + +project(videodecodemultifiles) +set(CMAKE_CXX_STANDARD 17) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH}) -set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/samples/videoDecodePerf/CMakeLists.txt b/samples/videoDecodePerf/CMakeLists.txt index d79dd765e6..bc054067e6 100644 --- a/samples/videoDecodePerf/CMakeLists.txt +++ b/samples/videoDecodePerf/CMakeLists.txt @@ -22,8 +22,6 @@ ################################################################################ cmake_minimum_required(VERSION 3.10) -project(videodecodeperf) -set(CMAKE_CXX_STANDARD 17) # ROCM Path if(DEFINED ENV{ROCM_PATH}) @@ -33,10 +31,16 @@ elseif(ROCM_PATH) else() set(ROCM_PATH /opt/rocm CACHE PATH "${White}${PROJECT_NAME}: Default ROCm installation path${ColourReset}") endif() +# Set AMD Clang as default compiler +if (NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) +endif() + +project(videodecodeperf) +set(CMAKE_CXX_STANDARD 17) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH}) -set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/samples/videoDecodeRGB/CMakeLists.txt b/samples/videoDecodeRGB/CMakeLists.txt index 0c976d4ae2..6acdbcf40c 100644 --- a/samples/videoDecodeRGB/CMakeLists.txt +++ b/samples/videoDecodeRGB/CMakeLists.txt @@ -22,8 +22,6 @@ ################################################################################ cmake_minimum_required(VERSION 3.10) -project(videodecodergb) -set(CMAKE_CXX_STANDARD 17) # ROCM Path if(DEFINED ENV{ROCM_PATH}) @@ -33,10 +31,16 @@ elseif(ROCM_PATH) else() set(ROCM_PATH /opt/rocm CACHE PATH "${White}${PROJECT_NAME}: Default ROCm installation path${ColourReset}") endif() +# Set AMD Clang as default compiler +if (NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) +endif() + +project(videodecodergb) +set(CMAKE_CXX_STANDARD 17) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH}) -set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/samples/videoToSequence/CMakeLists.txt b/samples/videoToSequence/CMakeLists.txt index 0b8dd1b039..c450fa8240 100644 --- a/samples/videoToSequence/CMakeLists.txt +++ b/samples/videoToSequence/CMakeLists.txt @@ -22,8 +22,6 @@ ################################################################################ cmake_minimum_required(VERSION 3.10) -project(videotosequence) -set(CMAKE_CXX_STANDARD 17) # ROCM Path if(DEFINED ENV{ROCM_PATH}) @@ -33,10 +31,16 @@ elseif(ROCM_PATH) else() set(ROCM_PATH /opt/rocm CACHE PATH "${White}${PROJECT_NAME}: Default ROCm installation path${ColourReset}") endif() +# Set AMD Clang as default compiler +if (NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) +endif() + +project(videotosequence) +set(CMAKE_CXX_STANDARD 17) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH}) -set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e1f6f760be..a33182404f 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -22,12 +22,6 @@ # ############################################################################## cmake_minimum_required(VERSION 3.10) -project(rocdecode-test) - -# make test with CTest -enable_testing() -include(CTest) - if(NOT DEFINED ENHANCED_MESSAGE) string(ASCII 27 Esc) set(ColourReset "${Esc}[m") @@ -46,6 +40,12 @@ else() set(ROCM_PATH /opt/rocm CACHE PATH "${White}${PROJECT_NAME}: Default ROCm installation path${ColourReset}") endif() +project(rocdecode-test) + +# make test with CTest +enable_testing() +include(CTest) + # add find modules list(APPEND CMAKE_MODULE_PATH ${ROCM_PATH}/share/rocdecode/cmake)