Updates to successful openvx conformance and added conformance test suite as submodule (#3)

* Passing all base openvx conformance tests

* Adding openvx-cts test suite repo as submodule

* Adding workflow to run openvx conformance tests in CI

* Enabling the NN_16 conformance test

Author: amikhail48

.github/workflows/ci.yml

@@ -39,6 +39,10 @@ jobs:
       - name: OpenVX Integration Test
         run: VX_CL_SOURCE_DIR=$GITHUB_WORKSPACE/kernels/opencl bazel run //tests:vx_test
 
+      # Run OpenVX Conformance tests
+      - name: OpenVX Conformance Tests
+        run: ./test_vx_conformance.sh
+
       # Test the project
       # - name: Run Bazel tests
       #   run: |

.gitignore

@@ -1,6 +1,9 @@
 # vscode files
 **/.vscode
 
+# dev container files
+**/.devcontainer/**
+
 # Prerequisites
 *.d
 

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "cts"]
+	path = cts
+	url = https://github.com/amikhail48/OpenVX-cts.git

cts

@@ -93,12 +93,11 @@ Context::~Context()
     vx_uint32 r;
     for (r = 0; r < VX_INT_MAX_REF; r++)
     {
-        vx_reference ref = reftable[r];
-        if (ref)
+        if (reftable[r])
         {
             // VX_PRINT(VX_ZONE_INFO, "ref removed:\n");
             // Reference::printReference(ref); // For debugging
-            delete reftable[r];
+            // delete reftable[r];
             reftable[r] = nullptr;
             num_references--;
         }
@@ -358,11 +357,11 @@ vx_bool Context::removeReference(vx_reference& ref)
         if (reftable[r] &&
             reftable[r] == ref)
         {
-            if (0u == ref->totalReferenceCount())
+            // if (0u == ref->totalReferenceCount())
             {
                 VX_PRINT(VX_ZONE_LOG, "Removing:\n");
                 Reference::printReference(ref); // For debugging
-                delete reftable[r];
+                // delete reftable[r];
                 reftable[r] = nullptr;
             }
             ref = nullptr;

framework/src/vx_context.cpp

@@ -15,7 +15,9 @@
  */
 
 #include <VX/vx.h>
-#include <vx_debug.h>
+
+#include "vx_debug.h"
+#include "vx_internal.h"
 
 #include <cstdarg>
 #include <cstdio>
@@ -237,6 +239,8 @@ const char* ownGetObjectTypeName(vx_enum type) {
         name = "NODE"; break;
     case VX_TYPE_KERNEL:
         name = "KERNEL"; break;
+    case VX_TYPE_TARGET:
+        name = "TARGET"; break;
     case VX_TYPE_PARAMETER:
         name = "PARAMETER"; break;
     case VX_TYPE_DELAY:

framework/src/vx_debug.cpp

@@ -508,7 +508,7 @@ void PoolingKernelImpl(
         if (!max_pooling)
         {
             //result = conversion_24_8(result / (int16_t)(size_x * size_y));
-            result = static_cast<int_fast32_t>(CLAMP(result / static_cast<vx_int32>(size_x * size_y), getMinValue(fmt), getMaxValue(fmt)));
+            result = static_cast<int32_t>(CLAMP(result / static_cast<int32_t>(size_x * size_y), getMinValue(fmt), getMaxValue(fmt)));
         }
 
         const size_t output_byte_offset =
@@ -804,10 +804,10 @@ void ROIPoolingKernelImpl(
         const int dy_after = ((y + 1) * roi_h + (out_h - 1)) / out_h;
 
         // clamp in case roi_x or roi_y were unreasonable
-        const int x_begin = static_cast<int>(CLAMP(roi_x0 + dx_begin, 0, static_cast<int>(data_w)));
-        const int y_begin = static_cast<int>(CLAMP(roi_y0 + dy_begin, 0, static_cast<int>(data_h)));
-        const int x_after = static_cast<int>(CLAMP(roi_x0 + dx_after, 0, static_cast<int>(data_w)));
-        const int y_after = static_cast<int>(CLAMP(roi_y0 + dy_after, 0, static_cast<int>(data_h)));
+        const int x_begin = static_cast<int>(CLAMP(static_cast<size_t>(roi_x0 + dx_begin), 0, data_w));
+        const int y_begin = static_cast<int>(CLAMP(static_cast<size_t>(roi_y0 + dy_begin), 0, data_h));
+        const int x_after = static_cast<int>(CLAMP(static_cast<size_t>(roi_x0 + dx_after), 0, data_w));
+        const int y_after = static_cast<int>(CLAMP(static_cast<size_t>(roi_y0 + dy_after), 0, data_h));
 
         const char * data_b_ptr = (char*)in0_ptr + in0.strides[3] * b + in0.strides[2] * c;
 

kernels/c_model/c_khr_nn.cpp

@@ -0,0 +1,39 @@
+#! /bin/bash
+
+mkdir -p cts/build
+
+# Set the environment variables
+export OPENVX_DIR=$PWD
+export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$OPENVX_DIR/bazel-bin:$OPENVX_DIR/bazel-bin/vxu:$OPENVX_DIR/bazel-bin/targets/c_model:$OPENVX_DIR/bazel-bin/targets/extras:$OPENVX_DIR/bazel-bin/targets/debug:$OPENVX_DIR/bazel-bin/targets/opencl:$OPENVX_DIR/cts/build/lib/
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPENVX_DIR/bazel-bin:$OPENVX_DIR/bazel-bin/vxu:$OPENVX_DIR/bazel-bin/targets/c_model:$OPENVX_DIR/bazel-bin/targets/extras:$OPENVX_DIR/bazel-bin/targets/debug:$OPENVX_DIR/bazel-bin/targets/opencl:$OPENVX_DIR/cts/build/lib/
+export VX_TEST_DATA_PATH=$HOME/Projects/OpenVX-sample-impl/cts/test_data/
+export VX_CL_SOURCE_DIR=$OPENVX_DIR/kernels/opencl/
+
+# Build the conformance test suite
+cd cts/build
+cmake \
+-DCMAKE_BUILD_TYPE=Debug \
+-DOPENVX_INCLUDES=$OPENVX_DIR/include \
+-DOPENVX_LIBRARIES=$OPENVX_DIR/bazel-bin/libopenvx.dylib\;$OPENVX_DIR/bazel-bin/vxu/libvxu.dylib\;pthread\;dl\;m \
+-DOPENVX_USE_USER_DATA_OBJECT=ON \
+-DOPENVX_USE_IX=ON \
+-DOPENVX_USE_U1=ON \
+-DOPENVX_USE_NN=ON \
+-DOPENVX_USE_NN_16=ON \
+-DOPENVX_CONFORMANCE_NNEF_IMPORT=ON \
+-DOPENVX_CONFORMANCE_NEURAL_NETWORKS=ON \
+..
+
+# -DOPENVX_CONFORMANCE_VISION=ON \
+# -DOPENVX_USE_ENHANCED_VISION=ON \
+# -DOPENVX_USE_PIPELINING=ON \
+# -DOPENVX_USE_STREAMING=ON \
+
+cmake --build .
+
+# Run the conformance test suite
+./bin/vx_test_conformance
+
+# Clean up
+cd ../../
+rm -rf cts/build