CTEST updates - remove duplicate tests and use ctest for both make and package tests (#102)

* CTEST upodates - remove duplicate tests and use ctest for both make and package tests

* clean up

* merge upstream

* remove unused CMakeLists file

---------

Co-authored-by: Kiriti Gowda <kiritigowda@gmail.com>

[ROCm/rocjpeg commit: 5488d5d63d]

projects/rocjpeg/samples/CMakeLists.txt

@@ -1,179 +0,0 @@
-# ##############################################################################
-# Copyright (c) 2024 - 2025 Advanced Micro Devices, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# ##############################################################################
-cmake_minimum_required(VERSION 3.10)
-
-add_test(
-  NAME
-  jpeg-decode-fmt-native
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
-                              "${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "jpegdecode"
-            -i ${CMAKE_SOURCE_DIR}/data/images/
-)
-
-add_test(
-  NAME
-  jpeg-decode-fmt-yuv-planar
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
-                              "${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "jpegdecode"
-            -i ${CMAKE_SOURCE_DIR}/data/images/ -fmt yuv_planar
-)
-
-add_test(
-  NAME
-  jpeg-decode-fmt-y
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
-                              "${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "jpegdecode"
-            -i ${CMAKE_SOURCE_DIR}/data/images/ -fmt y
-)
-
-add_test(
-  NAME
-  jpeg-decode-fmt-rgb
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
-                              "${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "jpegdecode"
-            -i ${CMAKE_SOURCE_DIR}/data/images/ -fmt rgb
-)
-
-add_test(
-  NAME
-  jpeg-decode-fmt-rgb-planar
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
-                              "${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "jpegdecode"
-            -i ${CMAKE_SOURCE_DIR}/data/images/ -fmt rgb_planar
-)
-
-add_test(
-  NAME
-  jpeg-decode-perf-fmt-native
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecodePerf"
-                              "${CMAKE_CURRENT_BINARY_DIR}/jpegDecodePerf"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "jpegdecodeperf"
-            -i ${CMAKE_SOURCE_DIR}/data/images/
-)
-
-add_test(
-  NAME
-  jpeg-decode-batch-fmt-native
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecodeBatched"
-                              "${CMAKE_CURRENT_BINARY_DIR}/jpegDecodeBatched"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "jpegdecodebatched"
-            -i ${CMAKE_SOURCE_DIR}/data/images/
-)
-
-add_test(
-  NAME
-  jpeg-decode-crop-fmt-native
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
-                              "${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "jpegdecode"
-            -i ${CMAKE_SOURCE_DIR}/data/images/ -crop 960,540,2880,1620
-)
-
-add_test(
-  NAME
-    jpeg-decode-crop-fmt-yuv-planar
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
-                              "${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "jpegdecode"
-            -i ${CMAKE_SOURCE_DIR}/data/images/ -fmt yuv_planar -crop 960,540,2880,1620
-)
-
-add_test(
-  NAME
-    jpeg-decode-crop-fmt-y
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
-                              "${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "jpegdecode"
-            -i ${CMAKE_SOURCE_DIR}/data/images/ -fmt y -crop 960,540,2880,1620
-)
-
-add_test(
-  NAME
-    jpeg-decode-crop-fmt-rgb
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
-                              "${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "jpegdecode"
-            -i ${CMAKE_SOURCE_DIR}/data/images/ -fmt rgb -crop 960,540,2880,1620
-)
-
-add_test(
-  NAME
-    jpeg-decode-crop-fmt-rgb-planar
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
-                              "${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "jpegdecode"
-            -i ${CMAKE_SOURCE_DIR}/data/images/ -fmt rgb_planar -crop 960,540,2880,1620
-)
-
-add_test(
-  NAME
-  jpeg-decode-crop-batch-fmt-native
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecodeBatched"
-                              "${CMAKE_CURRENT_BINARY_DIR}/jpegDecodeBatched"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "jpegdecodebatched"
-            -i ${CMAKE_SOURCE_DIR}/data/images/ -crop 960,540,2880,1620
-)

projects/rocjpeg/samples/jpegDecode/CMakeLists.txt

@@ -22,8 +22,6 @@
 ################################################################################
 
 cmake_minimum_required (VERSION 3.10)
-project(jpegdecode)
-set(CMAKE_CXX_STANDARD 17)
 
 # ROCM Path
 if(DEFINED ENV{ROCM_PATH})
@@ -33,21 +31,21 @@ elseif(ROCM_PATH)
 else()
   set(ROCM_PATH /opt/rocm CACHE PATH "Default ROCm installation path")
 endif()
+# Set AMD Clang as default compiler
+if (NOT DEFINED CMAKE_CXX_COMPILER)
+  set(CMAKE_C_COMPILER ${ROCM_PATH}/bin/amdclang)
+  set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++)
+endif()
+
+project(jpegdecode)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED On)
 
 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++)
 
 find_package(HIP QUIET)
-
-# find rocJPEG
-find_library(ROCJPEG_LIBRARY NAMES rocjpeg HINTS {ROCM_PATH}/lib)
-find_path(ROCJPEG_INCLUDE_DIR NAMES rocjpeg.h PATHS /opt/rocm/include/rocjpeg {ROCM_PATH}/include/rocjpeg)
-
-if(ROCJPEG_LIBRARY AND ROCJPEG_INCLUDE_DIR)
-    set(ROCJPEG_FOUND TRUE)
-    message("-- ${White}Using rocJPEG -- \n\tLibraries:${ROCJPEG_LIBRARY} \n\tIncludes:${ROCJPEG_INCLUDE_DIR}${ColourReset}")
-endif()
+find_package(rocJPEG QUIET)
 
 if(HIP_FOUND AND ROCJPEG_FOUND)
     # HIP
