Skip to content

Commit 89272d1

Browse files
fix execution policy api
1 parent 4c017e0 commit 89272d1

6 files changed

Lines changed: 9 additions & 43 deletions

File tree

.github/workflows/CI.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,9 @@ jobs:
155155
- name: Run tests
156156
run: |
157157
cd htool/build
158-
export OMP_NUM_THREADS=2
159-
${{ matrix.ASAN_OPTIONS }} ctest -j 4 --output-on-failure
158+
# export OMP_NUM_THREADS=2
159+
${{ matrix.ASAN_OPTIONS }} ctest -j 4 -LE "mpi" --output-on-failure
160+
${{ matrix.ASAN_OPTIONS }} ctest -L "mpi" --output-on-failure
160161
161162
- name: Build examples
162163
run: |

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ All notable changes to this project will be documented in this file.
3232

3333
### Fixed
3434

35+
- Fix execution header include, PR #77
3536
- Fix wrong ordering of eigenvalues in solve_EVP_3 in some specific cases, PR #76
3637

3738
## [1.0.1] - 2026-01-02

include/htool/hmatrix/execution_policies.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33

44
#include "hmatrix.hpp"
55
#include <vector>
6-
7-
#if defined(__cpp_lib_execution) && __cplusplus >= 201703L
6+
#if __has_include(<execution>)
87
# include <execution>
8+
#endif
9+
#if defined(__cpp_lib_execution) && __cplusplus >= 201703L
910
namespace exec_compat {
1011
using parallel_policy = std::execution::parallel_policy;
1112
inline constexpr auto par = std::execution::par;

tests/functional_tests/geometry/CMakeLists.txt

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

tests/functional_tests/geometry/test_geometry_file.cpp

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

tests/functional_tests/solvers/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ set_tests_properties(Test_solver_double_1 PROPERTIES LABELS "mpi")
2929
add_test(NAME Test_solver_double_2 COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/Test_solver_double ${Test_solver_ARGS})
3030
set_tests_properties(Test_solver_double_2 PROPERTIES LABELS "mpi")
3131
add_test(NAME Test_solver_double_3 COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 3 ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/Test_solver_double ${Test_solver_ARGS})
32-
set_tests_properties(Test_solver_double_3 PROPERTIES LABELS "mpi")
32+
set_tests_properties(Test_solver_double_3 PROPERTIES LABELS "mpi" TIMEOUT 3000)
3333
add_test(NAME Test_solver_double_4 COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/Test_solver_double ${Test_solver_ARGS})
34-
set_tests_properties(Test_solver_double_4 PROPERTIES LABELS "mpi")
34+
set_tests_properties(Test_solver_double_4 PROPERTIES LABELS "mpi" TIMEOUT 3000)
3535

3636
add_test(NAME Test_solver_complex_double_1 COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 1 ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/Test_solver_complex_double ${Test_solver_ARGS})
3737
set_tests_properties(Test_solver_complex_double_1 PROPERTIES LABELS "mpi")

0 commit comments

Comments
 (0)