Video file location change for rocDecode (#353)
* Video file location change for rocDecode
* Formatting
* Changed rocJPEG images directory not found to a warning as well
* Minor name update
* Fix rocJPEG disable variable
[ROCm/rocprofiler-sdk commit: c4716afd1c]
Este commit está contenido en:
@@ -18,12 +18,16 @@ else()
|
|||||||
set(PRELOAD_ENV "LD_PRELOAD=$<TARGET_FILE:rocprofiler-sdk-json-tool>")
|
set(PRELOAD_ENV "LD_PRELOAD=$<TARGET_FILE:rocprofiler-sdk-json-tool>")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(ROCDECODE_VIDEO_FILE
|
file(GLOB_RECURSE ROCDECODE_VIDEO_FILE
|
||||||
"${rocDecode_ROOT_DIR}/share/rocdecode/video/AMD_driving_virtual_20-H265.265")
|
"${rocDecode_ROOT_DIR}/share/rocdecode/video/*AMD_driving_virtual_20-H265.265")
|
||||||
if(TARGET rocdecode-demo AND NOT EXISTS "${ROCDECODE_VIDEO_FILE}")
|
if(TARGET rocdecode-demo AND NOT EXISTS "${ROCDECODE_VIDEO_FILE}")
|
||||||
message(
|
message(
|
||||||
FATAL_ERROR
|
WARNING "Unable to find video file for rocdecode tests: ${ROCDECODE_VIDEO_FILE}")
|
||||||
"Unable to find video file for rocdecode tests: ${ROCDECODE_VIDEO_FILE}")
|
set(IS_DISABLED ON)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(NOT TARGET rocdecode-demo)
|
||||||
|
set(IS_DISABLED ON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_test(
|
add_test(
|
||||||
|
|||||||
@@ -38,8 +38,12 @@ set(rocjpeg-tracing-env "${PRELOAD_ENV}")
|
|||||||
set(rocJPEG_IMAGE_DIR "${rocJPEG_ROOT_DIR}/share/rocjpeg/images")
|
set(rocJPEG_IMAGE_DIR "${rocJPEG_ROOT_DIR}/share/rocjpeg/images")
|
||||||
if(TARGET rocjpeg-demo AND NOT EXISTS "${rocJPEG_IMAGE_DIR}")
|
if(TARGET rocjpeg-demo AND NOT EXISTS "${rocJPEG_IMAGE_DIR}")
|
||||||
message(
|
message(
|
||||||
FATAL_ERROR
|
WARNING "Unable to find image directory for rocjpeg tests: ${rocJPEG_IMAGE_DIR}")
|
||||||
"Unable to find image directory for rocjpeg tests: ${rocJPEG_IMAGE_DIR}")
|
set(IS_DISABLED ON)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(NOT TARGET rocjpeg-demo)
|
||||||
|
set(IS_DISABLED ON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_test(
|
add_test(
|
||||||
@@ -65,7 +69,7 @@ set_tests_properties(
|
|||||||
FAIL_REGULAR_EXPRESSION
|
FAIL_REGULAR_EXPRESSION
|
||||||
"${ROCPROFILER_DEFAULT_FAIL_REGEX}"
|
"${ROCPROFILER_DEFAULT_FAIL_REGEX}"
|
||||||
DISABLED
|
DISABLED
|
||||||
$<NOT:$<TARGET_EXISTS:rocjpeg-demo>>)
|
"${IS_DISABLED}")
|
||||||
|
|
||||||
# copy to binary directory
|
# copy to binary directory
|
||||||
rocprofiler_configure_pytest_files(COPY validate.py conftest.py CONFIG pytest.ini)
|
rocprofiler_configure_pytest_files(COPY validate.py conftest.py CONFIG pytest.ini)
|
||||||
@@ -85,4 +89,4 @@ set_tests_properties(
|
|||||||
FAIL_REGULAR_EXPRESSION
|
FAIL_REGULAR_EXPRESSION
|
||||||
"${ROCPROFILER_DEFAULT_FAIL_REGEX}"
|
"${ROCPROFILER_DEFAULT_FAIL_REGEX}"
|
||||||
DISABLED
|
DISABLED
|
||||||
$<NOT:$<TARGET_EXISTS:rocjpeg-demo>>)
|
"${IS_DISABLED}")
|
||||||
|
|||||||
@@ -18,12 +18,16 @@ string(REPLACE "LD_PRELOAD=" "ROCPROF_PRELOAD=" PRELOAD_ENV
|
|||||||
|
|
||||||
set(rocdecode-tracing-env "${PRELOAD_ENV}")
|
set(rocdecode-tracing-env "${PRELOAD_ENV}")
|
||||||
|
|
||||||
set(ROCDECODE_VIDEO_FILE
|
file(GLOB_RECURSE ROCDECODE_VIDEO_FILE
|
||||||
"${rocDecode_ROOT_DIR}/share/rocdecode/video/AMD_driving_virtual_20-H265.265")
|
"${rocDecode_ROOT_DIR}/share/rocdecode/video/*AMD_driving_virtual_20-H265.265")
|
||||||
if(TARGET rocdecode-demo AND NOT EXISTS "${ROCDECODE_VIDEO_FILE}")
|
if(TARGET rocdecode-demo AND NOT EXISTS "${ROCDECODE_VIDEO_FILE}")
|
||||||
message(
|
message(
|
||||||
FATAL_ERROR
|
WARNING "Unable to find video file for rocdecode tests: ${ROCDECODE_VIDEO_FILE}")
|
||||||
"Unable to find video file for rocdecode tests: ${ROCDECODE_VIDEO_FILE}")
|
set(IS_DISABLED ON)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(NOT TARGET rocdecode-demo)
|
||||||
|
set(IS_DISABLED ON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_test(
|
add_test(
|
||||||
@@ -46,7 +50,7 @@ set_tests_properties(
|
|||||||
FAIL_REGULAR_EXPRESSION
|
FAIL_REGULAR_EXPRESSION
|
||||||
"threw an exception"
|
"threw an exception"
|
||||||
DISABLED
|
DISABLED
|
||||||
$<NOT:$<TARGET_EXISTS:rocdecode-demo>>)
|
"${IS_DISABLED}")
|
||||||
|
|
||||||
add_test(
|
add_test(
|
||||||
NAME rocprofv3-test-rocdecode-tracing-validate
|
NAME rocprofv3-test-rocdecode-tracing-validate
|
||||||
@@ -68,4 +72,4 @@ set_tests_properties(
|
|||||||
FAIL_REGULAR_EXPRESSION
|
FAIL_REGULAR_EXPRESSION
|
||||||
"AssertionError"
|
"AssertionError"
|
||||||
DISABLED
|
DISABLED
|
||||||
$<NOT:$<TARGET_EXISTS:rocdecode-demo>>)
|
"${IS_DISABLED}")
|
||||||
|
|||||||
@@ -38,11 +38,15 @@ string(REPLACE "LD_PRELOAD=" "ROCPROF_PRELOAD=" PRELOAD_ENV
|
|||||||
|
|
||||||
set(rocjpeg-tracing-env "${PRELOAD_ENV}")
|
set(rocjpeg-tracing-env "${PRELOAD_ENV}")
|
||||||
|
|
||||||
set(ROCJPEG_IMAGE_DIR "${ROCM_PATH}/share/rocjpeg/images")
|
set(rocJPEG_IMAGE_DIR "${ROCM_PATH}/share/rocjpeg/images")
|
||||||
if(TARGET rocjpeg-demo AND NOT EXISTS "${ROCJPEG_IMAGE_DIR}")
|
if(TARGET rocjpeg-demo AND NOT EXISTS "${rocJPEG_IMAGE_DIR}")
|
||||||
message(
|
message(
|
||||||
FATAL_ERROR
|
WARNING "Unable to find image directory for rocjpeg tests: ${rocJPEG_IMAGE_DIR}")
|
||||||
"Unable to find image directory for rocjpeg tests: ${ROCJPEG_IMAGE_DIR}")
|
set(IS_DISABLED ON)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(NOT TARGET rocjpeg-demo)
|
||||||
|
set(IS_DISABLED ON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# CI Sanitizer run gives the following error: No target "rocjpeg-demo" Adding if-statement
|
# CI Sanitizer run gives the following error: No target "rocjpeg-demo" Adding if-statement
|
||||||
@@ -54,7 +58,7 @@ add_test(
|
|||||||
${CMAKE_CURRENT_BINARY_DIR}/%tag%-trace -o out --output-format json csv
|
${CMAKE_CURRENT_BINARY_DIR}/%tag%-trace -o out --output-format json csv
|
||||||
--log-level env --
|
--log-level env --
|
||||||
$<IF:$<TARGET_EXISTS:rocjpeg-demo>,$<$<TARGET_EXISTS:rocjpeg-demo>:$<TARGET_FILE:rocjpeg-demo>>,rocjpeg-demo>
|
$<IF:$<TARGET_EXISTS:rocjpeg-demo>,$<$<TARGET_EXISTS:rocjpeg-demo>:$<TARGET_FILE:rocjpeg-demo>>,rocjpeg-demo>
|
||||||
-i ${ROCJPEG_IMAGE_DIR})
|
-i ${rocJPEG_IMAGE_DIR})
|
||||||
|
|
||||||
set_tests_properties(
|
set_tests_properties(
|
||||||
rocprofv3-test-rocjpeg-tracing-execute
|
rocprofv3-test-rocjpeg-tracing-execute
|
||||||
@@ -67,7 +71,7 @@ set_tests_properties(
|
|||||||
FAIL_REGULAR_EXPRESSION
|
FAIL_REGULAR_EXPRESSION
|
||||||
"threw an exception"
|
"threw an exception"
|
||||||
DISABLED
|
DISABLED
|
||||||
$<NOT:$<TARGET_EXISTS:rocjpeg-demo>>)
|
"${IS_DISABLED}")
|
||||||
|
|
||||||
add_test(
|
add_test(
|
||||||
NAME rocprofv3-test-rocjpeg-tracing-validate
|
NAME rocprofv3-test-rocjpeg-tracing-validate
|
||||||
@@ -89,4 +93,4 @@ set_tests_properties(
|
|||||||
FAIL_REGULAR_EXPRESSION
|
FAIL_REGULAR_EXPRESSION
|
||||||
"AssertionError"
|
"AssertionError"
|
||||||
DISABLED
|
DISABLED
|
||||||
$<NOT:$<TARGET_EXISTS:rocjpeg-demo>>)
|
"${IS_DISABLED}")
|
||||||
|
|||||||
Referencia en una nueva incidencia
Block a user