Test - Updates (#1435)

* Test - Updates * AMDGPU_TARGETS - Updates * CTest - Updates * CTest - Fix * CMakeLists - Revert GFX updates
ROCm · Oct 8, 2024 · 638ecd5 · 638ecd5
1 parent d2853a4
commit 638ecd5
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 51 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -66,62 +66,68 @@ else()
   find_package(MIVISIONX REQUIRED)
 endif()
 
-# vx_core test
+# 1 - vx_core test
 add_test(NAME vx_core_test
-COMMAND ${RUNVX_EXECUTABLE}
--dump-profile file ${CMAKE_CURRENT_SOURCE_DIR}/vision_tests/gdfs/00_absDiff_test.gdf
-WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+          COMMAND ${RUNVX_EXECUTABLE}
+          -dump-profile file ${CMAKE_CURRENT_SOURCE_DIR}/vision_tests/gdfs/00_absDiff_test.gdf
+          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
 
-# vx_amd_media Tests
+# 2 - vx_amd_media Tests
 if(VX_AMD_MEDIA_LIBRARY)
   add_test(NAME vx_amd_media_test
             COMMAND ${RUNVX_EXECUTABLE}
             -dump-profile file ${CMAKE_CURRENT_SOURCE_DIR}/amd_media_tests/gdf/decoder_test.gdf
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
 endif(VX_AMD_MEDIA_LIBRARY)
 
-# vx_amd_migraphx Tests -- TBD: Disabled (ref:github issue 1410)
+# 3 - vx_amd_migraphx Tests -- TBD: Disabled (ref:github issue 1410)
 if(VX_AMD_MIGRAPHX_LIBRARY AND 0)
   add_test(NAME vx_amd_migraphx_test
             COMMAND ${RUNVX_EXECUTABLE}
             -dump-profile file ${CMAKE_CURRENT_SOURCE_DIR}/amd_migraphx_tests/gdf/vx_migraphx_test.gdf
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
 endif(VX_AMD_MIGRAPHX_LIBRARY AND 0)
 
-# VX_NN_LIBRARY Tests
+# 4 - VX_NN_LIBRARY Tests
 if(VX_NN_LIBRARY)
   add_test(NAME vx_nn_test
             COMMAND ${RUNVX_EXECUTABLE}
             -dump-profile file ${CMAKE_CURRENT_SOURCE_DIR}/neural_network_tests/gdf/test_vx_nn.gdf
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
 endif(VX_NN_LIBRARY)
 
-# vx_opencv Tests
+# 5 - vx_opencv Tests
 if(VX_OPENCV_LIBRARY)
   add_test(NAME vx_opencv_test
             COMMAND ${RUNVX_EXECUTABLE}
             -dump-profile file ${CMAKE_CURRENT_SOURCE_DIR}/amd_opencv_tests/gdfs/absdiff_test.gdf
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
 endif(VX_OPENCV_LIBRARY)
 
-# vx_rpp Tests
+# 6 - vx_rpp Tests
 if(VX_RPP_LIBRARY)
   add_test(NAME vx_rpp_test
             COMMAND ${RUNVX_EXECUTABLE}
             -dump-profile file ${CMAKE_CURRENT_SOURCE_DIR}/vx_rpp_tests/gdf/test_vx_rpp.gdf
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
 endif(VX_RPP_LIBRARY)
 
-# runvx Tests
+# 7 - runvx Tests
 if(RUNVX_EXECUTABLE)
   add_test(NAME runvx_test
             COMMAND ${RUNVX_EXECUTABLE}
             -dump-profile file ${CMAKE_CURRENT_SOURCE_DIR}/vision_tests/gdfs/00_harrisCorners_test.gdf
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
 endif(RUNVX_EXECUTABLE)
 
-# OpenVX default tests - Vision Nodes
-# canny
+# 8 - canny - vision graph
 add_test(
   NAME
     openvx_canny
@@ -133,7 +139,7 @@ add_test(
             --test-command "openvx_canny"
 )
 
-# channel extract
+# 9 - channel extract - vision graph
 add_test(
   NAME
     openvx_channel_extract
@@ -145,7 +151,7 @@ add_test(
             --test-command "openvx_channel_extract"
 )
 
-# color convert
+# 10 - color convert - vision graph
 add_test(
   NAME
     openvx_color_convert
@@ -157,100 +163,122 @@ add_test(
             --test-command "openvx_color_convert"
 )
 
-# OpenVX CPU Tests
+# 11 - canny - vision graph force to CPU
 add_test(NAME openvx_canny_CPU 
               COMMAND openvx_canny 
-              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/canny)
+              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/canny
+)
 set_property(TEST openvx_canny_CPU PROPERTY ENVIRONMENT "AGO_DEFAULT_TARGET=CPU")
+# 12 - channel extract - vision graph force to CPU
 add_test(NAME openvx_channel_extract_CPU 
               COMMAND openvx_channel_extract 
-              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/channel_extract)
+              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/channel_extract
+)
 set_property(TEST openvx_channel_extract_CPU PROPERTY ENVIRONMENT "AGO_DEFAULT_TARGET=CPU")
+# 13 - color convert - vision graph force to CPU
 add_test(NAME openvx_color_convert_CPU 
               COMMAND openvx_color_convert 
-              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/color_convert)
+              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/color_convert
+)
 set_property(TEST openvx_color_convert_CPU PROPERTY ENVIRONMENT "AGO_DEFAULT_TARGET=CPU")
 
 # OpenVX Tests
 if(Python3_FOUND)
+  # 14 - vision node group tests on CPU
   add_test(NAME openvx_tests_runVisionPython_CPU 
             COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/vision_tests/runVisionTests.py
             --runvx_directory ${ROCM_PATH}/bin --num_frames 10 --functionality no
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+  )
 endif(Python3_FOUND)
 
 # HIP Tests
 if("${MIVISIONX_BACKEND}" STREQUAL "HIP")
-  # API tests
+  # 15 - canny - vision graph force to GPU
   add_test(NAME openvx_canny_GPU 
-              COMMAND openvx_canny 
-              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/canny)
+            COMMAND openvx_canny 
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/canny
+  )
   set_property(TEST openvx_canny_GPU PROPERTY ENVIRONMENT "AGO_DEFAULT_TARGET=GPU")
+  # 16 - channel extract - vision graph force to GPU
   add_test(NAME openvx_channel_extract_GPU 
               COMMAND openvx_channel_extract 
-              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/channel_extract)
+              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/channel_extract
+  )
   set_property(TEST openvx_channel_extract_CPU PROPERTY ENVIRONMENT "AGO_DEFAULT_TARGET=GPU")
+  # 17 - color convert - vision graph force to GPU
   add_test(NAME openvx_color_convert_GPU 
               COMMAND openvx_color_convert 
-              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/color_convert)
+              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/color_convert
+  )
   set_property(TEST openvx_color_convert_GPU PROPERTY ENVIRONMENT "AGO_DEFAULT_TARGET=GPU")
 
   # OpenVX Tests
   if(Python3_FOUND)
+    # 18 - group vision nodes on GPU
     add_test(NAME openvx_tests_runVisionPython_GPU 
           COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/vision_tests/runVisionTests.py
           --runvx_directory ${ROCM_PATH}/bin --num_frames 10 --functionality no --hardware_mode GPU --backend_type ${MIVISIONX_BACKEND}
-          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
   endif(Python3_FOUND)
 
   # Neural Network tests
   if(VX_NN_LIBRARY AND Python3_FOUND)
-    # caffe2nnir2openvx No Fuse flow
+    # 19 - caffe2nnir2openvx No Fuse flow
     add_test(NAME caffe2nnir2openvx_no_fuse
           COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/neural_network_tests/runNeuralNetworkTests.py
           --profiler_mode 1
-          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    # caffe2nnir2openvx Fuse flow
+          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+    # 20 - caffe2nnir2openvx Fuse flow
     add_test(NAME caffe2nnir2openvx_fuse 
           COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/neural_network_tests/runNeuralNetworkTests.py
           --profiler_mode 2 --reinstall off
-          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    # caffe2nnir2openvx FP16 flow
+          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+    # 21 - caffe2nnir2openvx FP16 flow
     add_test(NAME caffe2nnir2openvx_fp16
           COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/neural_network_tests/runNeuralNetworkTests.py
           --profiler_mode 3 --reinstall off
-          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    # onnx2nnir2openvx No Fuse flow
+          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+    # 22 - onnx2nnir2openvx No Fuse flow
     add_test(NAME onnx2nnir2openvxx_no_fuse 
           COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/neural_network_tests/runNeuralNetworkTests.py
           --profiler_mode 4 --reinstall off
-          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})    
-    # onnx2nnir2openvx Fuse flow
+          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )    
+    # 23 - onnx2nnir2openvx Fuse flow
     add_test(NAME onnx2nnir2openvxx_fuse 
           COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/neural_network_tests/runNeuralNetworkTests.py
           --profiler_mode 5 --reinstall off
-          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    # onnx2nnir2openvx FP16 flow
+          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+    # 24 - onnx2nnir2openvx FP16 flow
     add_test(NAME onnx2nnir2openvxx_fp16 
           COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/neural_network_tests/runNeuralNetworkTests.py
           --profiler_mode 6 --reinstall off
-          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    # nnef2nnir2openvx No Fuse flow
+          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+    # 25 - nnef2nnir2openvx No Fuse flow
     add_test(NAME nnef2nnir2openvxx_no_fuse 
           COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/neural_network_tests/runNeuralNetworkTests.py
           --profiler_mode 7 --reinstall off
-          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})    
-    # nnef2nnir2openvx Fuse flow
+          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )    
+    # 26 - nnef2nnir2openvx Fuse flow
     add_test(NAME nnef2nnir2openvxx_fuse 
           COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/neural_network_tests/runNeuralNetworkTests.py
           --profiler_mode 8 --reinstall off
-          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    # nnef2nnir2openvx FP16 flow
+          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+    # 27 - nnef2nnir2openvx FP16 flow
     add_test(NAME nnef2nnir2openvxx_fp16 
           COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/neural_network_tests/runNeuralNetworkTests.py
           --profiler_mode 9 --reinstall off
-          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
+          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
   endif(VX_NN_LIBRARY AND Python3_FOUND)
 endif("${MIVISIONX_BACKEND}" STREQUAL "HIP")
 

diff --git a/tests/openvx_api_tests/canny/canny.cpp b/tests/openvx_api_tests/canny/canny.cpp
@@ -118,11 +118,11 @@ int main(int argc, char **argv)
     elapsed_seconds = (end-start)/100;
     std::cout << "STATUS: vxProcessGraph() took " << (elapsed_seconds.count()*1000.0f) << "msec (AVG)\n";
 
-    ERROR_CHECK_STATUS(vxReleaseGraph(&graph));
     ERROR_CHECK_STATUS(vxReleaseImage(&yuv_image));
     ERROR_CHECK_STATUS(vxReleaseImage(&luma_image));
     ERROR_CHECK_STATUS(vxReleaseImage(&input_rgb_image));
     ERROR_CHECK_STATUS(vxReleaseImage(&output_filtered_image));
+    ERROR_CHECK_STATUS(vxReleaseGraph(&graph));
     ERROR_CHECK_STATUS(vxReleaseContext(&context));
 
     return 0;

diff --git a/tests/vision_tests/gdfs/00_canny.gdf b/tests/vision_tests/gdfs/00_canny.gdf
@@ -0,0 +1,14 @@
+# create input and output images
+data input  = image:480,360,RGB2
+data output = image:480,360,U008
+
+# compute luma image channel from input RGB image
+data yuv  = image-virtual:0,0,IYUV
+data luma = image-virtual:0,0,U008
+node org.khronos.openvx.color_convert input yuv
+node org.khronos.openvx.channel_extract yuv !CHANNEL_Y luma
+
+# compute edges in luma image using Canny edge detector
+data hyst = threshold:RANGE,U008,U008:INIT,80,100
+data gradient_size = scalar:INT32,3
+node org.khronos.openvx.canny_edge_detector luma hyst gradient_size !NORM_L1 output