From 3901d4d68e6a6fc700776dcceec5231f66456f0b Mon Sep 17 00:00:00 2001 From: Aryan Salmanpour Date: Fri, 7 Mar 2025 19:52:26 -0500 Subject: [PATCH] CTEST - add new tests (#127) [ROCm/rocjpeg commit: 1aea857212f6284d590aed8bfa13584851168275] --- projects/rocjpeg/CHANGELOG.md | 5 +- projects/rocjpeg/CMakeLists.txt | 2 +- projects/rocjpeg/api/rocjpeg_version.h | 2 +- projects/rocjpeg/test/CMakeLists.txt | 146 ++++++++++++++++++++----- 4 files changed, 127 insertions(+), 28 deletions(-) diff --git a/projects/rocjpeg/CHANGELOG.md b/projects/rocjpeg/CHANGELOG.md index 92d3ff18e6..4018ad68dd 100644 --- a/projects/rocjpeg/CHANGELOG.md +++ b/projects/rocjpeg/CHANGELOG.md @@ -3,7 +3,10 @@ Documentation for rocJPEG is available at [https://rocm.docs.amd.com/projects/rocJPEG/en/latest/](https://rocm.docs.amd.com/projects/rocJPEG/en/latest/) -## (Unreleased) rocJPEG 0.10.0 +## (Unreleased) rocJPEG 0.10.1 + +## Added +* CTEST - New tests were introduced for JPEG batch decoding using various output formats, such as yuv_planar, y, rgb, and rgb_planar, both with and without region-of-interest (ROI). ## Changed * Readme - cleanup and updates to pre-reqs diff --git a/projects/rocjpeg/CMakeLists.txt b/projects/rocjpeg/CMakeLists.txt index 4d9dfdcbbb..15af42ca34 100644 --- a/projects/rocjpeg/CMakeLists.txt +++ b/projects/rocjpeg/CMakeLists.txt @@ -40,7 +40,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED On) # NOTE: Match version with api/rocjpeg_version.h -set(VERSION "0.10.0") +set(VERSION "0.10.1") # Set Project Version and Language project(rocjpeg VERSION ${VERSION} LANGUAGES CXX) diff --git a/projects/rocjpeg/api/rocjpeg_version.h b/projects/rocjpeg/api/rocjpeg_version.h index f640ee1b45..e4b386d233 100644 --- a/projects/rocjpeg/api/rocjpeg_version.h +++ b/projects/rocjpeg/api/rocjpeg_version.h @@ -35,7 +35,7 @@ extern "C" { #endif #define ROCJPEG_MAJOR_VERSION 0 #define ROCJPEG_MINOR_VERSION 10 -#define ROCJPEG_MICRO_VERSION 0 +#define ROCJPEG_MICRO_VERSION 1 /** diff --git a/projects/rocjpeg/test/CMakeLists.txt b/projects/rocjpeg/test/CMakeLists.txt index 6a7ac5dfa9..279de73885 100644 --- a/projects/rocjpeg/test/CMakeLists.txt +++ b/projects/rocjpeg/test/CMakeLists.txt @@ -123,30 +123,6 @@ add_test( -i ${ROCM_PATH}/share/rocjpeg/images/ -fmt rgb_planar ) -add_test( - NAME - jpeg-decode-threads-fmt-native - COMMAND - "${CMAKE_CTEST_COMMAND}" - --build-and-test "${ROCM_PATH}/share/rocjpeg/samples/jpegDecodePerf" - "${CMAKE_CURRENT_BINARY_DIR}/jpegDecodePerf" - --build-generator "${CMAKE_GENERATOR}" - --test-command "jpegdecodeperf" - -i ${ROCM_PATH}/share/rocjpeg/images/ -) - -add_test( - NAME - jpeg-decode-batch-fmt-native - COMMAND - "${CMAKE_CTEST_COMMAND}" - --build-and-test "${ROCM_PATH}/share/rocjpeg/samples/jpegDecodeBatched" - "${CMAKE_CURRENT_BINARY_DIR}/jpegDecodeBatched" - --build-generator "${CMAKE_GENERATOR}" - --test-command "jpegdecodebatched" - -i ${ROCM_PATH}/share/rocjpeg/images/ -) - add_test( NAME jpeg-decode-crop-fmt-native @@ -209,7 +185,67 @@ add_test( add_test( NAME - jpeg-decode-crop-batch-fmt-native + jpeg-decode-batch-fmt-native + COMMAND + "${CMAKE_CTEST_COMMAND}" + --build-and-test "${ROCM_PATH}/share/rocjpeg/samples/jpegDecodeBatched" + "${CMAKE_CURRENT_BINARY_DIR}/jpegDecodeBatched" + --build-generator "${CMAKE_GENERATOR}" + --test-command "jpegdecodebatched" + -i ${ROCM_PATH}/share/rocjpeg/images/ +) + +add_test( + NAME + jpeg-decode-batch-fmt-yuv-planar + COMMAND + "${CMAKE_CTEST_COMMAND}" + --build-and-test "${ROCM_PATH}/share/rocjpeg/samples/jpegDecodeBatched" + "${CMAKE_CURRENT_BINARY_DIR}/jpegDecodeBatched" + --build-generator "${CMAKE_GENERATOR}" + --test-command "jpegdecodebatched" + -i ${ROCM_PATH}/share/rocjpeg/images/ -fmt yuv_planar +) + +add_test( + NAME + jpeg-decode-batch-fmt-y + COMMAND + "${CMAKE_CTEST_COMMAND}" + --build-and-test "${ROCM_PATH}/share/rocjpeg/samples/jpegDecodeBatched" + "${CMAKE_CURRENT_BINARY_DIR}/jpegDecodeBatched" + --build-generator "${CMAKE_GENERATOR}" + --test-command "jpegdecodebatched" + -i ${ROCM_PATH}/share/rocjpeg/images/ -fmt y +) + +add_test( + NAME + jpeg-decode-batch-fmt-rgb + COMMAND + "${CMAKE_CTEST_COMMAND}" + --build-and-test "${ROCM_PATH}/share/rocjpeg/samples/jpegDecodeBatched" + "${CMAKE_CURRENT_BINARY_DIR}/jpegDecodeBatched" + --build-generator "${CMAKE_GENERATOR}" + --test-command "jpegdecodebatched" + -i ${ROCM_PATH}/share/rocjpeg/images/ -fmt rgb +) + +add_test( + NAME + jpeg-decode-batch-fmt-rgb-planar + COMMAND + "${CMAKE_CTEST_COMMAND}" + --build-and-test "${ROCM_PATH}/share/rocjpeg/samples/jpegDecodeBatched" + "${CMAKE_CURRENT_BINARY_DIR}/jpegDecodeBatched" + --build-generator "${CMAKE_GENERATOR}" + --test-command "jpegdecodebatched" + -i ${ROCM_PATH}/share/rocjpeg/images/ -fmt rgb_planar +) + +add_test( + NAME + jpeg-decode-batch-crop-fmt-native COMMAND "${CMAKE_CTEST_COMMAND}" --build-and-test "${ROCM_PATH}/share/rocjpeg/samples/jpegDecodeBatched" @@ -217,4 +253,64 @@ add_test( --build-generator "${CMAKE_GENERATOR}" --test-command "jpegdecodebatched" -i ${ROCM_PATH}/share/rocjpeg/images/ -crop 960,540,2880,1620 +) + +add_test( + NAME + jpeg-decode-batch-crop-fmt-yuv-planar + COMMAND + "${CMAKE_CTEST_COMMAND}" + --build-and-test "${ROCM_PATH}/share/rocjpeg/samples/jpegDecodeBatched" + "${CMAKE_CURRENT_BINARY_DIR}/jpegDecodeBatched" + --build-generator "${CMAKE_GENERATOR}" + --test-command "jpegdecodebatched" + -i ${ROCM_PATH}/share/rocjpeg/images/ -fmt yuv_planar -crop 960,540,2880,1620 +) + +add_test( + NAME + jpeg-decode-batch-crop-fmt-y + COMMAND + "${CMAKE_CTEST_COMMAND}" + --build-and-test "${ROCM_PATH}/share/rocjpeg/samples/jpegDecodeBatched" + "${CMAKE_CURRENT_BINARY_DIR}/jpegDecodeBatched" + --build-generator "${CMAKE_GENERATOR}" + --test-command "jpegdecodebatched" + -i ${ROCM_PATH}/share/rocjpeg/images/ -fmt y -crop 960,540,2880,1620 +) + +add_test( + NAME + jpeg-decode-batch-crop-fmt-rgb + COMMAND + "${CMAKE_CTEST_COMMAND}" + --build-and-test "${ROCM_PATH}/share/rocjpeg/samples/jpegDecodeBatched" + "${CMAKE_CURRENT_BINARY_DIR}/jpegDecodeBatched" + --build-generator "${CMAKE_GENERATOR}" + --test-command "jpegdecodebatched" + -i ${ROCM_PATH}/share/rocjpeg/images/ -fmt rgb -crop 960,540,2880,1620 +) + +add_test( + NAME + jpeg-decode-batch-crop-fmt-rgb-planar + COMMAND + "${CMAKE_CTEST_COMMAND}" + --build-and-test "${ROCM_PATH}/share/rocjpeg/samples/jpegDecodeBatched" + "${CMAKE_CURRENT_BINARY_DIR}/jpegDecodeBatched" + --build-generator "${CMAKE_GENERATOR}" + --test-command "jpegdecodebatched" + -i ${ROCM_PATH}/share/rocjpeg/images/ -fmt rgb_planar -crop 960,540,2880,1620 +) + +add_test( + NAME + jpeg-decode-perf-fmt-native + COMMAND + "${CMAKE_CTEST_COMMAND}" + --build-and-test "${ROCM_PATH}/share/rocjpeg/samples/jpegDecodePerf" + "${CMAKE_CURRENT_BINARY_DIR}/jpegDecodePerf" + --build-generator "${CMAKE_GENERATOR}" + --test-command "jpegdecodeperf" + -i ${ROCM_PATH}/share/rocjpeg/images/ ) \ No newline at end of file