Skip to content

Commit eb2da2f

Browse files
allnesallnes
committed
big changes
1 parent 1130bd6 commit eb2da2f

22 files changed

+153
-315
lines changed

‎.github/labeler.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ ci:
1616
core:
1717
- "modules/core/**"
1818
samples:
19-
- "1stsamples/**"
2019
- "modules/ref/**"
2120
3rdparty:
2221
- "3rdparty/**"

‎.github/workflows/main.yml‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,17 @@ jobs:
5656
- name: CMake configure
5757
run: >
5858
cmake -S . -B build
59-
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -DENABLE_MOLD=ON
59+
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -D ENABLE_MOLD=ON
6060
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
6161
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
6262
-D CMAKE_BUILD_TYPE=RELEASE
6363
env:
6464
CC: gcc-13
6565
CXX: g++-13
66-
- name: Ninja build
66+
- name: Build project
6767
run: |
68-
cmake --build build
68+
cmake --build build --parallel
69+
source build/ppc_opencv/install/bin/setup_vars_opencv4.sh
6970
env:
7071
CC: gcc-13
7172
CXX: g++-13
@@ -135,16 +136,17 @@ jobs:
135136
- name: CMake configure
136137
run: >
137138
cmake -S . -B build
138-
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -DENABLE_MOLD=ON
139+
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -D ENABLE_MOLD=ON
139140
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
140141
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
141142
-D CMAKE_BUILD_TYPE=RELEASE
142143
env:
143144
CC: gcc-13
144145
CXX: g++-13
145-
- name: Ninja build
146+
- name: Build project
146147
run: |
147-
cmake --build build
148+
cmake --build build --parallel
149+
source build/ppc_opencv/install/bin/setup_vars_opencv4.sh
148150
env:
149151
CC: gcc-13
150152
CXX: g++-13
@@ -214,9 +216,9 @@ jobs:
214216
env:
215217
CC: clang-19
216218
CXX: clang++-19
217-
- name: Ninja build
219+
- name: Build project
218220
run: |
219-
cmake --build build
221+
cmake --build build --parallel
220222
env:
221223
CC: clang-19
222224
CXX: clang++-19
@@ -293,9 +295,9 @@ jobs:
293295
env:
294296
CC: clang-19
295297
CXX: clang++-19
296-
- name: Ninja build
298+
- name: Build project
297299
run: |
298-
cmake --build build
300+
cmake --build build --parallel
299301
env:
300302
CC: clang-19
301303
CXX: clang++-19
@@ -364,9 +366,9 @@ jobs:
364366
env:
365367
CC: clang-19
366368
CXX: clang++-19
367-
- name: Ninja build
369+
- name: Build project
368370
run: |
369-
cmake --build build
371+
cmake --build build --parallel
370372
env:
371373
CC: clang-19
372374
CXX: clang++-19
@@ -430,9 +432,9 @@ jobs:
430432
env:
431433
CC: clang-19
432434
CXX: clang++-19
433-
- name: Ninja build
435+
- name: Build project
434436
run: |
435-
cmake --build build
437+
cmake --build build --parallel
436438
env:
437439
CC: clang-19
438440
CXX: clang++-19
@@ -505,9 +507,9 @@ jobs:
505507
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
506508
-DCMAKE_C_FLAGS="-I$(brew --prefix)/opt/libomp/include" -DCMAKE_CXX_FLAGS="-I$(brew --prefix)/opt/libomp/include"
507509
-D CMAKE_BUILD_TYPE=RELEASE -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
508-
- name: Ninja build
510+
- name: Build project
509511
run: |
510-
cmake --build build
512+
cmake --build build --parallel
511513
- name: Run func tests (MPI, num_proc=1)
512514
run: |
513515
source scripts/run_mpi.sh
@@ -576,9 +578,9 @@ jobs:
576578
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
577579
-DCMAKE_C_FLAGS="-I$(brew --prefix)/opt/libomp/include" -DCMAKE_CXX_FLAGS="-I$(brew --prefix)/opt/libomp/include"
578580
-D CMAKE_BUILD_TYPE=RELEASE -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
579-
- name: Ninja build
581+
- name: Build project
580582
run: |
581-
cmake --build build
583+
cmake --build build --parallel
582584
- name: Run tests (threads, num_threads=5)
583585
run: source scripts/run_threads.sh
584586
env:
@@ -650,7 +652,7 @@ jobs:
650652
-D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
651653
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
652654
-D CMAKE_BUILD_TYPE=RELEASE
653-
- name: MSBuild
655+
- name: Build project
654656
shell: bash
655657
run: |
656658
cmake --build build --config Release --parallel
@@ -708,7 +710,7 @@ jobs:
708710
-D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
709711
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
710712
-D CMAKE_BUILD_TYPE=RELEASE
711-
- name: MSBuild
713+
- name: Build project
712714
shell: bash
713715
run: |
714716
cmake --build build --config Release --parallel
@@ -773,7 +775,7 @@ jobs:
773775
env:
774776
CC: clang-cl
775777
CXX: clang-cl
776-
- name: Ninja build
778+
- name: Build project
777779
run: |
778780
cmake --build build --config Release --parallel -v
779781
env:
@@ -827,7 +829,7 @@ jobs:
827829
env:
828830
CC: clang-cl
829831
CXX: clang-cl
830-
- name: Ninja build
832+
- name: Build project
831833
run: |
832834
cmake --build build --config Release --parallel -v
833835
env:
@@ -896,13 +898,14 @@ jobs:
896898
run: >
897899
cmake -S . -B build
898900
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
899-
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON -DENABLE_MOLD=ON
901+
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON -D ENABLE_MOLD=ON
900902
-D CMAKE_BUILD_TYPE=RELEASE
901903
-D CMAKE_VERBOSE_MAKEFILE=ON
902904
-D USE_COVERAGE=ON
903-
- name: Ninja build
905+
- name: Build project
904906
run: |
905907
cmake --build build --parallel
908+
source build/ppc_opencv/install/bin/setup_vars_opencv4.sh
906909
- name: Run tests (MPI)
907910
run: |
908911
source scripts/run_mpi.sh
@@ -975,16 +978,17 @@ jobs:
975978
- name: CMake configure
976979
run: >
977980
cmake -S . -B build
978-
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -DENABLE_MOLD=ON
981+
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -D ENABLE_MOLD=ON
979982
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
980983
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
981984
-D CMAKE_BUILD_TYPE=RELEASE
982985
env:
983986
CC: gcc-12
984987
CXX: g++-12
985-
- name: Ninja build
988+
- name: Build project
986989
run: |
987-
cmake --build build
990+
cmake --build build --parallel
991+
source build/ppc_opencv/install/bin/setup_vars_opencv4.sh
988992
env:
989993
CC: gcc-12
990994
CXX: g++-12

‎1stsamples/CMakeLists.txt‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎1stsamples/mpi/CMakeLists.txt‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎1stsamples/mpi/main.cpp‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎1stsamples/mpi_boost/CMakeLists.txt‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎1stsamples/mpi_boost/main.cpp‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎1stsamples/omp/CMakeLists.txt‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎1stsamples/omp/main.cpp‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎1stsamples/stl/CMakeLists.txt‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)