Skip to content

Commit 404f6f4

Browse files
allnesallnes
committed
Merge branch 'master' of https://github.com/learning-process/parallel_programming_course into an/unite-tests
# Conflicts: # modules/core/task/src/task.cpp
2 parents d413536 + 907ca22 commit 404f6f4

6 files changed

Lines changed: 74 additions & 43 deletions

File tree

‎.github/workflows/nightly.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
steps:
1616
- uses: actions/stale@v9
1717
with:
18-
stale-pr-message: 'This pull request is stale for 2 weeks and is going to be closed'
18+
stale-pr-message: 'This pull request is stale for 2 weeks and is going to be closed in a week'
1919
days-before-pr-stale: 14
2020
days-before-issue-stale: -1
21-
days-before-pr-close: 0
21+
days-before-pr-close: 7
2222
days-before-issue-close: -1
2323
stale-pr-label: 'stale'
2424
operations-per-run: 100

‎CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
cmake_minimum_required( VERSION 3.25 )
22

3+
if(DEFINED CMAKE_OSX_SYSROOT AND NOT EXISTS "${CMAKE_OSX_SYSROOT}")
4+
unset(CMAKE_OSX_SYSROOT CACHE)
5+
endif()
6+
37
message( STATUS "Parallel Programming Course (PPC)" )
48
project(parallel_programming_course)
59

‎cmake/onetbb.cmake‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,26 @@
22
include_directories(${CMAKE_SOURCE_DIR}/3rdparty/onetbb/include)
33

44
include(ExternalProject)
5+
56
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}")
7+
set(ppc_onetbb_TEST_COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install/bin" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
178
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")
9+
set(ppc_onetbb_TEST_COMMAND "")
2810
endif()
11+
12+
ExternalProject_Add(ppc_onetbb
13+
SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/onetbb"
14+
PREFIX "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb"
15+
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build"
16+
INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install"
17+
CONFIGURE_COMMAND "${CMAKE_COMMAND}" -S "${CMAKE_SOURCE_DIR}/3rdparty/onetbb/" -B "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build/"
18+
-DCMAKE_CXX_FLAGS="-w" -DCMAKE_C_FLAGS="-w"
19+
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
20+
-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
21+
-G${CMAKE_GENERATOR} -DTBB_TEST=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
22+
BUILD_COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build" --config ${CMAKE_BUILD_TYPE} --parallel
23+
INSTALL_COMMAND "${CMAKE_COMMAND}" --install "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build" --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install"
24+
TEST_COMMAND ${ppc_onetbb_TEST_COMMAND}
25+
)
2926
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install/"
3027
DESTINATION "${CMAKE_INSTALL_PREFIX}")

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

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ msgid ""
99
msgstr ""
1010
"Project-Id-Version: Parallel Programming Course \n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2025-05-26 10:22+0200\n"
12+
"POT-Creation-Date: 2025-05-29 19:31+0200\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515
"Language: en\n"
@@ -32,20 +32,27 @@ msgstr ""
3232

3333
#: ../../../../docs/user_guide/environment_variables.rst:6
3434
msgid ""
35-
"``PPC_NUM_PROC``: Specifies the number of processes to launch. "
36-
"Default: ``1``"
35+
"``PPC_NUM_PROC``: Specifies the number of processes to launch. Default: "
36+
"``1``"
3737
msgstr ""
3838

3939
#: ../../../../docs/user_guide/environment_variables.rst:9
4040
msgid ""
41-
"``PPC_NUM_THREADS``: Specifies the number of threads to use. Default:"
42-
" ``1``"
41+
"``PPC_NUM_THREADS``: Specifies the number of threads to use. Default: "
42+
"``1``"
4343
msgstr ""
4444

