rocjpeg - CMake Find updates (#164)
* rocjpeg - CMake Find updates * Version file - fix * Changelog - updates * Cleanup * Test - cmakelists updates * header - minor fix --------- Co-authored-by: Kiriti <kiriti@santiago.amd.com>
Este commit está contenido en:
Kiriti Gowda
GitHub
+2
-2
@@ -3,7 +3,7 @@
|
||||
Documentation for rocJPEG is available at
|
||||
[https://rocm.docs.amd.com/projects/rocJPEG/en/latest/](https://rocm.docs.amd.com/projects/rocJPEG/en/latest/)
|
||||
|
||||
## rocJPEG 0.14.1 for ROCm 7.0.0
|
||||
## rocjpeg 1.0.0 for ROCm 7.0.0
|
||||
|
||||
## Added
|
||||
* cmake config files
|
||||
@@ -12,7 +12,7 @@ Documentation for rocJPEG is available at
|
||||
## Changed
|
||||
* Readme - cleanup and updates to pre-reqs
|
||||
* The `decode_params` argument of the `rocJpegDecodeBatched` API is now an array of `RocJpegDecodeParams` structs representing the decode parameters for the batch of JPEG images.
|
||||
* `libdrm_amdgpu` is now explicitly linked with rocJPEG.
|
||||
* `libdrm_amdgpu` is now explicitly linked with rocjpeg.
|
||||
|
||||
## Removed
|
||||
* Dev Package - No longer installs pkg-config
|
||||
|
||||
+58
-54
@@ -40,9 +40,9 @@ if(NOT DEFINED CMAKE_CXX_COMPILER)
|
||||
set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++)
|
||||
endif()
|
||||
|
||||
# rocJPEG Version
|
||||
# rocjpeg Version
|
||||
# NOTE: package version and rocjpeg_version.h is generated with this version
|
||||
set(VERSION "0.14.1")
|
||||
set(VERSION "1.0.0")
|
||||
|
||||
# Set Project Version and Language
|
||||
project(rocjpeg VERSION ${VERSION} LANGUAGES CXX)
|
||||
@@ -61,7 +61,7 @@ find_program(DPKG_EXE dpkg)
|
||||
|
||||
# avoid setting the default installation path to /usr/local
|
||||
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
|
||||
set(CMAKE_INSTALL_PREFIX ${ROCM_PATH} CACHE PATH "rocJPEG default installation path" FORCE)
|
||||
set(CMAKE_INSTALL_PREFIX ${ROCM_PATH} CACHE PATH "rocjpeg default installation path" FORCE)
|
||||
endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
|
||||
|
||||
set(DEFAULT_BUILD_TYPE "Release")
|
||||
@@ -79,18 +79,18 @@ if(ENHANCED_MESSAGE)
|
||||
set(Cyan "${Esc}[36m")
|
||||
set(White "${Esc}[37m")
|
||||
endif()
|
||||
message("-- ${BoldBlue}rocJPEG Version -- ${VERSION}${ColourReset}")
|
||||
message("-- ${BoldBlue}rocJPEG Install Path -- ${CMAKE_INSTALL_PREFIX}${ColourReset}")
|
||||
message("-- ${BoldBlue}rocjpeg Version -- ${VERSION}${ColourReset}")
|
||||
message("-- ${BoldBlue}rocjpeg Install Path -- ${CMAKE_INSTALL_PREFIX}${ColourReset}")
|
||||
|
||||
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
|
||||
list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake ${ROCM_PATH}/share/rocmcmakebuildtools/cmake)
|
||||
|
||||
# rocJPEG Default Options
|
||||
option(BUILD_WITH_AMD_ADVANCE "Build rocJPEG for advanced AMD GPU Architecture" OFF)
|
||||
# rocjpeg Default Options
|
||||
option(BUILD_WITH_AMD_ADVANCE "Build rocjpeg for advanced AMD GPU Architecture" OFF)
|
||||
|
||||
# rocJPEG Build Type
|
||||
# rocjpeg Build Type
|
||||
if(NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocJPEG Default Build Type" FORCE)
|
||||
set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocjpeg Default Build Type" FORCE)
|
||||
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release")
|
||||
endif()
|
||||
|
||||
@@ -163,7 +163,7 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND)
|
||||
include_directories(api src)
|
||||
# source files
|
||||
file(GLOB_RECURSE SOURCES "./src/*.cpp")
|
||||
# rocJPEG.so
|
||||
# rocjpeg.so
|
||||
add_library(${PROJECT_NAME} SHARED ${SOURCES})
|
||||
|
||||
if(CMAKE_BUILD_TYPE MATCHES Debug)
|
||||
@@ -179,7 +179,7 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND)
|
||||
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -DNDEBUG -fPIC")
|
||||
target_compile_options(${PROJECT_NAME} PRIVATE -O3 -DNDEBUG -fPIC -Wall)
|
||||
endif()
|
||||
message("-- ${BoldBlue}rocJPEG Build Type -- ${CMAKE_BUILD_TYPE}${ColourReset}")
|
||||
message("-- ${BoldBlue}rocjpeg Build Type -- ${CMAKE_BUILD_TYPE}${ColourReset}")
|
||||
|
||||
target_link_libraries(${PROJECT_NAME} ${LINK_LIBRARY_LIST})
|
||||
|
||||
@@ -235,26 +235,26 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND)
|
||||
#Generate BUILD_INFO
|
||||
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/api/rocjpeg_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/rocjpeg_version.h @ONLY )
|
||||
|
||||
# install rocJPEG libs -- {ROCM_PATH}/lib
|
||||
# install rocjpeg libs -- {ROCM_PATH}/lib
|
||||
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime NAMELINK_SKIP)
|
||||
install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev NAMELINK_ONLY)
|
||||
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT asan)
|
||||
# install rocJPEG include files -- {ROCM_PATH}/include/rocJPEG
|
||||
# install rocjpeg include files -- {ROCM_PATH}/include/rocjpeg
|
||||
install(FILES api/rocjpeg/rocjpeg.h
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} COMPONENT dev)
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/rocjpeg_version.h
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} COMPONENT dev)
|
||||
# install rocJPEG api trace include file -- {ROCM_PATH}/include/rocjpeg/amd_detail
|
||||
# install rocjpeg api trace include file -- {ROCM_PATH}/include/rocjpeg/amd_detail
|
||||
install(FILES api/amd_detail/rocjpeg_api_trace.h
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/amd_detail COMPONENT dev)
|
||||
|
||||
# install rocJPEG samples -- {ROCM_PATH}/share/rocJPEG
|
||||
# install rocjpeg samples -- {ROCM_PATH}/share/rocjpeg
|
||||
install(FILES samples/jpegDecode/CMakeLists.txt samples/jpegDecode/jpegdecode.cpp samples/jpegDecode/README.md DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/samples/jpegDecode COMPONENT dev)
|
||||
install(FILES samples/jpegDecodePerf/CMakeLists.txt samples/jpegDecodePerf/jpegdecodeperf.cpp samples/jpegDecodePerf/README.md DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/samples/jpegDecodePerf COMPONENT dev)
|
||||
install(FILES samples/jpegDecodeBatched/CMakeLists.txt samples/jpegDecodeBatched/jpegdecodebatched.cpp samples/jpegDecodeBatched/README.md DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/samples/jpegDecodeBatched COMPONENT dev)
|
||||
install(FILES samples/rocjpeg_samples_utils.h DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/samples COMPONENT dev)
|
||||
install(DIRECTORY data/images DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME} COMPONENT dev)
|
||||
# install license information - {ROCM_PATH}/share/doc/rocJPEG
|
||||
# install license information - {ROCM_PATH}/share/doc/rocjpeg
|
||||
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
|
||||
install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT runtime)
|
||||
install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR}-asan COMPONENT asan)
|
||||
@@ -262,25 +262,25 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND)
|
||||
install(FILES test/CMakeLists.txt DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/test COMPONENT test)
|
||||
install(FILES test/rocjpeg_negative_api_tests/CMakeLists.txt test/rocjpeg_negative_api_tests/README.md test/rocjpeg_negative_api_tests/rocjpeg_api_negative_tests.cpp test/rocjpeg_negative_api_tests/rocjpeg_api_negative_tests.h test/rocjpeg_negative_api_tests/rocjpegnegativetest.cpp DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/test/rocjpeg_negative_api_tests COMPONENT test)
|
||||
|
||||
message("-- ${White}AMD ROCm rocJPEG -- CMAKE_CXX_FLAGS:${CMAKE_CXX_FLAGS}${ColourReset}")
|
||||
message("-- ${White}AMD ROCm rocJPEG -- Link Libraries: ${LINK_LIBRARY_LIST}${ColourReset}")
|
||||
message("-- ${White}AMD ROCm rocjpeg -- CMAKE_CXX_FLAGS:${CMAKE_CXX_FLAGS}${ColourReset}")
|
||||
message("-- ${White}AMD ROCm rocjpeg -- Link Libraries: ${LINK_LIBRARY_LIST}${ColourReset}")
|
||||
|
||||
## Cmake module config file configurations
|
||||
# Cmake module config file configurations
|
||||
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/" CACHE INTERNAL "Default module path.")
|
||||
|
||||
## Export the package for use from the build-tree
|
||||
## (this registers the build-tree with a global CMake-registry)
|
||||
# Export the package for use from the build-tree
|
||||
# (this registers the build-tree with a global CMake-registry)
|
||||
export(PACKAGE ${PROJECT_NAME})
|
||||
set(CONF_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
|
||||
|
||||
## Create the rocjpeg-config.cmake and rocjpeg-config-version files
|
||||
# Create the rocjpeg-config.cmake and rocjpeg-config-version files
|
||||
include(CMakePackageConfigHelpers)
|
||||
set(CONFIG_PACKAGE_INSTALL_DIR ${CONF_LIB_DIR}/cmake/${PROJECT_NAME})
|
||||
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
|
||||
set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
|
||||
set(BIN_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}")
|
||||
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
|
||||
set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
|
||||
set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
|
||||
|
||||
## Generate Config File for rocJPEG
|
||||
# Generate Config File for rocjpeg
|
||||
configure_package_config_file(
|
||||
${CMAKE_MODULE_PATH}/${PROJECT_NAME}-config.cmake.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake
|
||||
@@ -288,14 +288,14 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND)
|
||||
PATH_VARS LIB_INSTALL_DIR INCLUDE_INSTALL_DIR BIN_INSTALL_DIR
|
||||
)
|
||||
|
||||
## Generate config Version File for rocJPEG
|
||||
# Generate config Version File for rocjpeg
|
||||
write_basic_package_version_file(
|
||||
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
|
||||
VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
|
||||
COMPATIBILITY SameMajorVersion
|
||||
)
|
||||
|
||||
## Install the rocjpeg-config.cmake and rocjpeg-config-version.cmake
|
||||
# Install the rocjpeg-config.cmake and rocjpeg-config-version.cmake
|
||||
install(FILES
|
||||
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
|
||||
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
|
||||
@@ -303,12 +303,16 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND)
|
||||
COMPONENT dev
|
||||
)
|
||||
|
||||
## Install the export set for use with the install-tree
|
||||
install(EXPORT ${PROJECT_NAME}-targets DESTINATION
|
||||
"${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" COMPONENT dev
|
||||
# Install the export set for use with the install-tree
|
||||
install(EXPORT ${PROJECT_NAME}-targets
|
||||
FILE ${PROJECT_NAME}-targets.cmake
|
||||
NAMESPACE ${PROJECT_NAME}::
|
||||
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
|
||||
COMPONENT dev
|
||||
)
|
||||
|
||||
# make test with CTest
|
||||
set(BUILD_FROM_SOURCE ON)
|
||||
enable_testing()
|
||||
include(CTest)
|
||||
add_subdirectory(test)
|
||||
@@ -319,17 +323,17 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND)
|
||||
set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
|
||||
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
|
||||
set(CPACK_PACKAGE_LICENSE "MIT")
|
||||
set(CPACK_PACKAGE_CONTACT "rocJPEG Support <mivisionx.support@amd.com>")
|
||||
set(CPACK_PACKAGE_CONTACT "rocjpeg Support <mivisionx.support@amd.com>")
|
||||
set(CPACK_PACKAGE_VENDOR "AMD ROCm")
|
||||
set(CPACK_PACKAGE_GROUP "Development/Tools")
|
||||
set(CPACK_PACKAGE_HOMEPAGE "https://github.com/ROCm/rocJPEG")
|
||||
set(CPACK_PACKAGE_HOMEPAGE "https://github.com/ROCm/rocjpeg")
|
||||
|
||||
if(ENABLE_ASAN_PACKAGING)
|
||||
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "AMD rocJPEG address sanitizer libraries")
|
||||
set(CPACK_RPM_PACKAGE_SUMMARY "AMD rocJPEG address sanitizer libraries")
|
||||
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "AMD rocjpeg address sanitizer libraries")
|
||||
set(CPACK_RPM_PACKAGE_SUMMARY "AMD rocjpeg address sanitizer libraries")
|
||||
else()
|
||||
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "AMD rocJPEG is a high performance JPEG decode SDK for AMD GPUs")
|
||||
set(CPACK_RPM_PACKAGE_SUMMARY "AMD rocJPEG is a high performance JPEG decode SDK for AMD GPUs")
|
||||
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "AMD rocjpeg is a high performance JPEG decode SDK for AMD GPUs")
|
||||
set(CPACK_RPM_PACKAGE_SUMMARY "AMD rocjpeg is a high performance JPEG decode SDK for AMD GPUs")
|
||||
endif()
|
||||
|
||||
if(DEFINED ENV{ROCM_LIBPATCH_VERSION})
|
||||
@@ -438,39 +442,39 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND)
|
||||
endif()
|
||||
if(EXISTS ${RPMBUILD_EXE})
|
||||
list(APPEND CPACK_GENERATOR "RPM")
|
||||
message("-- ${White}AMD ROCm rocJPEG RunTime Package -- ${CPACK_RPM_RUNTIME_PACKAGE_REQUIRES}${ColourReset}")
|
||||
message("-- ${White}AMD ROCm rocJPEG Dev Package -- ${CPACK_RPM_DEV_PACKAGE_REQUIRES}${ColourReset}")
|
||||
message("-- ${White}AMD ROCm rocjpeg RunTime Package -- ${CPACK_RPM_RUNTIME_PACKAGE_REQUIRES}${ColourReset}")
|
||||
message("-- ${White}AMD ROCm rocjpeg Dev Package -- ${CPACK_RPM_DEV_PACKAGE_REQUIRES}${ColourReset}")
|
||||
endif()
|
||||
if(EXISTS ${DPKG_EXE})
|
||||
list(APPEND CPACK_GENERATOR "DEB")
|
||||
message("-- ${White}AMD ROCm rocJPEG RunTime Package -- ${CPACK_DEBIAN_RUNTIME_PACKAGE_DEPENDS}${ColourReset}")
|
||||
message("-- ${White}AMD ROCm rocJPEG Dev Package -- ${CPACK_DEBIAN_DEV_PACKAGE_DEPENDS}${ColourReset}")
|
||||
message("-- ${White}AMD ROCm rocjpeg RunTime Package -- ${CPACK_DEBIAN_RUNTIME_PACKAGE_DEPENDS}${ColourReset}")
|
||||
message("-- ${White}AMD ROCm rocjpeg Dev Package -- ${CPACK_DEBIAN_DEV_PACKAGE_DEPENDS}${ColourReset}")
|
||||
endif()
|
||||
|
||||
include(CPack)
|
||||
|
||||
cpack_add_component(runtime
|
||||
DISPLAY_NAME "rocJPEG Runtime Package"
|
||||
DESCRIPTION "AMD rocJPEG is a high performance JPEG decode SDK for AMD GPUs. \
|
||||
rocJPEG runtime package provides rocJPEG library and license.txt")
|
||||
DISPLAY_NAME "rocjpeg Runtime Package"
|
||||
DESCRIPTION "AMD rocjpeg is a high performance JPEG decode SDK for AMD GPUs. \
|
||||
rocjpeg runtime package provides rocjpeg library and license.txt")
|
||||
|
||||
cpack_add_component(dev
|
||||
DISPLAY_NAME "rocJPEG Develop Package"
|
||||
DESCRIPTION "AMD rocJPEG is a high performance JPEG decode SDK for AMD GPUs. \
|
||||
rocJPEG develop package provides rocJPEG library, header files and samples")
|
||||
DISPLAY_NAME "rocjpeg Develop Package"
|
||||
DESCRIPTION "AMD rocjpeg is a high performance JPEG decode SDK for AMD GPUs. \
|
||||
rocjpeg develop package provides rocjpeg library, header files and samples")
|
||||
|
||||
cpack_add_component(asan
|
||||
DISPLAY_NAME "rocJPEG ASAN Package"
|
||||
DESCRIPTION "AMD rocJPEG is a high performance JPEG decode SDK for AMD GPUs. \
|
||||
rocJPEG ASAN package provides rocJPEG ASAN libraries")
|
||||
DISPLAY_NAME "rocjpeg ASAN Package"
|
||||
DESCRIPTION "AMD rocjpeg is a high performance JPEG decode SDK for AMD GPUs. \
|
||||
rocjpeg ASAN package provides rocjpeg ASAN libraries")
|
||||
|
||||
cpack_add_component(test
|
||||
DISPLAY_NAME "rocJPEG Test Package"
|
||||
DESCRIPTION "AMD rocJPEG is a high performance JPEG decode SDK for AMD GPUs. \
|
||||
rocJPEG Test package provides rocJPEG Test Components")
|
||||
DISPLAY_NAME "rocjpeg Test Package"
|
||||
DESCRIPTION "AMD rocjpeg is a high performance JPEG decode SDK for AMD GPUs. \
|
||||
rocjpeg Test package provides rocjpeg Test Components")
|
||||
|
||||
else()
|
||||
message("-- ${Red}AMD ROCm rocJPEG -- unmet dependencies${ColourReset}")
|
||||
message("-- ${Red}AMD ROCm rocjpeg -- unmet dependencies${ColourReset}")
|
||||
if(NOT HIP_FOUND)
|
||||
message(FATAL_ERROR "-- ERROR!: HIP Not Found! - please install rocm-hip-runtime-dev!")
|
||||
endif()
|
||||
|
||||
@@ -1,23 +1,37 @@
|
||||
# - Config file for the rocjpeg package
|
||||
# It defines the following variables
|
||||
# ROCJPEG_INCLUDE_DIR - include directory for rocjpeg
|
||||
# ROCJPEG_LIB_DIR - library directory for rocjpeg
|
||||
# ROCJPEG_LIBRARY - library to link against
|
||||
# use rocjpeg_INCLUDE_DIR - include directory for rocjpeg
|
||||
# use rocjpeg_LIB_DIR - library directory for rocjpeg
|
||||
# use rocjpeg_LIBRARY - library to link against
|
||||
# use rocjpeg_LIBRARIES - library to link against
|
||||
|
||||
# compute paths
|
||||
get_filename_component(@PROJECT_NAME@_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||
|
||||
# version
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-config-version.cmake)
|
||||
set(@PROJECT_NAME@_VERSION ${PACKAGE_VERSION})
|
||||
|
||||
# targets
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake)
|
||||
|
||||
@PACKAGE_INIT@
|
||||
|
||||
# Compute paths
|
||||
set_and_check(rocjpeg_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
|
||||
set_and_check(ROCJPEG_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
|
||||
set_and_check(rocJPEG_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
|
||||
set_and_check(rocjpeg_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@")
|
||||
set_and_check(ROCJPEG_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@")
|
||||
set_and_check(rocJPEG_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@")
|
||||
set_and_check(rocjpeg_LIBRARY "@PACKAGE_LIB_INSTALL_DIR@/librocjpeg.so")
|
||||
set_and_check(ROCJPEG_LIBRARY "@PACKAGE_LIB_INSTALL_DIR@/librocjpeg.so")
|
||||
set_and_check(rocJPEG_LIBRARY "@PACKAGE_LIB_INSTALL_DIR@/librocjpeg.so")
|
||||
set_and_check(@PROJECT_NAME@_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
|
||||
set_and_check(@PROJECT_NAME@_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@")
|
||||
set_and_check(@PROJECT_NAME@_LIBRARY "@PACKAGE_LIB_INSTALL_DIR@/lib@PROJECT_NAME@.so")
|
||||
set_and_check(@PROJECT_NAME@_LIBRARIES "@PACKAGE_LIB_INSTALL_DIR@/lib@PROJECT_NAME@.so")
|
||||
|
||||
if(NOT TARGET @PROJECT_NAME@::@PROJECT_NAME@)
|
||||
add_library(@PROJECT_NAME@::@PROJECT_NAME@ INTERFACE IMPORTED)
|
||||
set_target_properties(@PROJECT_NAME@::@PROJECT_NAME@ PROPERTIES INTERFACE_LINK_LIBRARIES ${@PROJECT_NAME@_LIBRARY})
|
||||
endif ()
|
||||
|
||||
get_filename_component(ROCJPEG_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||
include("${ROCJPEG_CMAKE_DIR}/rocjpeg-targets.cmake")
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(
|
||||
@PROJECT_NAME@
|
||||
FOUND_VAR @PROJECT_NAME@_FOUND
|
||||
REQUIRED_VARS @PROJECT_NAME@_INCLUDE_DIR @PROJECT_NAME@_LIB_DIR @PROJECT_NAME@_LIBRARY @PROJECT_NAME@_LIBRARIES
|
||||
VERSION_VAR @PROJECT_NAME@_VERSION
|
||||
HANDLE_COMPONENTS)
|
||||
|
||||
|
||||
@@ -45,15 +45,15 @@ project(jpegdecode)
|
||||
list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake)
|
||||
|
||||
find_package(HIP QUIET)
|
||||
find_package(ROCJPEG QUIET)
|
||||
find_package(rocjpeg QUIET)
|
||||
find_package(rocprofiler-register QUIET)
|
||||
|
||||
if(HIP_FOUND AND ROCJPEG_FOUND AND rocprofiler-register_FOUND)
|
||||
if(HIP_FOUND AND rocjpeg_FOUND AND rocprofiler-register_FOUND)
|
||||
# HIP
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host)
|
||||
# rocJPEG
|
||||
include_directories (${ROCJPEG_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCJPEG_LIBRARY})
|
||||
include_directories (${rocjpeg_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocjpeg::rocjpeg)
|
||||
# std filesystem
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} stdc++fs)
|
||||
# rocprofiler-register
|
||||
@@ -68,7 +68,7 @@ else()
|
||||
if (NOT HIP_FOUND)
|
||||
message(FATAL_ERROR "-- ERROR!: HIP Not Found! - please install ROCm and HIP!")
|
||||
endif()
|
||||
if (NOT ROCJPEG_FOUND)
|
||||
if (NOT rocjpeg_FOUND)
|
||||
message(FATAL_ERROR "-- ERROR!: rocJPEG Not Found! - please install rocJPEG!")
|
||||
endif()
|
||||
if (NOT rocprofiler-register_FOUND)
|
||||
|
||||
@@ -45,15 +45,15 @@ project(jpegdecodebatched)
|
||||
list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake)
|
||||
|
||||
find_package(HIP QUIET)
|
||||
find_package(ROCJPEG QUIET)
|
||||
find_package(rocjpeg QUIET)
|
||||
find_package(rocprofiler-register QUIET)
|
||||
|
||||
if(HIP_FOUND AND ROCJPEG_FOUND AND rocprofiler-register_FOUND)
|
||||
if(HIP_FOUND AND rocjpeg_FOUND AND rocprofiler-register_FOUND)
|
||||
# HIP
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host)
|
||||
# rocJPEG
|
||||
include_directories (${ROCJPEG_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCJPEG_LIBRARY})
|
||||
include_directories (${rocjpeg_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocjpeg::rocjpeg)
|
||||
# std filesystem
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} stdc++fs)
|
||||
# rocprofiler-register
|
||||
@@ -68,7 +68,7 @@ else()
|
||||
if (NOT HIP_FOUND)
|
||||
message(FATAL_ERROR "-- ERROR!: HIP Not Found! - please install ROCm and HIP!")
|
||||
endif()
|
||||
if (NOT ROCJPEG_FOUND)
|
||||
if (NOT rocjpeg_FOUND)
|
||||
message(FATAL_ERROR "-- ERROR!: rocJPEG Not Found! - please install rocJPEG!")
|
||||
endif()
|
||||
if (NOT rocprofiler-register_FOUND)
|
||||
|
||||
@@ -45,13 +45,13 @@ project(jpegdecodeperf)
|
||||
list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake)
|
||||
|
||||
find_package(HIP QUIET)
|
||||
find_package(ROCJPEG QUIET)
|
||||
find_package(rocjpeg QUIET)
|
||||
find_package(rocprofiler-register QUIET)
|
||||
|
||||
# threads
|
||||
find_package(Threads REQUIRED)
|
||||
|
||||
if(HIP_FOUND AND ROCJPEG_FOUND AND Threads_FOUND AND rocprofiler-register_FOUND)
|
||||
if(HIP_FOUND AND rocjpeg_FOUND AND Threads_FOUND AND rocprofiler-register_FOUND)
|
||||
# HIP
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host)
|
||||
#threads
|
||||
@@ -63,8 +63,8 @@ if(HIP_FOUND AND ROCJPEG_FOUND AND Threads_FOUND AND rocprofiler-register_FOUND)
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocprofiler-register::rocprofiler-register)
|
||||
|
||||
# rocJPEG
|
||||
include_directories (${ROCJPEG_INCLUDE_DIR})
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCJPEG_LIBRARY})
|
||||
include_directories (${rocjpeg_INCLUDE_DIR})
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocjpeg::rocjpeg)
|
||||
list(APPEND SOURCES ${PROJECT_SOURCE_DIR} jpegdecodeperf.cpp)
|
||||
add_executable(${PROJECT_NAME} ${SOURCES})
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17")
|
||||
@@ -74,7 +74,7 @@ else()
|
||||
if (NOT HIP_FOUND)
|
||||
message(FATAL_ERROR "-- ERROR!: HIP Not Found! - please install ROCm and HIP!")
|
||||
endif()
|
||||
if (NOT ROCJPEG_FOUND)
|
||||
if (NOT rocjpeg_FOUND)
|
||||
message(FATAL_ERROR "-- ERROR!: rocJPEG Not Found! - please install rocJPEG!")
|
||||
endif()
|
||||
if (NOT Threads_FOUND)
|
||||
|
||||
+17
-14
@@ -58,22 +58,25 @@ include(CTest)
|
||||
list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake)
|
||||
|
||||
# find rocjpeg
|
||||
find_package(ROCJPEG QUIET)
|
||||
|
||||
if(ROCJPEG_FOUND)
|
||||
message("-- ${White}${PROJECT_NAME}: rocJPEG found with find_package(ROCJPEG QUIET)${ColourReset}")
|
||||
message("-- \t${White}ROCJPEG_INCLUDE_DIR -- ${ROCJPEG_INCLUDE_DIR}${ColourReset}")
|
||||
message("-- \t${White}ROCJPEG_LIB_DIR -- ${ROCJPEG_LIB_DIR}${ColourReset}")
|
||||
message("-- \t${White}ROCJPEG_LIBRARY -- ${ROCJPEG_LIBRARY}${ColourReset}")
|
||||
message("-- \t${White}ROCJPEG_FOUND -- ${ROCJPEG_FOUND}${ColourReset}")
|
||||
message("-- \t${White}ROCJPEG_VERSION -- ${ROCJPEG_VERSION}${ColourReset}")
|
||||
message("-- \t${White}ROCJPEG_VERSION_MAJOR -- ${ROCJPEG_VERSION_MAJOR}${ColourReset}")
|
||||
message("-- \t${White}ROCJPEG_VERSION_MINOR -- ${ROCJPEG_VERSION_MINOR}${ColourReset}")
|
||||
message("-- \t${White}ROCJPEG_VERSION_PATCH -- ${ROCJPEG_VERSION_PATCH}${ColourReset}")
|
||||
if(BUILD_FROM_SOURCE)
|
||||
message("-- ${White}${PROJECT_NAME}: CTests requires rocjpeg installed before running CTests")
|
||||
else()
|
||||
message("-- ${Yellow}${PROJECT_NAME} requires rocJPEG. Install rocJPEG before running CTests")
|
||||
endif(ROCJPEG_FOUND)
|
||||
find_package(rocjpeg QUIET)
|
||||
|
||||
if(rocjpeg_FOUND)
|
||||
message("-- ${White}${PROJECT_NAME}: rocjpeg found with find_package(rocjpeg QUIET)${ColourReset}")
|
||||
message("-- \t${White}rocjpeg_INCLUDE_DIR -- ${rocjpeg_INCLUDE_DIR}${ColourReset}")
|
||||
message("-- \t${White}rocjpeg_LIB_DIR -- ${rocjpeg_LIB_DIR}${ColourReset}")
|
||||
message("-- \t${White}rocjpeg_LIBRARY -- ${rocjpeg_LIBRARY}${ColourReset}")
|
||||
message("-- \t${White}rocjpeg_FOUND -- ${rocjpeg_FOUND}${ColourReset}")
|
||||
message("-- \t${White}rocjpeg_VERSION -- ${rocjpeg_VERSION}${ColourReset}")
|
||||
message("-- \t${White}rocjpeg_VERSION_MAJOR -- ${rocjpeg_VERSION_MAJOR}${ColourReset}")
|
||||
message("-- \t${White}rocjpeg_VERSION_MINOR -- ${rocjpeg_VERSION_MINOR}${ColourReset}")
|
||||
message("-- \t${White}rocjpeg_VERSION_PATCH -- ${rocjpeg_VERSION_PATCH}${ColourReset}")
|
||||
else()
|
||||
message("-- ${Yellow}${PROJECT_NAME} requires rocjpeg. Install rocjpeg before running CTests")
|
||||
endif(rocjpeg_FOUND)
|
||||
endif(BUILD_FROM_SOURCE)
|
||||
|
||||
add_test(
|
||||
NAME
|
||||
|
||||
@@ -70,7 +70,7 @@ if(HIP_FOUND AND rocjpeg_FOUND AND rocprofiler-register_FOUND)
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host)
|
||||
# rocJPEG and utils
|
||||
include_directories (${rocjpeg_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${rocjpeg_LIBRARY})
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocjpeg::rocjpeg)
|
||||
# rocprofiler-register
|
||||
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocprofiler-register::rocprofiler-register)
|
||||
# sample app exe
|
||||
|
||||
Referencia en una nueva incidencia
Block a user