Skip to content

Commit e07ea3d

Browse files
allnesallnes
committed
Remove keys
1 parent 539669a commit e07ea3d

13 files changed

Lines changed: 74 additions & 206 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 4 additions & 11 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:
@@ -518,8 +515,7 @@ jobs:
518515
run: >
519516
cmake -S . -B build
520517
-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"
518+
-G Ninja -DCMAKE_C_FLAGS="-I$(brew --prefix)/opt/libomp/include"
523519
-DCMAKE_CXX_FLAGS="-I$(brew --prefix)/opt/libomp/include"
524520
-D CMAKE_BUILD_TYPE=RELEASE -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
525521
-DCMAKE_INSTALL_PREFIX=install
@@ -666,7 +662,6 @@ jobs:
666662
run: >
667663
cmake -S . -B build -G Ninja -D CMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl
668664
-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
670665
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
671666
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=install
672667
- name: Build project
@@ -816,7 +811,6 @@ jobs:
816811
run: >
817812
cmake -S . -B build -G Ninja -D CMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
818813
-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
820814
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
821815
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=install
822816
env:
@@ -944,7 +938,6 @@ jobs:
944938
run: >
945939
cmake -S . -B build
946940
-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
948941
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
949942
-D CMAKE_BUILD_TYPE=RELEASE
950943
-D CMAKE_VERBOSE_MAKEFILE=ON

‎CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ include(cmake/sanitizers.cmake)
1515
message( STATUS "PPC step: Setup parallel programming technologies" )
1616
include(cmake/mpi.cmake)
1717
include(cmake/openmp.cmake)
18-
include(cmake/threads.cmake)
1918
include(cmake/onetbb.cmake)
2019

2120
######################### External projects #########################

‎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.

‎docs/locale/en/LC_MESSAGES/user_guide/build.po‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,28 +36,6 @@ msgstr ""
3636
msgid "*Help on CMake keys:*"
3737
msgstr ""
3838

39-
#: ../../user_guide/build.rst:15
40-
msgid ""
41-
"``-D USE_SEQ=ON`` enable ``Sequential`` labs (based on OpenMP's "
42-
"CMakeLists.txt)."
43-
msgstr ""
44-
45-
#: ../../user_guide/build.rst:16
46-
msgid "``-D USE_MPI=ON`` enable ``MPI`` labs."
47-
msgstr ""
48-
49-
#: ../../user_guide/build.rst:17
50-
msgid "``-D USE_OMP=ON`` enable ``OpenMP`` labs."
51-
msgstr ""
52-
53-
#: ../../user_guide/build.rst:18
54-
msgid "``-D USE_TBB=ON`` enable ``TBB`` labs."
55-
msgstr ""
56-
57-
#: ../../user_guide/build.rst:19
58-
msgid "``-D USE_STL=ON`` enable ``std::thread`` labs."
59-
msgstr ""
60-
6139
#: ../../user_guide/build.rst:20
6240
msgid "``-D USE_FUNC_TESTS=ON`` enable functional tests."
6341
msgstr ""

‎docs/locale/ru/LC_MESSAGES/user_guide/build.po‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,6 @@ msgstr "**Конфигурация проекта**: ``Makefile``, ``.sln``, и
3737
msgid "*Help on CMake keys:*"
3838
msgstr "*Важные CMake ключи для конфигурации проекта:*"
3939

40-
#: ../../user_guide/build.rst:15
41-
msgid ""
42-
"``-D USE_SEQ=ON`` enable ``Sequential`` labs (based on OpenMP's "
43-
"CMakeLists.txt)."
44-
msgstr ""
45-
"``-D USE_SEQ=ON`` включает ``последовательные`` лабораторные работы."
46-
47-
#: ../../user_guide/build.rst:16
48-
msgid "``-D USE_MPI=ON`` enable ``MPI`` labs."
49-
msgstr "``-D USE_MPI=ON`` включает ``MPI`` лабораторные работы."
50-
51-
#: ../../user_guide/build.rst:17
52-
msgid "``-D USE_OMP=ON`` enable ``OpenMP`` labs."
53-
msgstr "``-D USE_OMP=ON`` включает ``OpenMP`` лабораторные работы."
54-
55-
#: ../../user_guide/build.rst:18
56-
msgid "``-D USE_TBB=ON`` enable ``TBB`` labs."
57-
msgstr "``-D USE_TBB=ON`` включает ``TBB`` лабораторные работы."
58-
59-
#: ../../user_guide/build.rst:19
60-
msgid "``-D USE_STL=ON`` enable ``std::thread`` labs."
61-
msgstr "``-D USE_STL=ON`` включает ``std::thread`` лабораторные работы."
62-
6340
#: ../../user_guide/build.rst:20
6441
msgid "``-D USE_FUNC_TESTS=ON`` enable functional tests."
6542
msgstr "``-D USE_FUNC_TESTS=ON`` включает функциональные тесты."

0 commit comments

Comments
 (0)