Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove clang 11 and 12 CI configurations #1284

Merged
merged 1 commit into from
Oct 30, 2024
Merged

Remove clang 11 and 12 CI configurations #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 0 additions & 51 deletions .gitlab/includes/clang11_pipeline.yml
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions .gitlab/includes/clang12_pipeline.yml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions .gitlab/includes/clang15_pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ include:
SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} malloc=system cxxstd=$CXXSTD ^boost@1.80.0 \
^hwloc@2.8.0"
CMAKE_FLAGS: "-DPIKA_WITH_CXX_STANDARD=$CXXSTD -DPIKA_WITH_MALLOC=system \
-DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON -DPIKA_WITH_UNITY_BUILD=OFF \
-DPIKA_WITH_THREAD_STACK_MMAP=OFF"
-DPIKA_WITH_MAX_CPU_COUNT=256 -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON \
-DPIKA_WITH_UNITY_BUILD=OFF -DPIKA_WITH_THREAD_STACK_MMAP=OFF"

clang15_spack_compiler_image:
extends:
Expand Down
6 changes: 5 additions & 1 deletion .gitlab/includes/clang16_pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ include:
SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} malloc=system cxxstd=$CXXSTD ^boost@1.82.0 \
^hwloc@2.9.1"
CMAKE_FLAGS: "-DPIKA_WITH_CXX_STANDARD=$CXXSTD -DPIKA_WITH_MALLOC=system \
-DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON"
-DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON -DPIKA_WITH_COROUTINE_COUNTERS=ON \
-DPIKA_WITH_THREAD_IDLE_RATES=ON \
-DPIKA_WITH_THREAD_CREATION_AND_CLEANUP_RATES=ON \
-DPIKA_WITH_THREAD_CUMULATIVE_COUNTS=ON -DPIKA_WITH_THREAD_QUEUE_WAITTIME=ON \
-DPIKA_WITH_THREAD_STEALING_COUNTS=ON -DPIKA_WITH_STACKTRACES=OFF"

clang16_spack_compiler_image:
extends:
Expand Down
2 changes: 0 additions & 2 deletions .gitlab/pipelines_on_merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ include:
- local: '.gitlab/includes/gcc12_hip5_pipeline.yml'
- local: '.gitlab/includes/gcc13_santis_pipeline.yml'
- local: '.gitlab/includes/gcc14_pipeline.yml'
- local: '.gitlab/includes/clang11_pipeline.yml'
- local: '.gitlab/includes/clang12_pipeline.yml'
- local: '.gitlab/includes/clang13_pipeline.yml'
- local: '.gitlab/includes/clang15_pipeline.yml'
- local: '.gitlab/includes/clang16_pipeline.yml'
Expand Down
18 changes: 6 additions & 12 deletions libs/pika/execution/include/pika/execution/algorithms/let_error.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,12 @@ namespace pika::let_error_detail {
// in CUDA mode (where >>> also has a different meaning in kernel
// launches).
template <template <typename...> class Tuple, template <typename...> class Variant>
using value_types = pika::util::detail::unique_concat_t<
predecessor_value_types<Tuple, Variant>,
pika::util::detail::concat_pack_of_packs_t<pika::util::detail::transform_t<
successor_sender_types<Variant>,
pika::execution::experimental::detail::value_types<Tuple, Variant>::template apply
# if defined(PIKA_CLANG_VERSION) && PIKA_CLANG_VERSION < 110000
>
//
>>;
# else
>>>;
# endif
using value_types =
pika::util::detail::unique_concat_t<predecessor_value_types<Tuple, Variant>,
pika::util::detail::concat_pack_of_packs_t<
pika::util::detail::transform_t<successor_sender_types<Variant>,
pika::execution::experimental::detail::value_types<Tuple,
Variant>::template apply>>>;

template <template <typename...> class Variant>
using error_types = pika::util::detail::unique_t<pika::util::detail::prepend_t<
Expand Down
10 changes: 2 additions & 8 deletions libs/pika/execution/include/pika/execution/algorithms/let_value.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,8 @@ namespace pika::let_value_detail {
template <template <typename...> class Tuple, template <typename...> class Variant>
using value_types = pika::util::detail::unique_t<pika::util::detail::concat_pack_of_packs_t<
pika::util::detail::transform_t<successor_sender_types<Tuple, Variant>,
pika::execution::experimental::detail::value_types<Tuple, Variant>::template apply
# if defined(PIKA_CLANG_VERSION) && PIKA_CLANG_VERSION < 110000
>
//
>>;
# else
>>>;
# endif
pika::execution::experimental::detail::value_types<Tuple,
Variant>::template apply>>>;

// pika::util::detail::pack acts as a concrete type in place of Tuple. It is
// required for computing successor_sender_types, but disappears
Expand Down
Loading