AI/rocm-systems
2
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Actions Packages Projekty Wydania Wiki Aktywność

Samples & Test - Compiler Updates (#468)

Przeglądaj źródła 
* Compiler - set CXX Compiler if not set

* CXX Compiler - Set CXX compiler in CTest

* Test - Ctest cleanup

* Samples - Update CXX Compiler option
This commit is contained in:
Kiriti Gowda
2024-12-03 13:03:26 -08:00
zatwierdzone przez GitHub
rodzic 4f10c3893b
commit 924d19eb65
8 zmienionych plików z 55 dodań i 27 usunięć
Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files
samples/videoDecode/CMakeLists.txt
+7 -3
Wyświetl plik
@@ -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")
samples/videoDecodeBatch/CMakeLists.txt
+7 -3
Wyświetl plik
@@ -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")
samples/videoDecodeMem/CMakeLists.txt
+7 -3
Wyświetl plik
@@ -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")
samples/videoDecodeMultiFiles/CMakeLists.txt
+7 -3
Wyświetl plik
@@ -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")
samples/videoDecodePerf/CMakeLists.txt
+7 -3
Wyświetl plik
@@ -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")
samples/videoDecodeRGB/CMakeLists.txt
+7 -3
Wyświetl plik
@@ -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")
samples/videoToSequence/CMakeLists.txt
+7 -3
Wyświetl plik
@@ -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")
test/CMakeLists.txt
+6 -6
Wyświetl plik
@@ -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)