Fix CI: Remove merge conflict markers, remove OpenCV dependency, enable full vision conformance tests (~6000 tests)

Author: Kiriti

.github/workflows/openvx-conformance.yml

@@ -50,13 +50,6 @@ jobs:
           cmake \
           ninja-build \
           libgtest-dev \
-<<<<<<< HEAD
-          libjpeg-dev \
-          libpng-dev \
-          libtiff-dev \
-=======
-          libopencv-dev \
->>>>>>> origin/master
           python3 \
           python3-pip
     
@@ -67,7 +60,6 @@ jobs:
         rustc --version
         cargo --version
     
-<<<<<<< HEAD
     - name: Cache Cargo registry
       uses: actions/cache@v4
       with:
@@ -102,8 +94,6 @@ jobs:
           ${{ runner.os }}-cts-build-${{ hashFiles('OpenVX-cts/CMakeLists.txt') }}-
           ${{ runner.os }}-cts-build-
     
-=======
->>>>>>> origin/master
     - name: Build rustVX
       run: |
         source $HOME/.cargo/env
@@ -139,7 +129,6 @@ jobs:
           cp -r ../include/* include/ 2>/dev/null || true
         fi
         
-<<<<<<< HEAD
         # Ensure clean build directory if CMake configuration changed
         if [ -f "build/CMakeCache.txt" ]; then
           echo "Using cached CTS build"
@@ -149,9 +138,6 @@ jobs:
           mkdir -p build
         fi
         
-=======
-        mkdir -p build
->>>>>>> origin/master
         cd build
         
         # Configure with verbose output and proper include paths
@@ -163,11 +149,7 @@ jobs:
           -DOPENVX_INCLUDES="${{ github.workspace }}/include;${{ github.workspace }}/OpenVX-cts/include" \
           -DOPENVX_LIBRARIES="${{ github.workspace }}/target/release/libopenvx_core.so;${{ github.workspace }}/target/release/libopenvx_ffi.so;m" \
           -DOPENVX_CONFORMANCE_VISION=ON \
-<<<<<<< HEAD
           -DOPENVX_CONFORMANCE_NEURAL_NETWORKS=OFF \
-          -DOPENVX_CONFORMANCE_OTHER=OFF \
-=======
->>>>>>> origin/master
           2>&1 || {
           echo "CMAKE FAILED!"
           echo "CMake output:"
@@ -222,13 +204,8 @@ jobs:
         # Create output directory for results
         mkdir -p ${{ github.workspace }}/test-results
         
-<<<<<<< HEAD
-        # Run full vision conformance tests
+        # Run full vision conformance tests (~6000 tests)
         timeout 600 ./bin/vx_test_conformance 2>&1 | tee ${{ github.workspace }}/test-results/vision_test_output.txt || true
-=======
-        # Run tests
-        timeout 300 ./bin/vx_test_conformance 2>&1 | tee ${{ github.workspace }}/test-results/vision_test_output.txt || true
->>>>>>> origin/master
         
         echo "Test execution completed."
     
@@ -254,41 +231,31 @@ jobs:
         FAIL_COUNT=$(grep -c "\[ !FAILED! \]" "$OUTPUT_FILE" 2>/dev/null || echo "0")
         echo "Tests failed: $FAIL_COUNT"
         
-<<<<<<< HEAD
         # Count skipped tests
         SKIP_COUNT=$(grep -c "\[  SKIP  \]" "$OUTPUT_FILE" 2>/dev/null || echo "0")
         echo "Tests skipped: $SKIP_COUNT"
         
-=======
->>>>>>> origin/master
         # Extract test summary
         echo "========================================" | tee ${{ github.workspace }}/test-results/summary.txt
         echo "Vision Conformance Test Summary" | tee -a ${{ github.workspace }}/test-results/summary.txt
         echo "========================================" | tee -a ${{ github.workspace }}/test-results/summary.txt
         echo "Passed: $PASS_COUNT" | tee -a ${{ github.workspace }}/test-results/summary.txt
         echo "Failed: $FAIL_COUNT" | tee -a ${{ github.workspace }}/test-results/summary.txt
-<<<<<<< HEAD
         echo "Skipped: $SKIP_COUNT" | tee -a ${{ github.workspace }}/test-results/summary.txt
         echo "Total: $((PASS_COUNT + FAIL_COUNT + SKIP_COUNT))" | tee -a ${{ github.workspace }}/test-results/summary.txt
-=======
-        echo "Total: $((PASS_COUNT + FAIL_COUNT))" | tee -a ${{ github.workspace }}/test-results/summary.txt
->>>>>>> origin/master
         
         if [ "$FAIL_COUNT" -eq 0 ] && [ "$PASS_COUNT" -gt 0 ]; then
           echo "Status: ✅ ALL TESTS PASSED" | tee -a ${{ github.workspace }}/test-results/summary.txt
         elif [ "$PASS_COUNT" -gt 0 ]; then
-          echo "Status: ⚠️ PARTIAL SUCCESS ($PASS_COUNT/$((PASS_COUNT + FAIL_COUNT)))" | tee -a ${{ github.workspace }}/test-results/summary.txt
+          echo "Status: ⚠️ PARTIAL SUCCESS ($PASS_COUNT/$((PASS_COUNT + FAIL_COUNT + SKIP_COUNT)))" | tee -a ${{ github.workspace }}/test-results/summary.txt
         else
           echo "Status: ❌ NO TESTS PASSED" | tee -a ${{ github.workspace }}/test-results/summary.txt
         fi
         
         # Set outputs for GitHub Actions summary
         echo "pass_count=$PASS_COUNT" >> $GITHUB_OUTPUT
         echo "fail_count=$FAIL_COUNT" >> $GITHUB_OUTPUT
-<<<<<<< HEAD
         echo "skip_count=$SKIP_COUNT" >> $GITHUB_OUTPUT
-=======
->>>>>>> origin/master
     
     - name: Upload test results
       uses: actions/upload-artifact@v4
@@ -314,15 +281,8 @@ jobs:
         source $HOME/.cargo/env
         echo "- **Rust Version:** $(rustc --version)" >> $GITHUB_STEP_SUMMARY
         echo "- **Build Type:** Release" >> $GITHUB_STEP_SUMMARY
-<<<<<<< HEAD
         echo "- **CTS Build:** OpenVX Conformance Test Suite (Vision Only)" >> $GITHUB_STEP_SUMMARY
         echo "- **Test Suite:** Full Vision Conformance (~6000 tests)" >> $GITHUB_STEP_SUMMARY
         
         echo "" >> $GITHUB_STEP_SUMMARY
         echo "📥 **Download full logs:** See Artifacts section above" >> $GITHUB_STEP_SUMMARY
-=======
-        echo "- **CTS Build:** OpenVX Conformance Test Suite" >> $GITHUB_STEP_SUMMARY
-        
-        echo "" >> $GITHUB_STEP_SUMMARY
-        echo "📥 **Download full logs:** See Artifacts section above" >> $GITHUB_STEP_SUMMARY
->>>>>>> origin/master