From 2f2e66679b7d06455f95199c6ce93d4654623f55 Mon Sep 17 00:00:00 2001 From: Aryan Salmanpour Date: Tue, 9 Jan 2024 11:51:52 -0500 Subject: [PATCH] CMakeLists code cleanup - dont link to hip::device if there is nt any hip kernles for compilation (#156) --- CMakeLists.txt | 8 +------- samples/videoDecode/CMakeLists.txt | 8 +------- samples/videoDecodeFork/CMakeLists.txt | 8 +------- samples/videoDecodeMem/CMakeLists.txt | 8 +------- samples/videoDecodeMultiFiles/CMakeLists.txt | 8 +------- samples/videoDecodePerf/CMakeLists.txt | 8 +------- 6 files changed, 6 insertions(+), 42 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f4a2949fc2..83cb6e9829 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,12 +97,6 @@ else() endif() message("-- ${BoldBlue}rocDecode Build Type -- ${CMAKE_BUILD_TYPE}${ColourReset}") -set(DEFAULT_AMDGPU_TARGETS "gfx803;gfx900;gfx906;gfx908;gfx90a;gfx940;gfx1030;gfx1031;gfx1032;gfx1100") -if(BUILD_WITH_AMD_ADVANCE) - set(DEFAULT_AMDGPU_TARGETS ${DEFAULT_AMDGPU_TARGETS} "gfx941;gfx942") -endif() -set(AMDGPU_TARGETS "${DEFAULT_AMDGPU_TARGETS}" CACHE STRING "List of specific machine types for library to target") - find_package(HIP QUIET) find_package(Libdrm QUIET) find_package(Libva QUIET) @@ -110,7 +104,7 @@ find_package(Libva QUIET) if(HIP_FOUND AND Libva_FOUND AND Libdrm_FOUND) # HIP - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::device) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host) # LibDRM include_directories(${LIBDRM_INCLUDE_DIR}) set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${LIBDRM_LIBRARY}) diff --git a/samples/videoDecode/CMakeLists.txt b/samples/videoDecode/CMakeLists.txt index bbdb0a4ea0..03581c87c3 100644 --- a/samples/videoDecode/CMakeLists.txt +++ b/samples/videoDecode/CMakeLists.txt @@ -50,12 +50,6 @@ else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -DNDEBUG -fPIC") endif() -set(DEFAULT_AMDGPU_TARGETS "gfx803;gfx900;gfx906;gfx908;gfx90a;gfx940;gfx1030;gfx1031;gfx1032;gfx1100") -if(BUILD_WITH_AMD_ADVANCE) - set(DEFAULT_AMDGPU_TARGETS ${DEFAULT_AMDGPU_TARGETS} "gfx941;gfx942") -endif() -set(AMDGPU_TARGETS "${DEFAULT_AMDGPU_TARGETS}" CACHE STRING "List of specific machine types for library to target") - find_package(HIP QUIET) find_package(FFmpeg QUIET) # find rocDecode @@ -69,7 +63,7 @@ endif() if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND) # HIP - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::device) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host) # FFMPEG include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR}) diff --git a/samples/videoDecodeFork/CMakeLists.txt b/samples/videoDecodeFork/CMakeLists.txt index e2fa8e20a8..cd1ca2a6ff 100644 --- a/samples/videoDecodeFork/CMakeLists.txt +++ b/samples/videoDecodeFork/CMakeLists.txt @@ -38,12 +38,6 @@ 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}/llvm/bin/clang++) -set(DEFAULT_AMDGPU_TARGETS "gfx803;gfx900;gfx906;gfx908;gfx90a;gfx940;gfx1030;gfx1031;gfx1032;gfx1100") -if(BUILD_WITH_AMD_ADVANCE) - set(DEFAULT_AMDGPU_TARGETS ${DEFAULT_AMDGPU_TARGETS} "gfx941;gfx942") -endif() -set(AMDGPU_TARGETS "${DEFAULT_AMDGPU_TARGETS}" CACHE STRING "List of specific machine types for library to target") - find_package(HIP QUIET) find_package(FFmpeg QUIET) # find rocDecode @@ -57,7 +51,7 @@ endif() if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND) # HIP - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::device) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host) # FFMPEG include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${SWSCALE_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR}) diff --git a/samples/videoDecodeMem/CMakeLists.txt b/samples/videoDecodeMem/CMakeLists.txt index 1bfc3e40e2..101d886caf 100644 --- a/samples/videoDecodeMem/CMakeLists.txt +++ b/samples/videoDecodeMem/CMakeLists.txt @@ -50,12 +50,6 @@ else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -DNDEBUG -fPIC") endif() -set(DEFAULT_AMDGPU_TARGETS "gfx803;gfx900;gfx906;gfx908;gfx90a;gfx940;gfx1030;gfx1031;gfx1032;gfx1100") -if(BUILD_WITH_AMD_ADVANCE) - set(DEFAULT_AMDGPU_TARGETS ${DEFAULT_AMDGPU_TARGETS} "gfx941;gfx942") -endif() -set(AMDGPU_TARGETS "${DEFAULT_AMDGPU_TARGETS}" CACHE STRING "List of specific machine types for library to target") - find_package(HIP QUIET) find_package(FFmpeg QUIET) # find rocDecode @@ -69,7 +63,7 @@ endif() if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND) # HIP - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::device) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host) # FFMPEG include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR}) diff --git a/samples/videoDecodeMultiFiles/CMakeLists.txt b/samples/videoDecodeMultiFiles/CMakeLists.txt index 38fd2b4cac..74d902e8b5 100644 --- a/samples/videoDecodeMultiFiles/CMakeLists.txt +++ b/samples/videoDecodeMultiFiles/CMakeLists.txt @@ -50,12 +50,6 @@ else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -DNDEBUG -fPIC") endif() -set(DEFAULT_AMDGPU_TARGETS "gfx803;gfx900;gfx906;gfx908;gfx90a;gfx940;gfx1030;gfx1031;gfx1032;gfx1100") -if(BUILD_WITH_AMD_ADVANCE) - set(DEFAULT_AMDGPU_TARGETS ${DEFAULT_AMDGPU_TARGETS} "gfx941;gfx942") -endif() -set(AMDGPU_TARGETS "${DEFAULT_AMDGPU_TARGETS}" CACHE STRING "List of specific machine types for library to target") - find_package(HIP QUIET) find_package(FFmpeg QUIET) # find rocDecode @@ -69,7 +63,7 @@ endif() if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND) # HIP - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::device) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host) # FFMPEG include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR}) diff --git a/samples/videoDecodePerf/CMakeLists.txt b/samples/videoDecodePerf/CMakeLists.txt index c5329a7d6b..9fadc90257 100644 --- a/samples/videoDecodePerf/CMakeLists.txt +++ b/samples/videoDecodePerf/CMakeLists.txt @@ -38,12 +38,6 @@ 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}/llvm/bin/clang++) -set(DEFAULT_AMDGPU_TARGETS "gfx803;gfx900;gfx906;gfx908;gfx90a;gfx940;gfx1030;gfx1031;gfx1032;gfx1100") -if(BUILD_WITH_AMD_ADVANCE) - set(DEFAULT_AMDGPU_TARGETS ${DEFAULT_AMDGPU_TARGETS} "gfx941;gfx942") -endif() -set(AMDGPU_TARGETS "${DEFAULT_AMDGPU_TARGETS}" CACHE STRING "List of specific machine types for library to target") - find_package(HIP QUIET) find_package(FFmpeg QUIET) set(THREADS_PREFER_PTHREAD_FLAG ON) @@ -60,7 +54,7 @@ endif() if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND Threads_FOUND) # HIP - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::device) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host) # FFMPEG include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${SWSCALE_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR})