Skip to content

Commit b82d269

Browse files
allnesallnes
authored
Add OpenCV in ppc (#212)
* fix scripts * add ocv * link opencv * fix win clang-cl for ocv * add ocv funcs * fix linker * big changes * fix scripts * fix win
1 parent 83bcaa3 commit b82d269

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+218
-365
lines changed

Diff for: ‎.github/labeler.yml

-1
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/**"

Diff for: ‎.github/workflows/main.yml

+25-25
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ jobs:
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
6969
env:
7070
CC: gcc-13
7171
CXX: g++-13
@@ -142,9 +142,9 @@ jobs:
142142
env:
143143
CC: gcc-13
144144
CXX: g++-13
145-
- name: Ninja build
145+
- name: Build project
146146
run: |
147-
cmake --build build
147+
cmake --build build --parallel
148148
env:
149149
CC: gcc-13
150150
CXX: g++-13
@@ -214,9 +214,9 @@ jobs:
214214
env:
215215
CC: clang-19
216216
CXX: clang++-19
217-
- name: Ninja build
217+
- name: Build project
218218
run: |
219-
cmake --build build
219+
cmake --build build --parallel
220220
env:
221221
CC: clang-19
222222
CXX: clang++-19
@@ -293,9 +293,9 @@ jobs:
293293
env:
294294
CC: clang-19
295295
CXX: clang++-19
296-
- name: Ninja build
296+
- name: Build project
297297
run: |
298-
cmake --build build
298+
cmake --build build --parallel
299299
env:
300300
CC: clang-19
301301
CXX: clang++-19
@@ -364,9 +364,9 @@ jobs:
364364
env:
365365
CC: clang-19
366366
CXX: clang++-19
367-
- name: Ninja build
367+
- name: Build project
368368
run: |
369-
cmake --build build
369+
cmake --build build --parallel
370370
env:
371371
CC: clang-19
372372
CXX: clang++-19
@@ -430,9 +430,9 @@ jobs:
430430
env:
431431
CC: clang-19
432432
CXX: clang++-19
433-
- name: Ninja build
433+
- name: Build project
434434
run: |
435-
cmake --build build
435+
cmake --build build --parallel
436436
env:
437437
CC: clang-19
438438
CXX: clang++-19
@@ -505,9 +505,9 @@ jobs:
505505
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
506506
-DCMAKE_C_FLAGS="-I$(brew --prefix)/opt/libomp/include" -DCMAKE_CXX_FLAGS="-I$(brew --prefix)/opt/libomp/include"
507507
-D CMAKE_BUILD_TYPE=RELEASE -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
508-
- name: Ninja build
508+
- name: Build project
509509
run: |
510-
cmake --build build
510+
cmake --build build --parallel
511511
- name: Run func tests (MPI, num_proc=1)
512512
run: |
513513
source scripts/run_mpi.sh
@@ -576,9 +576,9 @@ jobs:
576576
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
577577
-DCMAKE_C_FLAGS="-I$(brew --prefix)/opt/libomp/include" -DCMAKE_CXX_FLAGS="-I$(brew --prefix)/opt/libomp/include"
578578
-D CMAKE_BUILD_TYPE=RELEASE -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
579-
- name: Ninja build
579+
- name: Build project
580580
run: |
581-
cmake --build build
581+
cmake --build build --parallel
582582
- name: Run tests (threads, num_threads=5)
583583
run: source scripts/run_threads.sh
584584
env:
@@ -650,7 +650,7 @@ jobs:
650650
-D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
651651
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
652652
-D CMAKE_BUILD_TYPE=RELEASE
653-
- name: MSBuild
653+
- name: Build project
654654
shell: bash
655655
run: |
656656
cmake --build build --config Release --parallel
@@ -708,7 +708,7 @@ jobs:
708708
-D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
709709
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
710710
-D CMAKE_BUILD_TYPE=RELEASE
711-
- name: MSBuild
711+
- name: Build project
712712
shell: bash
713713
run: |
714714
cmake --build build --config Release --parallel
@@ -766,14 +766,14 @@ jobs:
766766
uses: ilammy/msvc-dev-cmd@v1
767767
- name: CMake configure
768768
run: >
769-
cmake -S . -B build -GNinja -D CMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
769+
cmake -S . -B build -D CMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
770770
-D USE_SEQ=ON -D USE_MPI=OFF -D USE_OMP=OFF -D USE_TBB=ON -D USE_STL=ON
771771
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
772772
-D CMAKE_BUILD_TYPE=RELEASE
773773
env:
774774
CC: clang-cl
775775
CXX: clang-cl
776-
- name: Ninja build
776+
- name: Build project
777777
run: |
778778
cmake --build build --config Release --parallel -v
779779
env:
@@ -820,14 +820,14 @@ jobs:
820820
uses: ilammy/msvc-dev-cmd@v1
821821
- name: CMake configure
822822
run: >
823-
cmake -S . -B build -GNinja -D CMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
823+
cmake -S . -B build -D CMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
824824
-D USE_SEQ=ON -D USE_MPI=OFF -D USE_OMP=OFF -D USE_TBB=ON -D USE_STL=ON
825825
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
826826
-D CMAKE_BUILD_TYPE=RELEASE
827827
env:
828828
CC: clang-cl
829829
CXX: clang-cl
830-
- name: Ninja build
830+
- name: Build project
831831
run: |
832832
cmake --build build --config Release --parallel -v
833833
env:
@@ -906,7 +906,7 @@ jobs:
906906
-D CMAKE_BUILD_TYPE=RELEASE
907907
-D CMAKE_VERBOSE_MAKEFILE=ON
908908
-D USE_COVERAGE=ON
909-
- name: Ninja build
909+
- name: Build project
910910
run: |
911911
cmake --build build --parallel
912912
- name: Run tests (MPI)
@@ -994,9 +994,9 @@ jobs:
994994
env:
995995
CC: gcc-12
996996
CXX: g++-12
997-
- name: Ninja build
997+
- name: Build project
998998
run: |
999-
cmake --build build
999+
cmake --build build --parallel
10001000
env:
10011001
CC: gcc-12
10021002
CXX: g++-12

Diff for: ‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@
77
[submodule "3rdparty/onetbb"]
88
path = 3rdparty/onetbb
99
url = https://github.com/uxlfoundation/oneTBB
10+
[submodule "3rdparty/opencv"]
11+
path = 3rdparty/opencv
12+
url = https://github.com/opencv/opencv

Diff for: ‎1stsamples/CMakeLists.txt

-7
This file was deleted.

Diff for: ‎1stsamples/mpi/CMakeLists.txt

-17
This file was deleted.

Diff for: ‎1stsamples/mpi/main.cpp

-25
This file was deleted.

Diff for: ‎1stsamples/mpi_boost/CMakeLists.txt

-22
This file was deleted.

Diff for: ‎1stsamples/mpi_boost/main.cpp

-19
This file was deleted.

Diff for: ‎1stsamples/omp/CMakeLists.txt

-8
This file was deleted.

Diff for: ‎1stsamples/omp/main.cpp

-12
This file was deleted.

Diff for: ‎1stsamples/stl/CMakeLists.txt

-8
This file was deleted.

Diff for: ‎1stsamples/stl/main.cpp

-23
This file was deleted.

Diff for: ‎1stsamples/tbb/CMakeLists.txt

-12
This file was deleted.

Diff for: ‎1stsamples/tbb/main.cpp

-20
This file was deleted.

Diff for: ‎3rdparty/opencv

Submodule opencv added at 31b0eee

0 commit comments

Comments
 (0)