Merge branch 'Semyon1104/IntegrateOneDNN' of https://github.com/embedded-dev-research/itlab_2023 into Semyon1104/IntegrateOneDNN

Author: Semyon1104

.github/workflows/ci.yml

@@ -224,19 +224,47 @@ jobs:
         slug: embedded-dev-research/ITLabAI
 
   evaluate-model:
-   runs-on: ubuntu-latest
-   needs: [build-linux]
-   permissions:
-    contents: write
+    runs-on: ubuntu-latest
+    needs: [build-linux]
+    permissions:
+      contents: write
 
-   steps:
+    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: |
-        echo "EVAL_BINARY=build/bin/ACC" >> $GITHUB_OUTPUT
+        # Проверяем существует ли бинарник
+        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
@@ -246,11 +274,13 @@ jobs:
           libjpeg-dev \
           libpng-dev \
           libtiff-dev \
-          libopenjp2-7
+          libopenjp2-7 \
+          libdnnl3
         sudo ldconfig
+        
     - name: Generate model JSON
       run: |
-        cd docs && mkdir jsons
+        cd docs && mkdir -p jsons
         cd ..
         cd app/Converters
         pip install -r requirements.txt
@@ -276,50 +306,64 @@ jobs:
         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 }}"
         
         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 ###"
-       file build/bin/opencv_libs/libopencv_imgcodecs.so.4.12.0 | grep "shared object"
+        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: Run evaluation
+    - name: Test binary execution
       run: |
-       echo "### Pre-run checks ###"
-       export LD_LIBRARY_PATH=$PWD/build/bin/opencv_libs:/usr/lib/x86_64-linux-gnu
-       echo "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
-    
-       LD_DEBUG=files "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}" --model alexnet_mnist 2> ld_debug.log
-       echo "### Library loading debug ###"
-       grep -i "opencv_imgcodecs" ld_debug.log
+        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"
 
-       "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}" > accuracy.txt
-        echo "Accuracy: $(cat accuracy.txt)"
+    - 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 "Running ACC evaluation..."
+        "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}" --model alexnet_mnist > accuracy.txt 2>&1 || \
+        "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}" > accuracy.txt 2>&1
+        
+        echo "Evaluation output:"
+        cat accuracy.txt
 
+    - 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
+        
     - name: Update README (master only)
       if: github.ref == 'refs/heads/master'
       run: |
-        ACCURACY=$(cat accuracy.txt | sed 's/%//g')
+        ACCURACY=$(cat accuracy_value.txt | sed 's/%//g')
         DATE=$(date '+%Y-%m-%d')
     
         echo "Updating README with:"
-        echo "Accuracy: $ACCURACY"
+        echo "Accuracy: $ACCURACY%"
         echo "Date: $DATE"
 
-        echo "Current README content:"
-        grep -A 2 -B 2 "ACCURACY_PLACEHOLDER" README.md || echo "Placeholder not found"
-    
         sed -i "s/<!--ACCURACY_PLACEHOLDER-->.*<!--END_ACCURACY-->/<!--ACCURACY_PLACEHOLDER-->Accuracy: ${ACCURACY}% (updated: ${DATE})<!--END_ACCURACY-->/" README.md
 
         echo "Updated README content:"
@@ -336,7 +380,7 @@ jobs:
         if git diff-index --quiet HEAD --; then
           echo "No changes to commit"
         else
-          git commit -m "[CI] Update accuracy: $(cat accuracy.txt)%"
+          git commit -m "[CI] Update accuracy: $(cat accuracy_value.txt)"
           git push origin master
           echo "Changes pushed to master branch"
         fi

.github/workflows/static-analysis.yml

@@ -32,7 +32,7 @@ jobs:
         key: ccache-${{ github.job }}
     - name: Build
       run: |
-            cmake -S . -B build \
+            cmake -S . -B build -G Ninja  \
             -DCMAKE_C_COMPILER_LAUNCHER=ccache \
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
             -DCMAKE_C_COMPILER=clang \