Update ci.yml

Author: Semyon1104

.github/workflows/ci.yml

@@ -29,54 +29,36 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
-    - name: Set binary paths
-      id: set_binaries
-      run: |
-        echo "ACC_BINARY=build/bin/ACC" >> $GITHUB_OUTPUT
     - name: Setup ccache
       uses: hendrikmuhs/ccache-action@v1.2
       with:
         key: ccache-${{ github.job }}-${{ matrix.build_type }}
         max-size: 2G
     - name: Build
       run: |
-            cmake -S . -B build -G Ninja \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
-            -DOPENCV_PATH=build/3rdparty/opencv_build \
-            ${{ matrix.stats && '-DENABLE_STATISTIC_TENSORS=ON' || '' }} \
-            ${{ matrix.stats && '-DENABLE_STATISTIC_TIME=ON' || '' }} \
-            ${{ matrix.stats && '-DENABLE_STATISTIC_WEIGHTS=ON' || '' }}
-            cmake --build build --parallel
-      env:
-        CTEST_OUTPUT_ON_FAILURE: 1
+        cmake -S . -B build \
+          -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+          -DOPENCV_PATH=build/3rdparty/opencv_build \
+          ${{ matrix.stats && '-DENABLE_STATISTIC_TENSORS=ON' || '' }} \
+          ${{ matrix.stats && '-DENABLE_STATISTIC_TIME=ON' || '' }} \
+          ${{ matrix.stats && '-DENABLE_STATISTIC_WEIGHTS=ON' || '' }}
+        cmake --build build --parallel
     - name: Prepare OpenCV libs
       run: |
