Skip to content

Commit ac67b49

Browse files
junghansmasterleinadhkaiser
authored
CI: fold HPX build into default workflow (kokkos#7331)
* Disable deprecation warnings in TestHPX_InParallel.cpp * CI: fold HPX build into default workflow * CI: update comment on handle issue --------- Co-authored-by: Daniel Arndt <arndtd@ornl.gov> Co-authored-by: Hartmut Kaiser <hartmut.kaiser@gmail.com>
1 parent 473552d commit ac67b49

File tree

4 files changed

+19
-93
lines changed

4 files changed

+19
-93
lines changed

.github/workflows/continuous-integration-linux-hpx.yml

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

.github/workflows/continuous-integration-linux.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,13 @@ jobs:
8989
stdcxx: '17'
9090
cxx_extra_flags: '-m32'
9191
cmake_extra_opts: '-DKokkos_ENABLE_HWLOC=OFF'
92+
- arch: 'x64'
93+
distro: 'fedora:latest'
94+
cxx: 'g++'
95+
cmake_build_type: 'RelWithDebInfo'
96+
backend: 'HPX'
97+
stdcxx: '17'
98+
cmake_extra_opts: '-DCMAKE_CXX_CLANG_TIDY="clang-tidy;-warnings-as-errors=*"'
9299
runs-on: ${{ matrix.arch == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
93100
container:
94101
image: ghcr.io/kokkos/ci-containers/${{ matrix.distro }}
@@ -125,6 +132,10 @@ jobs:
125132
echo "flang-new found"
126133
echo "FC=flang-new" >> $GITHUB_ENV
127134
fi
135+
# FIXME_HPX: workaround for standard library calling OOM handler for failing nothrow new, remove once fixed
136+
- name: maybe_set_hpx_vars
137+
if: ${{ matrix.backend == 'HPX' }}
138+
run: echo "HPX_HANDLE_FAILED_NEW=0" >> $GITHUB_ENV
128139
- name: Configure Kokkos
129140
run: |
130141
cmake -B builddir \

.github/workflows/continuous-integration-stager.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ jobs:
4545
needs: [initial-check, clang-format-check, cmake-format-check]
4646
uses: ./.github/workflows/continuous-integration-linux.yml
4747

48-
linux-x64-hpx:
49-
needs: [initial-check, clang-format-check, cmake-format-check]
50-
uses: ./.github/workflows/continuous-integration-linux-hpx.yml
51-
5248
osx-x64:
5349
needs: [initial-check, clang-format-check, cmake-format-check]
5450
uses: ./.github/workflows/continuous-integration-osx.yml

core/unit_test/hpx/TestHPX_InParallel.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
#include <gtest/gtest.h>
1818
#include <Kokkos_Core.hpp>
1919

20+
#ifdef KOKKOS_ENABLE_DEPRECATION_WARNINGS
21+
KOKKOS_IMPL_DISABLE_DEPRECATED_WARNINGS_PUSH()
22+
#endif
23+
2024
// These tests specifically check that work dispatched to independent instances
2125
// is synchronized correctly on fences. A previous bug that this protects
2226
// against is work being mistakenly dispatched to the default instance, but the
@@ -181,3 +185,7 @@ TEST(hpx, in_parallel_scan_range_policy) {
181185
}
182186
}
183187
} // namespace
188+
189+
#ifdef KOKKOS_ENABLE_DEPRECATION_WARNINGS
190+
KOKKOS_IMPL_DISABLE_DEPRECATED_WARNINGS_POP()
191+
#endif

0 commit comments

Comments
 (0)