Skip to content

Add OpenCV in ppc #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jan 17, 2025
Merged

Add OpenCV in ppc #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6d67295
fix scripts
allnes Jan 12, 2025
a45885d
Merge branch 'master' of https://github.com/learning-process/parallel…
allnes Jan 16, 2025
cb5a849
add ocv
allnes Jan 16, 2025
e321a54
link opencv
allnes Jan 16, 2025
abc1e3c
fix win clang-cl for ocv
allnes Jan 16, 2025
c93eaad
add ocv funcs
allnes Jan 16, 2025
1130bd6
fix linker
allnes Jan 16, 2025
eb2da2f
big changes
allnes Jan 17, 2025
d0fca71
Merge branch 'master' into an/add_opencv
allnes Jan 17, 2025
38f1657
fix scripts
allnes Jan 17, 2025
faf31cf
Merge branch 'master' into an/add_opencv
allnes Jan 17, 2025
7601e81
Merge branch 'master' into an/add_opencv
allnes Jan 17, 2025
402e9f8
fix win
allnes Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/labeler.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ ci:
core:
- "modules/core/**"
samples:
- "1stsamples/**"
- "modules/ref/**"
3rdparty:
- "3rdparty/**"
Expand Down
50 changes: 25 additions & 25 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ jobs:
env:
CC: gcc-13
CXX: g++-13
- name: Ninja build
- name: Build project
run: |
cmake --build build
cmake --build build --parallel
env:
CC: gcc-13
CXX: g++-13
Expand Down Expand Up @@ -142,9 +142,9 @@ jobs:
env:
CC: gcc-13
CXX: g++-13
- name: Ninja build
- name: Build project
run: |
cmake --build build
cmake --build build --parallel
env:
CC: gcc-13
CXX: g++-13
Expand Down Expand Up @@ -214,9 +214,9 @@ jobs:
env:
CC: clang-19
CXX: clang++-19
- name: Ninja build
- name: Build project
run: |
cmake --build build
cmake --build build --parallel
env:
CC: clang-19
CXX: clang++-19
Expand Down Expand Up @@ -293,9 +293,9 @@ jobs:
env:
CC: clang-19
CXX: clang++-19
- name: Ninja build
- name: Build project
run: |
cmake --build build
cmake --build build --parallel
env:
CC: clang-19
CXX: clang++-19
Expand Down Expand Up @@ -364,9 +364,9 @@ jobs:
env:
CC: clang-19
CXX: clang++-19
- name: Ninja build
- name: Build project
run: |
cmake --build build
cmake --build build --parallel
env:
CC: clang-19
CXX: clang++-19
Expand Down Expand Up @@ -430,9 +430,9 @@ jobs:
env:
CC: clang-19
CXX: clang++-19
- name: Ninja build
- name: Build project
run: |
cmake --build build
cmake --build build --parallel
env:
CC: clang-19
CXX: clang++-19
Expand Down Expand Up @@ -505,9 +505,9 @@ jobs:
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
-DCMAKE_C_FLAGS="-I$(brew --prefix)/opt/libomp/include" -DCMAKE_CXX_FLAGS="-I$(brew --prefix)/opt/libomp/include"
-D CMAKE_BUILD_TYPE=RELEASE -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
- name: Ninja build
- name: Build project
run: |
cmake --build build
cmake --build build --parallel
- name: Run func tests (MPI, num_proc=1)
run: |
source scripts/run_mpi.sh
Expand Down Expand Up @@ -576,9 +576,9 @@ jobs:
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
-DCMAKE_C_FLAGS="-I$(brew --prefix)/opt/libomp/include" -DCMAKE_CXX_FLAGS="-I$(brew --prefix)/opt/libomp/include"
-D CMAKE_BUILD_TYPE=RELEASE -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
- name: Ninja build
- name: Build project
run: |
cmake --build build
cmake --build build --parallel
- name: Run tests (threads, num_threads=5)
run: source scripts/run_threads.sh
env:
Expand Down Expand Up @@ -650,7 +650,7 @@ jobs:
-D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
-D CMAKE_BUILD_TYPE=RELEASE
- name: MSBuild
- name: Build project
shell: bash
run: |
cmake --build build --config Release --parallel
Expand Down Expand Up @@ -708,7 +708,7 @@ jobs:
-D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
-D CMAKE_BUILD_TYPE=RELEASE
- name: MSBuild
- name: Build project
shell: bash
run: |
cmake --build build --config Release --parallel
Expand Down Expand Up @@ -766,14 +766,14 @@ jobs:
uses: ilammy/msvc-dev-cmd@v1
- name: CMake configure
run: >
cmake -S . -B build -GNinja -D CMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
cmake -S . -B build -D CMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
-D USE_SEQ=ON -D USE_MPI=OFF -D USE_OMP=OFF -D USE_TBB=ON -D USE_STL=ON
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
-D CMAKE_BUILD_TYPE=RELEASE
env:
CC: clang-cl
CXX: clang-cl
- name: Ninja build
- name: Build project
run: |
cmake --build build --config Release --parallel -v
env:
Expand Down Expand Up @@ -820,14 +820,14 @@ jobs:
uses: ilammy/msvc-dev-cmd@v1
- name: CMake configure
run: >
cmake -S . -B build -GNinja -D CMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
cmake -S . -B build -D CMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
-D USE_SEQ=ON -D USE_MPI=OFF -D USE_OMP=OFF -D USE_TBB=ON -D USE_STL=ON
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
-D CMAKE_BUILD_TYPE=RELEASE
env:
CC: clang-cl
CXX: clang-cl
- name: Ninja build
- name: Build project
run: |
cmake --build build --config Release --parallel -v
env:
Expand Down Expand Up @@ -906,7 +906,7 @@ jobs:
-D CMAKE_BUILD_TYPE=RELEASE
-D CMAKE_VERBOSE_MAKEFILE=ON
-D USE_COVERAGE=ON
- name: Ninja build
- name: Build project
run: |
cmake --build build --parallel
- name: Run tests (MPI)
Expand Down Expand Up @@ -994,9 +994,9 @@ jobs:
env:
CC: gcc-12
CXX: g++-12
- name: Ninja build
- name: Build project
run: |
cmake --build build
cmake --build build --parallel
env:
CC: gcc-12
CXX: g++-12
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
[submodule "3rdparty/onetbb"]
path = 3rdparty/onetbb
url = https://github.com/uxlfoundation/oneTBB
[submodule "3rdparty/opencv"]
path = 3rdparty/opencv
url = https://github.com/opencv/opencv
7 changes: 0 additions & 7 deletions 1stsamples/CMakeLists.txt
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions 1stsamples/mpi/CMakeLists.txt
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions 1stsamples/mpi/main.cpp
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions 1stsamples/mpi_boost/CMakeLists.txt
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions 1stsamples/mpi_boost/main.cpp
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions 1stsamples/omp/CMakeLists.txt
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions 1stsamples/omp/main.cpp
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions 1stsamples/stl/CMakeLists.txt
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions 1stsamples/stl/main.cpp
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions 1stsamples/tbb/CMakeLists.txt
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions 1stsamples/tbb/main.cpp
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions 3rdparty/opencv
Open in desktop
Submodule opencv added at 31b0ee
Loading
Loading