Skip to content

Commit 2dba556

Browse files
committed
2 parents 271277d + 998f3fa commit 2dba556

9 files changed

Lines changed: 19 additions & 15 deletions

File tree

.github/workflows/openssf-scorecard.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ permissions: read-all
99

1010
jobs:
1111
analysis:
12+
if: ${{ github.repository == 'learning-process/parallel_programming_course' }}
1213
name: Scorecard analysis
1314
runs-on: ubuntu-latest
1415
permissions:

.github/workflows/pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
name: scoreboard
104104
path: ./build/scoreboard/html/
105105
deploy-pages:
106-
if: github.ref == 'refs/heads/master'
106+
if: ${{ !github.event.repository.fork && github.ref == 'refs/heads/master' }}
107107
needs:
108108
- build-sphinx
109109
- build-scoreboard

.github/workflows/update-pre-commit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ permissions:
1414

1515
jobs:
1616
update-pre-commit:
17+
if: ${{ github.repository == 'learning-process/parallel_programming_course' }}
1718
runs-on: ubuntu-latest
1819
steps:
1920
- name: Checkout repository

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ repos:
2222

2323
# Ruff Python linter
2424
- repo: https://github.com/charliermarsh/ruff-pre-commit
25-
rev: v0.14.1
25+
rev: v0.14.2
2626
hooks:
2727
- id: ruff
2828
args: [--fix]

cmake/gtest.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ ExternalProject_Add(
1919
$<$<BOOL:MSVC>:-Dgtest_force_shared_crt=ON>
2020
BUILD_COMMAND
2121
"${CMAKE_COMMAND}" --build
22-
"${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/build" --config
23-
${CMAKE_BUILD_TYPE} --parallel
22+
"${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/build" --config $<CONFIG>
23+
--parallel
2424
INSTALL_COMMAND
2525
"${CMAKE_COMMAND}" --install
26-
"${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/build" --prefix
27-
"${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/install")
26+
"${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/build" --config $<CONFIG>
27+
--prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/install")
2828

2929
function(ppc_link_gtest exec_func_lib)
3030
# Add external project include directories

cmake/json.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ ExternalProject_Add(
1616
-DJSON_BuildTests=OFF
1717
BUILD_COMMAND
1818
"${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/build"
19-
--config ${CMAKE_BUILD_TYPE} --parallel
19+
--config $<CONFIG> --parallel
2020
INSTALL_COMMAND
2121
"${CMAKE_COMMAND}" --install "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/build"
22-
--prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/install")
22+
--config $<CONFIG> --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/install")
2323

2424
function(ppc_link_json exec_func_lib)
2525
# Add external project include directories

cmake/libenvpp.cmake

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ ExternalProject_Add(
1515
-DLIBENVPP_EXAMPLES=OFF
1616
BUILD_COMMAND
1717
"${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build"
18-
--config ${CMAKE_BUILD_TYPE} --parallel
18+
--config $<CONFIG> --parallel
1919
INSTALL_COMMAND
2020
"${CMAKE_COMMAND}" --install
21-
"${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build" --prefix
22-
"${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/install")
21+
"${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build" --config $<CONFIG>
22+
--prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/install")
2323

2424
string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower)
2525
if(cmake_build_type_lower STREQUAL "debug")
@@ -48,5 +48,6 @@ function(ppc_link_envpp exec_func_lib)
4848
target_link_directories(${exec_func_lib} PUBLIC
4949
"${CMAKE_BINARY_DIR}/ppc_libenvpp/build")
5050
target_link_libraries(${exec_func_lib} PUBLIC ${PPC_ENVPP_LIB_NAME})
51-
target_link_libraries(${exec_func_lib} PUBLIC ${PPC_FMT_LIB_NAME})
51+
target_link_libraries(${exec_func_lib} PUBLIC $<$<CONFIG:Debug>:fmtd>
52+
$<$<NOT:$<CONFIG:Debug>>:fmt>)
5253
endfunction()

cmake/onetbb.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ if(NOT ENABLE_SYSTEM_TBB)
2929
-DTBB_TEST=OFF
3030
BUILD_COMMAND
3131
"${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build"
32-
--config ${CMAKE_BUILD_TYPE} --parallel
32+
--config $<CONFIG> --parallel
3333
INSTALL_COMMAND
3434
"${CMAKE_COMMAND}" --install
35-
"${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build" --prefix
35+
"${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build" --config $<CONFIG> --prefix
3636
"${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install"
3737
TEST_COMMAND ${ppc_onetbb_TEST_COMMAND})
3838

tasks/example_threads/tests/functional/main.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ class NesterovARunFuncTestsThreads : public ppc::util::BaseRunFuncTests<InType,
6767

6868
namespace {
6969

70-
TEST_P(NesterovARunFuncTestsThreads, MatmulFromPic) {
70+
// TODO(allnes): Fix & enable back this test
71+
TEST_P(NesterovARunFuncTestsThreads, DISABLED_MatmulFromPic) {
7172
ExecuteTest(GetParam());
7273
}
7374

0 commit comments

Comments
 (0)