Skip to content

Commit 9a496bc

Browse files
allnesallnes
authored
Remove CMake keys (#403)
1 parent 539669a commit 9a496bc

15 files changed

Lines changed: 99 additions & 234 deletions

File tree

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ jobs:
4141
run: >
4242
cmake -S . -B build
4343
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
44-
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
45-
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
44+
-G Ninja -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
4645
-D CMAKE_BUILD_TYPE=RELEASE
4746
env:
4847
CC: gcc-14

‎.github/workflows/main.yml‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ jobs:
5757
run: >
5858
cmake -S . -B build
5959
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
60-
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
61-
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
60+
-G Ninja -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
6261
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=install
6362
env:
6463
CC: gcc-14
@@ -211,8 +210,7 @@ jobs:
211210
run: >
212211
cmake -S . -B build
213212
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
214-
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
215-
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
213+
-G Ninja -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
216214
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=install
217215
env:
218216
CC: clang-20
@@ -363,8 +361,7 @@ jobs:
363361
run: >
364362
cmake -S . -B build
365363
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
366-
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
367-
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
364+
-G Ninja -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
368365
-D CMAKE_BUILD_TYPE=RELEASE -D ENABLE_ADDRESS_SANITIZER=ON -D ENABLE_UB_SANITIZER=ON
369366
-D CMAKE_INSTALL_PREFIX=install
370367
env:
@@ -399,7 +396,8 @@ jobs:
399396
- name: Setup environment
400397
run: |
401398
sudo apt-get update
402-
sudo apt-get install --no-install-recommends -y ninja-build libmpich-dev python3-pip valgrind
399+
sudo apt-get install --no-install-recommends -y ninja-build python3-pip valgrind \
400+
openmpi-bin openmpi-common libopenmpi-dev
403401
wget https://apt.llvm.org/llvm.sh
404402
chmod u+x llvm.sh
405403
sudo ./llvm.sh 20 all
@@ -459,7 +457,8 @@ jobs:
459457
- name: Setup environment
460458
run: |
461459
sudo apt-get update
462-
sudo apt-get install --no-install-recommends -y ninja-build libmpich-dev python3-pip valgrind
460+
sudo apt-get install --no-install-recommends -y ninja-build python3-pip valgrind \
461+
openmpi-bin openmpi-common libopenmpi-dev
463462
wget https://apt.llvm.org/llvm.sh
464463
chmod u+x llvm.sh
465464
sudo ./llvm.sh 20 all
@@ -518,8 +517,7 @@ jobs:
518517
run: >
519518
cmake -S . -B build
520519
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
521-
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
522-
-DCMAKE_C_FLAGS="-I$(brew --prefix)/opt/libomp/include"
520+
-G Ninja -DCMAKE_C_FLAGS="-I$(brew --prefix)/opt/libomp/include"
523521
-DCMAKE_CXX_FLAGS="-I$(brew --prefix)/opt/libomp/include"
524522
-D CMAKE_BUILD_TYPE=RELEASE -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
525523
-DCMAKE_INSTALL_PREFIX=install
@@ -666,7 +664,6 @@ jobs:
666664
run: >
667665
cmake -S . -B build -G Ninja -D CMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl
668666
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
669-
-D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
670667
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
671668
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=install
672669
- name: Build project
@@ -816,7 +813,6 @@ jobs:
816813
run: >
817814
cmake -S . -B build -G Ninja -D CMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
818815
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
819-
-D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
820816
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
821817
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=install
822818
env:
@@ -944,11 +940,8 @@ jobs:
944940
run: >
945941
cmake -S . -B build
946942
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
947-
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
948-
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
949-
-D CMAKE_BUILD_TYPE=RELEASE
950-
-D CMAKE_VERBOSE_MAKEFILE=ON
951-
-D USE_COVERAGE=ON
943+
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON -D CMAKE_BUILD_TYPE=RELEASE
944+
-D CMAKE_VERBOSE_MAKEFILE=ON -D USE_COVERAGE=ON
952945
- name: Build project
953946
run: |
954947
cmake --build build --parallel

‎.github/workflows/static-analysis-pr.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ jobs:
2626
cmake -S . -B build
2727
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
2828
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
29-
-G Ninja
30-
-D USE_SEQ=ON -D USE_MPI=ON
31-
-D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
32-
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
29+
-G Ninja -D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
3330
config_file: .clang-tidy
3431
exclude: 3rdparty
3532
split_workflow: true
@@ -62,10 +59,7 @@ jobs:
6259
cmake_command: >
6360
cmake -S . -B build
6461
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
65-
-G Ninja
66-
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
67-
-D USE_SEQ=ON -D USE_MPI=ON
68-
-D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
62+
-G Ninja -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
6963
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
7064
config_file: .clang-tidy
7165
exclude: 3rdparty

‎CMakeLists.txt‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@ cmake_minimum_required( VERSION 3.25 )
33
message( STATUS "Parallel Programming Course (PPC)" )
44
project(parallel_programming_course)
55

6+
############################ Scoreboard #############################
7+
8+
message( STATUS "PPC step: Setup scoreboard generator" )
9+
include(cmake/scoreboard.cmake)
10+
add_subdirectory(scoreboard)
11+
12+
########################### Documentation ###########################
13+
14+
message( STATUS "PPC step: Setup documentation generation" )
15+
include(cmake/sphinx.cmake)
16+
add_subdirectory(docs)
17+
18+
if( USE_SCOREBOARD OR USE_DOCS )
19+
return()
20+
endif()
21+
622
############################ Configures #############################
723

824
message( STATUS "PPC step: First configures" )
@@ -15,26 +31,13 @@ include(cmake/sanitizers.cmake)
1531
message( STATUS "PPC step: Setup parallel programming technologies" )
1632
include(cmake/mpi.cmake)
1733
include(cmake/openmp.cmake)
18-
include(cmake/threads.cmake)
1934
include(cmake/onetbb.cmake)
2035

2136
######################### External projects #########################
2237

2338
message( STATUS "PPC step: Setup external projects" )
2439
include(cmake/gtest.cmake)
2540

26-
########################### Documentation ###########################
27-
28-
message( STATUS "PPC step: Setup documentation generation" )
29-
include(cmake/sphinx.cmake)
30-
add_subdirectory(docs)
31-
32-
############################ Scoreboard #############################
33-
34-
message( STATUS "PPC step: Setup scoreboard generator" )
35-
include(cmake/scoreboard.cmake)
36-
add_subdirectory(scoreboard)
37-
3841
############################## Headers ##############################
3942

4043
message( STATUS "PPC step: Setup headers" )

‎cmake/configure.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,5 @@ if( MSVC )
8383
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_FLAGS}")
8484
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}" )
8585
endif( MSVC )
86+
87+
find_package( Threads )