4545
#: ../../../../docs/user_guide/environment_variables.rst:12
4646
msgid ""
47-
"``PPC_ASAN_RUN``: Specifies that application is compiler with "
48-
"sanitizers. Used by ``scripts/run_tests.py`` to skip ``valgrind`` runs. "
49-
"Default: ``0``"
47+
"``PPC_ASAN_RUN``: Specifies that application is compiler with sanitizers."
48+
" Used by ``scripts/run_tests.py`` to skip ``valgrind`` runs. Default: "
49+
"``0``"
50+
msgstr ""
51+
52+
#: ../../../../docs/user_guide/environment_variables.rst:15
53+
msgid ""
54+
"``PPC_IGNORE_TEST_TIME_LIMIT``: Specifies that test time limits are "
55+
"ignored. Used by ``scripts/run_tests.py`` to disable time limit "
56+
"enforcement. Default: ``0``"
5057
msgstr ""
5158

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

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ msgid ""
99
msgstr ""
1010
"Project-Id-Version: Parallel Programming Course \n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2025-05-26 10:22+0200\n"
12+
"POT-Creation-Date: 2025-05-29 19:31+0200\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515
"Language: ru\n"
@@ -29,24 +29,44 @@ msgstr "Переменные окружения"
2929
msgid ""
3030
"The following environment variables can be used to configure the "
3131
"project's runtime behavior:"
32-
msgstr "Следующие переменные окружения могут использоваться для настройки поведения программы во время выполнения:"
32+
msgstr ""
33+
"Следующие переменные окружения могут использоваться для настройки "
34+
"поведения программы во время выполнения:"
3335

3436
#: ../../../../docs/user_guide/environment_variables.rst:6
3537
msgid ""
36-
"``PPC_NUM_PROC``: Specifies the number of processes to launch. "
37-
"Default: ``1``"
38-
msgstr "``PPC_NUM_PROC``: задаёт количество запускаемых процессов. По умолчанию: ``1``"
38+
"``PPC_NUM_PROC``: Specifies the number of processes to launch. Default: "
39+
"``1``"
40+
msgstr ""
41+
"``PPC_NUM_PROC``: задаёт количество запускаемых процессов. По умолчанию: "
42+
"``1``"
3943

4044
#: ../../../../docs/user_guide/environment_variables.rst:9
4145
msgid ""
42-
"``PPC_NUM_THREADS``: Specifies the number of threads to use. Default:"
43-
" ``1``"
44-
msgstr "``PPC_NUM_THREADS``: задаёт количество используемых потоков. По умолчанию: ``1``"
46+
"``PPC_NUM_THREADS``: Specifies the number of threads to use. Default: "
47+
"``1``"
48+
msgstr ""
49+
"``PPC_NUM_THREADS``: задаёт количество используемых потоков. По "
50+
"умолчанию: ``1``"
4551

4652
#: ../../../../docs/user_guide/environment_variables.rst:12
4753
msgid ""
48-
"``PPC_ASAN_RUN``: Specifies that application is compiler with "
49-
"sanitizers. Used by ``scripts/run_tests.py`` to skip ``valgrind`` runs. "
50-
"Default: ``0``"
51-
msgstr "``PPC_ASAN_RUN``: указывает, что приложение собрано с санитайзерами. Используется в ``scripts/run_tests.py`` для пропуска запусков под ``valgrind``. По умолчанию: ``0``"
54+
"``PPC_ASAN_RUN``: Specifies that application is compiler with sanitizers."
55+
" Used by ``scripts/run_tests.py`` to skip ``valgrind`` runs. Default: "
56+
"``0``"
57+
msgstr ""
58+
"``PPC_ASAN_RUN``: указывает, что приложение собрано с санитайзерами. "
59+
"Используется в ``scripts/run_tests.py`` для пропуска запусков под "
60+
"``valgrind``. По умолчанию: ``0``"
61+
62+
#: ../../../../docs/user_guide/environment_variables.rst:15
63+
#, fuzzy
64+
msgid ""
65+
"``PPC_IGNORE_TEST_TIME_LIMIT``: Specifies that test time limits are "
66+
"ignored. Used by ``scripts/run_tests.py`` to disable time limit "
67+
"enforcement. Default: ``0``"
68+
msgstr ""
69+
"``PPC_IGNORE_TEST_TIME_LIMIT``: указывает, что ограничения по времени выполнения тестов игнорируются. "
70+
"Используется в ``scripts/run_tests.py`` для отключения контроля ограничений по времени. "
71+
"По умолчанию: ``0``"
5272

‎docs/user_guide/environment_variables.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ The following environment variables can be used to configure the project's runti
1111

1212
- ``PPC_ASAN_RUN``: Specifies that application is compiler with sanitizers. Used by ``scripts/run_tests.py`` to skip ``valgrind`` runs.
1313
Default: ``0``
14+
15+
- ``PPC_IGNORE_TEST_TIME_LIMIT``: Specifies that test time limits are ignored. Used by ``scripts/run_tests.py`` to disable time limit enforcement.
16+
Default: ``0``

0 commit comments

Comments
 (0)