Skip to content

Commit 21013d6

Browse files
committed
fix: minor style cleanup
1 parent 5c68b18 commit 21013d6

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88
- master
99
- stable
1010
- v*
11-
- support_pgc
1211

1312
jobs:
1413
standard:
@@ -313,13 +312,13 @@ jobs:
313312

314313
- name: Install dependencies
315314
run: python3 -m pip install cmake -r tests/requirements.txt --prefer-binary
316-
315+
317316
- name: Install NVidia HPC SDK
318-
run: yum -y install https://developer.download.nvidia.com/hpc-sdk/nvhpc-20-7-20.7-1.x86_64.rpm https://developer.download.nvidia.com/hpc-sdk/nvhpc-2020-20.7-1.x86_64.rpm
317+
run: yum -y install https://developer.download.nvidia.com/hpc-sdk/nvhpc-20-7-20.7-1.x86_64.rpm https://developer.download.nvidia.com/hpc-sdk/nvhpc-2020-20.7-1.x86_64.rpm
319318

320319
- name: Install modules
321-
run: yum -y install environment-modules
322-
320+
run: yum -y install environment-modules
321+
323322
- name: Configure
324323
shell: bash
325324
run: |

tests/CMakeLists.txt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ set(PYBIND11_TEST_FILES
8888
test_tagbased_polymorphic.cpp
8989
test_union.cpp
9090
#AV this fails with PGI test_virtual_functions.cpp
91-
)
91+
)
9292

9393
# Invoking cmake with something like:
9494
# cmake -DPYBIND11_TEST_OVERRIDE="test_callbacks.cpp;test_pickling.cpp" ..
@@ -265,15 +265,14 @@ foreach(target ${test_targets})
265265
if(MSVC)
266266
target_compile_options(${target} PRIVATE /utf-8)
267267
endif()
268-
if (${CMAKE_CXX_COMPILER_ID} MATCHES "PGI")
269-
if (WIN32)
270-
target_compile_options(${target} PRIVATE -Wc,--pending_instantiations=0 )
268+
if(${CMAKE_CXX_COMPILER_ID} MATCHES "PGI")
269+
if(WIN32)
270+
target_compile_options(${target} PRIVATE -Wc,--pending_instantiations=0)
271271
else()
272-
target_compile_options(${target} PRIVATE -Wc,--pending_instantiations=0 -D__GCC_ATOMIC_TEST_AND_SET_TRUEVAL=1)
272+
target_compile_options(${target} PRIVATE -Wc,--pending_instantiations=0
273+
-D__GCC_ATOMIC_TEST_AND_SET_TRUEVAL=1)
273274
endif()
274275
endif()
275-
276-
277276

278277
if(EIGEN3_FOUND)
279278
target_link_libraries(${target} PRIVATE Eigen3::Eigen)
@@ -365,8 +364,8 @@ add_custom_command(
365364
${CMAKE_CURRENT_BINARY_DIR}/sosize-$<TARGET_FILE_NAME:pybind11_tests>.txt)
366365

367366
# Test embedding the interpreter. Provides the `cpptest` target.
368-
if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "PGI")
369-
add_subdirectory(test_embed)
367+
if(NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "PGI")
368+
add_subdirectory(test_embed)
370369
endif()
371370
# Test CMake build using functions and targets from subdirectory or installed location
372371
add_subdirectory(test_cmake_build)

0 commit comments

Comments
 (0)