‎cmake/gtest.cmake‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
# Build googletest components
2-
if(NOT USE_SEQ AND NOT USE_MPI AND NOT USE_OMP AND NOT USE_TBB AND NOT USE_STL)
3-
return()
4-
endif()
5-
61
include_directories(${CMAKE_SOURCE_DIR}/3rdparty/googletest/googletest/include)
72
include(ExternalProject)
83
ExternalProject_Add(ppc_googletest

‎cmake/mpi.cmake‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
option(USE_MPI OFF)
2-
if( USE_MPI )
3-
find_package( MPI )
4-
if( MPI_FOUND )
5-
include_directories( ${MPI_INCLUDE_PATH} )
6-
else( MPI_FOUND )
7-
set( USE_MPI OFF )
8-
endif( MPI_FOUND )
9-
endif( USE_MPI )
1+
find_package( MPI )
2+
if( MPI_FOUND )
3+
include_directories( ${MPI_INCLUDE_PATH} )
4+
else( MPI_FOUND )
5+
message(FATAL_ERROR "MPI NOT FOUND")
6+
endif( MPI_FOUND )

‎cmake/onetbb.cmake‎

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,30 @@
1-
option(USE_TBB OFF)
2-
if( USE_TBB )
3-
# Build Core OneTBB components
4-
include_directories(${CMAKE_SOURCE_DIR}/3rdparty/onetbb/include)
1+
# Build Core OneTBB components
2+
include_directories(${CMAKE_SOURCE_DIR}/3rdparty/onetbb/include)
53

6-
include(ExternalProject)
7-
if(WIN32)
8-
ExternalProject_Add(ppc_onetbb
9-
SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/onetbb"
10-
PREFIX "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb"
11-
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build"
12-
INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install"
13-
CONFIGURE_COMMAND "${CMAKE_COMMAND}" -S "${CMAKE_SOURCE_DIR}/3rdparty/onetbb/" -B "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build/" -DCMAKE_CXX_FLAGS="-w" -DCMAKE_C_FLAGS="-w"
14-
-DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl -D CMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -D CMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
15-
-G${CMAKE_GENERATOR} -DTBB_TEST=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
16-
BUILD_COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build" --config ${CMAKE_BUILD_TYPE} --parallel
17-
INSTALL_COMMAND "${CMAKE_COMMAND}" --install "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build" --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install"
18-
TEST_COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install/bin" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
19-
else()
20-
ExternalProject_Add(ppc_onetbb
21-
SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/onetbb"
22-
PREFIX "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb"
23-
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build"
24-
INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install"
25-
CONFIGURE_COMMAND "${CMAKE_COMMAND}" -S "${CMAKE_SOURCE_DIR}/3rdparty/onetbb/" -B "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build/" -DCMAKE_CXX_FLAGS="-w" -DCMAKE_C_FLAGS="-w"
26-
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -D CMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -D CMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
27-
-G${CMAKE_GENERATOR} -DTBB_TEST=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
28-
BUILD_COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build" --config ${CMAKE_BUILD_TYPE} --parallel
29-
INSTALL_COMMAND "${CMAKE_COMMAND}" --install "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build" --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install")
30-
endif()
31-
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install/"
32-
DESTINATION "${CMAKE_INSTALL_PREFIX}")
33-
endif( USE_TBB )
4+
include(ExternalProject)
5+
if(WIN32)
6+
ExternalProject_Add(ppc_onetbb
7+
SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/onetbb"
8+
PREFIX "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb"
9+
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build"
10+
INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install"
11+
CONFIGURE_COMMAND "${CMAKE_COMMAND}" -S "${CMAKE_SOURCE_DIR}/3rdparty/onetbb/" -B "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build/" -DCMAKE_CXX_FLAGS="-w" -DCMAKE_C_FLAGS="-w"
12+
-DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl -D CMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -D CMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
13+
-G${CMAKE_GENERATOR} -DTBB_TEST=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
14+
BUILD_COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build" --config ${CMAKE_BUILD_TYPE} --parallel
15+
INSTALL_COMMAND "${CMAKE_COMMAND}" --install "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build" --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install"
16+
TEST_COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install/bin" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
17+
else()
18+
ExternalProject_Add(ppc_onetbb
19+
SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/onetbb"
20+
PREFIX "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb"
21+
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build"
22+
INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install"
23+
CONFIGURE_COMMAND "${CMAKE_COMMAND}" -S "${CMAKE_SOURCE_DIR}/3rdparty/onetbb/" -B "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build/" -DCMAKE_CXX_FLAGS="-w" -DCMAKE_C_FLAGS="-w"
24+
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -D CMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -D CMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
25+
-G${CMAKE_GENERATOR} -DTBB_TEST=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
26+
BUILD_COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build" --config ${CMAKE_BUILD_TYPE} --parallel
27+
INSTALL_COMMAND "${CMAKE_COMMAND}" --install "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build" --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install")
28+
endif()
29+
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install/"
30+
DESTINATION "${CMAKE_INSTALL_PREFIX}")

‎cmake/openmp.cmake‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
1-
option(USE_OMP OFF)
2-
if( USE_OMP )
3-
find_package( OpenMP )
4-
if( OpenMP_FOUND )
5-
include_directories( ${OpenMP_C_INCLUDE_DIRS} ${OpenMP_CXX_INCLUDE_DIRS} )
6-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
7-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
8-
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
9-
else( OpenMP_FOUND )
10-
if (WIN32)
11-
message(WARNING "OpenMP NOT FOUND")
12-
else()
13-
message(FATAL_ERROR "OpenMP NOT FOUND")
14-
endif()
15-
endif( OpenMP_FOUND )
16-
endif( USE_OMP )
1+
find_package( OpenMP )
2+
if( OpenMP_FOUND )
3+
include_directories( ${OpenMP_C_INCLUDE_DIRS} ${OpenMP_CXX_INCLUDE_DIRS} )
4+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
5+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
6+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
7+
else( OpenMP_FOUND )
8+
message(FATAL_ERROR "OpenMP NOT FOUND")
9+
endif( OpenMP_FOUND )

‎cmake/threads.cmake‎

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

0 commit comments

Comments
 (0)