Skip to content

Commit b2808b1

Browse files
authored
all libs
1 parent 25e593f commit b2808b1

1 file changed

Lines changed: 24 additions & 42 deletions

File tree

.github/workflows/ci.yml

Lines changed: 24 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,18 @@ jobs:
5151
cmake --build build --parallel
5252
env:
5353
CTEST_OUTPUT_ON_FAILURE: 1
54-
- name: Prepare OpenCV libs
54+
- name: Prepare ALL libs
5555
run: |
56-
mkdir -p build/bin/opencv_libs
57-
cp -a build/3rdparty/opencv_build/lib/libopencv_* build/bin/opencv_libs/
58-
echo "Library permissions after copy:"
59-
stat -c "%A %n" build/bin/opencv_libs/libopencv_imgcodecs.so*
60-
56+
mkdir -p build/bin/all_libs
57+
cp -a build/3rdparty/opencv_build/lib/* build/bin/all_libs/ 2>/dev/null || true
58+
ldd build/bin/ACC | grep "=> /" | awk '{print $3}' | xargs -I {} cp {} build/bin/all_libs/ 2>/dev/null || true
6159
- name: Upload artifacts
6260
uses: actions/upload-artifact@v4
6361
with:
6462
name: mnist-${{ matrix.build_type }}${{ matrix.stats && '-stats' || '' }}
6563
path: |
6664
${{ steps.set_binaries.outputs.ACC_BINARY }}
65+
build/bin/all_libs/*
6766
build/bin/opencv_libs/*
6867
build/setenv.sh
6968
- name: Test
@@ -299,47 +298,30 @@ jobs:
299298
echo "Binary path: ${{ steps.set_eval_binary.outputs.EVAL_BINARY }}"
300299
ls -la "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}"
301300
chmod +x "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}"
302-
export LD_LIBRARY_PATH=$PWD/build/bin/opencv_libs:/usr/lib/x86_64-linux-gnu
303-
301+
export LD_LIBRARY_PATH=$PWD/build/bin/all_libs:/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH
302+
echo "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
303+
ls -la build/bin/all_libs/ | head -10
304+
304305
- name: Run evaluation
305306
run: |
306-
echo "### Running evaluation ###"
307-
export LD_LIBRARY_PATH=$PWD/build/bin/opencv_libs:/usr/lib/x86_64-linux-gnu
307+
export LD_LIBRARY_PATH=$PWD/build/bin/all_libs:/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH
308308
echo "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
309-
310-
echo "### Checking binary execution permissions ###"
311-
ls -la "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}"
312-
file "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}"
313-
314-
echo "### Testing direct execution ###"
315-
set +e
316-
"${{ steps.set_eval_binary.outputs.EVAL_BINARY }}" --version > version_output.txt 2>&1
317-
VERSION_EXIT_CODE=$?
318-
echo "Version command exit code: $VERSION_EXIT_CODE"
319-
cat version_output.txt
320-
321-
"${{ steps.set_eval_binary.outputs.EVAL_BINARY }}" --help > help_output.txt 2>&1
322-
HELP_EXIT_CODE=$?
323-
echo "Help command exit code: $HELP_EXIT_CODE"
324-
cat help_output.txt
325-
309+
310+
echo "### Checking binary dependencies ###"
311+
ldd "${{ steps.set_eval_binary.outputs.EVAL_BINARY }}"
312+
326313
echo "### Running MNIST evaluation ###"
327-
mkdir -p docs/mnist/mnist/test
328-
329314
"${{ steps.set_eval_binary.outputs.EVAL_BINARY }}" --model alexnet_mnist > accuracy.txt 2>&1
330-
EVAL_EXIT_CODE=$?
331-
echo "Evaluation exit code: $EVAL_EXIT_CODE"
332-
333-
if [ $EVAL_EXIT_CODE -ne 0 ]; then
334-
echo "Trying without --model parameter..."
335-
"${{ steps.set_eval_binary.outputs.EVAL_BINARY }}" > accuracy.txt 2>&1
336-
EVAL_EXIT_CODE=$?
337-
echo "Fallback evaluation exit code: $EVAL_EXIT_CODE"
338-
fi
339-
340-
echo "### Evaluation output ###"
341-
cat accuracy.txt
342-
set -e
315+
EVAL_EXIT_CODE=$?
316+
317+
echo "Evaluation exit code: $EVAL_EXIT_CODE"
318+
echo "### Evaluation output ###"
319+
cat accuracy.txt
320+
321+
if [ $EVAL_EXIT_CODE -ne 0 ]; then
322+
echo "ERROR: Evaluation failed"
323+
exit 1
324+
fi
343325

344326
- name: Extract accuracy value
345327
run: |

0 commit comments

Comments
 (0)