Skip to content

Commit 38f1657

Browse files
committed
fix scripts
1 parent d0fca71 commit 38f1657

File tree

5 files changed

+3
-16
lines changed

5 files changed

+3
-16
lines changed

Diff for: .github/workflows/main.yml

-4
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ jobs:
6666
- name: Build project
6767
run: |
6868
cmake --build build --parallel
69-
source build/ppc_opencv/install/bin/setup_vars_opencv4.sh
7069
env:
7170
CC: gcc-13
7271
CXX: g++-13
@@ -146,7 +145,6 @@ jobs:
146145
- name: Build project
147146
run: |
148147
cmake --build build --parallel
149-
source build/ppc_opencv/install/bin/setup_vars_opencv4.sh
150148
env:
151149
CC: gcc-13
152150
CXX: g++-13
@@ -905,7 +903,6 @@ jobs:
905903
- name: Build project
906904
run: |
907905
cmake --build build --parallel
908-
source build/ppc_opencv/install/bin/setup_vars_opencv4.sh
909906
- name: Run tests (MPI)
910907
run: |
911908
source scripts/run_mpi.sh
@@ -988,7 +985,6 @@ jobs:
988985
- name: Build project
989986
run: |
990987
cmake --build build --parallel
991-
source build/ppc_opencv/install/bin/setup_vars_opencv4.sh
992988
env:
993989
CC: gcc-12
994990
CXX: g++-12

Diff for: scripts/run.bat

-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@
33
build\bin\core_func_tests.exe --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating || exit 1
44
build\bin\ref_func_tests.exe --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating || exit 1
55

6-
if "%CLANG_BUILD%" NEQ "1" mpiexec.exe -np 4 build\bin\sample_mpi.exe
7-
if "%CLANG_BUILD%" NEQ "1" mpiexec.exe -np 4 build\bin\sample_mpi_boost.exe
8-
if "%CLANG_BUILD%" NEQ "1" build\bin\sample_omp.exe
9-
build\bin\sample_stl.exe
10-
build\bin\sample_tbb.exe
11-
126
if "%CLANG_BUILD%" NEQ "1" mpiexec.exe -np 4 build\bin\all_func_tests.exe --gtest_repeat=10 || exit 1
137
if "%CLANG_BUILD%" NEQ "1" mpiexec.exe -np 4 build\bin\mpi_func_tests.exe --gtest_repeat=10 || exit 1
148
if "%CLANG_BUILD%" NEQ "1" build\bin\all_func_tests.exe || exit 1

Diff for: scripts/run_mpi.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
source build/ppc_opencv/install/bin/setup_vars_opencv4.sh
23

34
if [[ $OSTYPE == "linux-gnu" && -z "$ASAN_RUN" ]]; then
45
valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all ./build/bin/core_func_tests
@@ -12,8 +13,6 @@ fi
1213
./build/bin/ref_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
1314

1415
if [[ -z "$ASAN_RUN" ]]; then
15-
mpirun $1 -np $PROC_COUNT ./build/bin/sample_mpi
16-
mpirun $1 -np $PROC_COUNT ./build/bin/sample_mpi_boost
1716
mpirun $1 -np $PROC_COUNT ./build/bin/all_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
1817
mpirun $1 -np $PROC_COUNT ./build/bin/mpi_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
1918
fi

Diff for: scripts/run_perf_collector.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
source build/ppc_opencv/install/bin/setup_vars_opencv4.sh
23

34
if [[ -z "$ASAN_RUN" ]]; then
45
if [[ $OSTYPE == "linux-gnu" ]]; then

Diff for: scripts/run_threads.sh

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
source build/ppc_opencv/install/bin/setup_vars_opencv4.sh
23

34
if [[ $OSTYPE == "linux-gnu" && -z "$ASAN_RUN" ]]; then
45
valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all ./build/bin/core_func_tests
@@ -13,10 +14,6 @@ fi
1314
./build/bin/core_func_tests --gtest_also_run_disabled_tests --gtest_repeat=3 --gtest_recreate_environments_when_repeating
1415
./build/bin/ref_func_tests --gtest_also_run_disabled_tests --gtest_repeat=3 --gtest_recreate_environments_when_repeating
1516

16-
./build/bin/sample_omp
17-
./build/bin/sample_stl
18-
./build/bin/sample_tbb
19-
2017
./build/bin/omp_func_tests --gtest_also_run_disabled_tests --gtest_repeat=3 --gtest_recreate_environments_when_repeating
2118
./build/bin/seq_func_tests --gtest_also_run_disabled_tests --gtest_repeat=3 --gtest_recreate_environments_when_repeating
2219
./build/bin/stl_func_tests --gtest_also_run_disabled_tests --gtest_repeat=3 --gtest_recreate_environments_when_repeating

0 commit comments

Comments
 (0)