-       mkdir -p build/bin/opencv_libs
-       cp -a build/3rdparty/opencv_build/lib/libopencv_* build/bin/opencv_libs/
-       echo "Library permissions after copy:"
-       stat -c "%A %n" build/bin/opencv_libs/libopencv_imgcodecs.so*
-
+        mkdir -p build/bin/opencv_libs
+        cp -a build/3rdparty/opencv_build/lib/libopencv_* build/bin/opencv_libs/
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
-       name: mnist-${{ matrix.build_type }}${{ matrix.stats && '-stats' || '' }}
-       path: |
-        ${{ steps.set_binaries.outputs.ACC_BINARY }}
-        build/bin/opencv_libs/*
-        build/setenv.sh
+        name: mnist-${{ matrix.build_type }}${{ matrix.stats && '-stats' || '' }}
+        path: |
+          build/bin/ACC
+          build/bin/opencv_libs/*
+          build/setenv.sh
     - name: Test
       run: cmake --build build -t test
-      env:
-        CTEST_OUTPUT_ON_FAILURE: 1
-    - name: Test (valgrind)
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y valgrind
-        valgrind cmake --build build -t test
-      env:
-        CTEST_OUTPUT_ON_FAILURE: 1
   build-linux-clang:
     runs-on: ubuntu-latest
     steps:
@@ -92,23 +74,14 @@ jobs:
         key: ccache-${{ github.job }}
     - name: Build
       run: |
-        cmake -S . -B build -G Ninja \
+        cmake -S . -B build \
           -DCMAKE_C_COMPILER_LAUNCHER=ccache \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
           -DCMAKE_C_COMPILER=clang \
           -DCMAKE_CXX_COMPILER=clang++
         cmake --build build --parallel
     - name: Test
       run: cmake --build build -t test
-      env:
-        CTEST_OUTPUT_ON_FAILURE: 1
-    - name: Test (valgrind)
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y valgrind
-        valgrind cmake --build build -t test
-      env:
-        CTEST_OUTPUT_ON_FAILURE: 1
   build-macos:
     runs-on: macos-15
     steps:
@@ -117,37 +90,20 @@ jobs:
         submodules: true
     - name: Install prerequisites
       run: |
-        brew install libomp ninja
+        brew install libomp
         brew link libomp --overwrite --force
     - name: Setup ccache
       uses: hendrikmuhs/ccache-action@v1.2
       with:
         key: ccache-${{ github.job }}
     - name: Build
       run: |
-        OPENMP_PATH=$(brew --prefix libomp)
-        echo "OpenMP path: $OPENMP_PATH"
-        cmake -S . -B build -G Ninja \
+        cmake -S . -B build \
           -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-          -DCMAKE_PREFIX_PATH=$OPENMP_PATH \
-          -DCMAKE_INCLUDE_PATH=$OPENMP_PATH/include \
-          -DCMAKE_LIBRARY_PATH=$OPENMP_PATH/lib \
-          -DOpenMP_C_FLAGS="-Xclang -fopenmp -I$OPENMP_PATH/include" \
-          -DOpenMP_CXX_FLAGS="-Xclang -fopenmp -I$OPENMP_PATH/include" \
-          -DOpenMP_C_LIB_NAMES="omp" \
-          -DOpenMP_CXX_LIB_NAMES="omp" \
-          -DOpenMP_omp_LIBRARY="$OPENMP_PATH/lib/libomp.dylib" \
-          -DCMAKE_EXE_LINKER_FLAGS="-L$OPENMP_PATH/lib -lomp" \
-          -DCMAKE_SHARED_LINKER_FLAGS="-L$OPENMP_PATH/lib -lomp"
+          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
         cmake --build build --parallel
-      env:
-        LDFLAGS: "-L$(brew --prefix libomp)/lib -lomp"
-        CPPFLAGS: "-I$(brew --prefix libomp)/include"
     - name: Test
       run: cmake --build build -t test
-      env:
-        CTEST_OUTPUT_ON_FAILURE: 1
   build-windows:
     runs-on: windows-2025
     steps:
@@ -156,15 +112,13 @@ jobs:
         submodules: true
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v2
-      with:
-        vs-version: 'latest'
     - name: Setup ccache
       uses: Chocobo1/setup-ccache-action@v1
       with:
         windows_compile_environment: msvc
     - name: Setup ninja
       uses: seanmiddleditch/gha-setup-ninja@v6
-    - name: Setup MSVC for Ninja again
+    - name: Setup MSVC for Ninja
       uses: ilammy/msvc-dev-cmd@v1
     - name: Build
       run: |
@@ -188,14 +142,12 @@ jobs:
         key: ccache-${{ github.job }}
     - name: Build and Test
       run: |
-        cmake -S . -B build -G Ninja \
+        cmake -S . -B build \
           -DCMAKE_C_COMPILER_LAUNCHER=ccache \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
           -DCMAKE_BUILD_TYPE=Release
         cmake --build build --parallel
         cmake --build build -t test
-      env:
-        CTEST_OUTPUT_ON_FAILURE: 1
   codecov:
     runs-on: ubuntu-latest
     steps:
@@ -204,28 +156,19 @@ jobs:
         submodules: true
     - name: Install dependencies
       run: sudo apt-get update && sudo apt-get install -y gcovr
-    - uses: actions/checkout@v4
-      with:
-        submodules: true
     - name: Setup ccache
       uses: hendrikmuhs/ccache-action@v1.2
-      with:
-        key: ccache-${{ github.job }}-${{ matrix.build_type }}
-        max-size: 2G
     - name: Build
       run: |
-        cmake -S . -B build -G Ninja \
+        cmake -S . -B build \
           -DCMAKE_C_COMPILER_LAUNCHER=ccache \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
           -DCMAKE_C_FLAGS="--coverage" \
           -DCMAKE_CXX_FLAGS="--coverage" \
-          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
-          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+          -DCMAKE_BUILD_TYPE=Debug
         cmake --build build --parallel
     - name: Test
       run: cmake --build build -t test
-      env:
-        CTEST_OUTPUT_ON_FAILURE: 1
     - name: Generate Coverage Data
       run: gcovr -r . --xml -o coverage.xml --gcov-ignore-parse-errors
     - name: Upload coverage reports to Codecov
@@ -239,42 +182,10 @@ jobs:
     needs: [build-linux]
     permissions:
       contents: write
-
     steps:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    
-    - name: Download binary and libs
-      uses: actions/download-artifact@v4
-      with:
-        name: mnist-RELEASE
-        path: build/
-        
-    - name: Verify downloaded artifacts
-      run: |
-        echo "### Verifying downloaded artifacts ###"
-        echo "Current directory: $(pwd)"
-        echo "Build directory contents:"
-        ls -la build/ || echo "No build directory"
-        echo "Looking for ACC binary:"
-        find build/ -name "ACC" -type f 2>/dev/null || echo "ACC not found"
-        echo "Checking bin directory:"
-        ls -la build/bin/ 2>/dev/null || echo "No bin directory"
-        
-    - name: Set binary path
-      id: set_eval_binary
-      run: |
-        if [ -f "build/bin/ACC" ]; then
-          echo "ACC binary found at build/bin/ACC"
-          echo "EVAL_BINARY=build/bin/ACC" >> $GITHUB_OUTPUT
-        else
-          echo "ERROR: ACC binary not found at build/bin/ACC"
-          echo "Available files:"
-          find build/ -type f -name "*" 2>/dev/null | head -20
-          exit 1
-        fi
-        
     - name: Install system dependencies
       run: |
         sudo apt-get update
@@ -283,11 +194,8 @@ jobs:
           libtbb12 \
           libjpeg-dev \
           libpng-dev \
-          libtiff-dev \
-          libopenjp2-7 \
-          libdnnl3
+          libtiff-dev
         sudo ldconfig
-        
     - name: Generate model JSON
       run: |
         cd docs && mkdir -p jsons
@@ -296,128 +204,48 @@ jobs:
         pip install -r requirements.txt
         python parser.py
         cd ../..
-
     - name: Cache MNIST test dataset
       id: cache-mnist
       uses: actions/cache@v4
       with:
         path: docs/mnist/mnist/test
         key: mnist-dataset-e2d09c892023700f68bfa9f30ac91a4dffaa23b151deeaca627101b3d73ef83d
-
     - name: Download MNIST test dataset
       if: steps.cache-mnist.outputs.cache-hit != 'true'
       run: |
         set -e
         mkdir -p docs/mnist/mnist/test
-        echo "Downloading test images..."
         wget -q https://github.com/DeepTrackAI/MNIST_dataset/archive/main.zip -O main.zip
         unzip -q main.zip
         cp MNIST_dataset-main/mnist/test/*.png docs/mnist/mnist/test/
         rm -rf main.zip MNIST_dataset-main
-        echo "Downloaded $(ls docs/mnist/mnist/test | wc -l) images"
-
+    - name: Download binary and libs
+      uses: actions/download-artifact@v4
+      with:
+        name: mnist-RELEASE
+        path: build/
     - name: Prepare environment
       run: |
-        echo "### Preparing environment ###"
-        echo "Binary path: ${{ steps.set_eval_binary.outputs.EVAL_BINARY }}"
-        
-        ls -la "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}"
-        chmod +x "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}"
-        
+        chmod +x build/bin/ACC
         export LD_LIBRARY_PATH=$PWD/build/bin/opencv_libs:/usr/lib/x86_64-linux-gnu
-        echo "Final LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
-        
-    - name: Verify library integrity
-      run: |
-        echo "### Library verification ###"
-        ls -la build/bin/opencv_libs/ || echo "No opencv_libs directory"
-        file build/bin/opencv_libs/libopencv_imgcodecs.so* 2>/dev/null | head -1 || echo "No opencv_imgcodecs library found"
-
-    - name: Test binary execution
-      run: |
-        echo "### Testing binary execution ###"
-        export LD_LIBRARY_PATH=$PWD/build/bin/opencv_libs:/usr/lib/x86_64-linux-gnu
-        
-        echo "Binary dependencies:"
-        ldd "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}" 2>/dev/null || echo "ldd failed"
-        
-        echo "Testing help command:"
-        timeout 10s "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}" --help > /dev/null 2>&1 || echo "Help test completed"
-
     - name: Run evaluation
       run: |
-        echo "### Running evaluation ###"
-        export LD_LIBRARY_PATH=$PWD/build/bin/opencv_libs:/usr/lib/x86_64-linux-gnu
-        echo "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
-        
-        echo "### Checking binary execution permissions ###"
-        ls -la "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}"
-        file "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}"
-        
-        echo "### Testing direct execution ###"
-        set +e
-        "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}" --version > version_output.txt 2>&1
-        VERSION_EXIT_CODE=$?
-        echo "Version command exit code: $VERSION_EXIT_CODE"
-        cat version_output.txt
-        
-        "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}" --help > help_output.txt 2>&1
-        HELP_EXIT_CODE=$?
-        echo "Help command exit code: $HELP_EXIT_CODE"
-        cat help_output.txt
-        
-        echo "### Running MNIST evaluation ###"
-        mkdir -p docs/mnist/mnist/test
-        
-        "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}" --model alexnet_mnist > accuracy.txt 2>&1
-        EVAL_EXIT_CODE=$?
-        echo "Evaluation exit code: $EVAL_EXIT_CODE"
-        
-        if [ $EVAL_EXIT_CODE -ne 0 ]; then
-          echo "Trying without --model parameter..."
-          "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}" > accuracy.txt 2>&1
-          EVAL_EXIT_CODE=$?
-          echo "Fallback evaluation exit code: $EVAL_EXIT_CODE"
-        fi
-        
-        echo "### Evaluation output ###"
-        cat accuracy.txt
-        set -e
-
-    - name: Extract accuracy value
-      run: |
-        echo "### Extracting accuracy ###"
-        ACCURACY=$(grep -oE '[0-9]+\.?[0-9]*%' accuracy.txt | head -1 || echo "0%")
-        echo "Accuracy: $ACCURACY"
-        echo "$ACCURACY" > accuracy_value.txt
-        
+        build/bin/ACC > accuracy.txt
     - name: Update README (master only)
       if: github.ref == 'refs/heads/master'
       run: |
-        ACCURACY=$(cat accuracy_value.txt | sed 's/%//g')
+        ACCURACY=$(cat accuracy.txt | sed 's/%//g')
         DATE=$(date '+%Y-%m-%d')
-    
-        echo "Updating README with:"
-        echo "Accuracy: $ACCURACY%"
-        echo "Date: $DATE"
-    
         sed -i "s/<!--ACCURACY_PLACEHOLDER-->.*<!--END_ACCURACY-->/<!--ACCURACY_PLACEHOLDER-->Accuracy: ${ACCURACY}% (updated: ${DATE})<!--END_ACCURACY-->/" README.md
-       
-        echo "Updated README content:"
-        grep -A 2 -B 2 "ACCURACY_PLACEHOLDER" README.md
-
     - name: Commit and push changes (master only)
       if: github.ref == 'refs/heads/master'
       run: |
         git config --global user.name "GitHub Actions"
         git config --global user.email "actions@github.com"
-    
         git add README.md
-
         if git diff-index --quiet HEAD --; then
           echo "No changes to commit"
         else
-          git commit -m "[CI] Update accuracy: $(cat accuracy_value.txt)"
+          git commit -m "[CI] Update accuracy: $(cat accuracy.txt)"
           git push origin master
-          echo "Changes pushed to master branch"
         fi