@@ -55,10 +53,9 @@ if(HIP_FOUND AND ROCJPEG_FOUND)
     # rocJPEG
     include_directories (${ROCJPEG_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
     set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCJPEG_LIBRARY})
-    #filesystem: c++ compilers less than equal to 8.5 need explicit link with stdc++fs
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL "8.5")
-      set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} stdc++fs)
-    endif()
+    # std filesystem
+    set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} stdc++fs)
+
     list(APPEND SOURCES ${PROJECT_SOURCE_DIR} jpegdecode.cpp)
     add_executable(${PROJECT_NAME} ${SOURCES})
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17")

projects/rocjpeg/samples/jpegDecodeBatched/CMakeLists.txt

@@ -22,8 +22,6 @@
 ################################################################################
 
 cmake_minimum_required(VERSION 3.10)
-project(jpegdecodebatched)
-set(CMAKE_CXX_STANDARD 17)
 
 # ROCM Path
 if(DEFINED ENV{ROCM_PATH})
@@ -33,21 +31,21 @@ elseif(ROCM_PATH)
 else()
   set(ROCM_PATH /opt/rocm CACHE PATH "Default ROCm installation path")
 endif()
+# Set AMD Clang as default compiler
+if (NOT DEFINED CMAKE_CXX_COMPILER)
+  set(CMAKE_C_COMPILER ${ROCM_PATH}/bin/amdclang)
+  set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++)
+endif()
+
+project(jpegdecodebatched)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED On)
 
 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++)
 
 find_package(HIP QUIET)
-
-# find rocJPEG
-find_library(ROCJPEG_LIBRARY NAMES rocjpeg HINTS {ROCM_PATH}/lib)
-find_path(ROCJPEG_INCLUDE_DIR NAMES rocjpeg.h PATHS /opt/rocm/include/rocjpeg {ROCM_PATH}/include/rocjpeg)
-
-if(ROCJPEG_LIBRARY AND ROCJPEG_INCLUDE_DIR)
-    set(ROCJPEG_FOUND TRUE)
-    message("-- ${White}Using rocJPEG -- \n\tLibraries:${ROCJPEG_LIBRARY} \n\tIncludes:${ROCJPEG_INCLUDE_DIR}${ColourReset}")
-endif()
+find_package(rocJPEG QUIET)
 
 if(HIP_FOUND AND ROCJPEG_FOUND)
     # HIP
@@ -55,10 +53,9 @@ if(HIP_FOUND AND ROCJPEG_FOUND)
     # rocJPEG
     include_directories (${ROCJPEG_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
     set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCJPEG_LIBRARY})
-    #filesystem: c++ compilers less than equal to 8.5 need explicit link with stdc++fs
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL "8.5")
-      set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} stdc++fs)
-    endif()
+    # std filesystem
+    set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} stdc++fs)
+
     list(APPEND SOURCES ${PROJECT_SOURCE_DIR} jpegdecodebatched.cpp)
     add_executable(${PROJECT_NAME} ${SOURCES})
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17")

projects/rocjpeg/samples/jpegDecodePerf/CMakeLists.txt

@@ -22,8 +22,6 @@
 ################################################################################
 
 cmake_minimum_required(VERSION 3.10)
-project(jpegdecodeperf)
-set(CMAKE_CXX_STANDARD 17)
 
 # ROCM Path
 if(DEFINED ENV{ROCM_PATH})
@@ -33,21 +31,21 @@ elseif(ROCM_PATH)
 else()
   set(ROCM_PATH /opt/rocm CACHE PATH "Default ROCm installation path")
 endif()
+# Set AMD Clang as default compiler
+if (NOT DEFINED CMAKE_CXX_COMPILER)
+  set(CMAKE_C_COMPILER ${ROCM_PATH}/bin/amdclang)
+  set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++)
+endif()
+
+project(jpegdecodeperf)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED On)
 
 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++)
 
 find_package(HIP QUIET)
-
-# find rocJPEG
-find_library(ROCJPEG_LIBRARY NAMES rocjpeg HINTS {ROCM_PATH}/lib)
-find_path(ROCJPEG_INCLUDE_DIR NAMES rocjpeg.h PATHS /opt/rocm/include/rocjpeg {ROCM_PATH}/include/rocjpeg)
-
-if(ROCJPEG_LIBRARY AND ROCJPEG_INCLUDE_DIR)
-    set(ROCJPEG_FOUND TRUE)
-    message("-- ${White}Using rocJPEG -- \n\tLibraries:${ROCJPEG_LIBRARY} \n\tIncludes:${ROCJPEG_INCLUDE_DIR}${ColourReset}")
-endif()
+find_package(rocJPEG QUIET)
 
 # threads
 find_package(Threads REQUIRED)
@@ -58,10 +56,9 @@ if(HIP_FOUND AND ROCJPEG_FOUND AND Threads_FOUND)
     #threads
     set(THREADS_PREFER_PTHREAD_FLAG ON)
     set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} Threads::Threads)
-    #filesystem: c++ compilers less than equal to 8.5 need explicit link with stdc++fs
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL "8.5")
-      set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} stdc++fs)
-    endif()
+    # std filesystem
+    set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} stdc++fs)
+
     # rocJPEG
     include_directories (${ROCJPEG_INCLUDE_DIR})
     set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCJPEG_LIBRARY})