Skip to content

Commit

Permalink
Merge branch 'master' into contains/contains_subrange
Browse files Browse the repository at this point in the history
  • Loading branch information
Zak-K-Abdi authored Sep 5, 2024
2 parents bdbd643 + f4ff6e8 commit 1b22fae
Show file tree
Hide file tree
Showing 430 changed files with 17,943 additions and 3,890 deletions.
9 changes: 8 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,14 @@ jobs:
name: Running Regressions Tests
when: always
command: |
ctest --timeout 60 -T test --no-compress-output --output-on-failure -R tests.regressions
ctest \
--timeout 60 \
-T test \
--no-compress-output \
--output-on-failure \
-R tests.regressions \
--exclude-regex \
"tests.regressions.modules.threading_base.thread_stacksize_current"
- run:
<<: *convert_xml
- run:
Expand Down
6 changes: 2 additions & 4 deletions .circleci/tests.unit1.algorithms
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

tests.unit.modules.algorithms.algorithms.adjacentdifference
tests.unit.modules.algorithms.algorithms.adjacentdifference_sender
tests.unit.modules.algorithms.algorithms.adjacentfind
tests.unit.modules.algorithms.algorithms.adjacentfind_binary
tests.unit.modules.algorithms.algorithms.all_of
Expand All @@ -31,7 +30,6 @@ tests.unit.modules.algorithms.algorithms.exclusive_scan_validate
tests.unit.modules.algorithms.algorithms.fill
tests.unit.modules.algorithms.algorithms.filln
tests.unit.modules.algorithms.algorithms.find
tests.unit.modules.algorithms.algorithms.find_sender
tests.unit.modules.algorithms.algorithms.findend
tests.unit.modules.algorithms.algorithms.findfirstof
tests.unit.modules.algorithms.algorithms.findfirstof_binary
Expand All @@ -40,7 +38,6 @@ tests.unit.modules.algorithms.algorithms.findifnot
tests.unit.modules.algorithms.algorithms.foreach
tests.unit.modules.algorithms.algorithms.foreach_executors
tests.unit.modules.algorithms.algorithms.foreach_prefetching
tests.unit.modules.algorithms.algorithms.foreach_sender
tests.unit.modules.algorithms.algorithms.foreach_scheduler
tests.unit.modules.algorithms.algorithms.foreachn
tests.unit.modules.algorithms.algorithms.foreachn_exception
Expand All @@ -53,7 +50,6 @@ tests.unit.modules.algorithms.algorithms.for_loop_n
tests.unit.modules.algorithms.algorithms.for_loop_n_strided
tests.unit.modules.algorithms.algorithms.for_loop_reduction
tests.unit.modules.algorithms.algorithms.for_loop_reduction_async
tests.unit.modules.algorithms.algorithms.for_loop_sender
tests.unit.modules.algorithms.algorithms.for_loop_strided
tests.unit.modules.algorithms.algorithms.generate
tests.unit.modules.algorithms.algorithms.generaten
Expand All @@ -74,3 +70,5 @@ tests.unit.modules.algorithms.algorithms.min_element
tests.unit.modules.algorithms.algorithms.minmax_element
tests.unit.modules.algorithms.algorithms.mismatch
tests.unit.modules.algorithms.algorithms.mismatch_binary
tests.unit.modules.algorithms.algorithms.move
tests.unit.modules.algorithms.algorithms.nth_element
5 changes: 0 additions & 5 deletions .circleci/tests.unit2.algorithms
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
# Distributed under the Boost Software License, Version 1.0. (See accompanying
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

tests.unit.modules.algorithms.algorithms.move
tests.unit.modules.algorithms.algorithms.nth_element
tests.unit.modules.algorithms.algorithms.none_of
tests.unit.modules.algorithms.algorithms.parallel_sort
tests.unit.modules.algorithms.algorithms.partial_sort
Expand All @@ -15,7 +13,6 @@ tests.unit.modules.algorithms.algorithms.partition_copy
tests.unit.modules.algorithms.algorithms.reduce_
tests.unit.modules.algorithms.algorithms.reduce_by_key
tests.unit.modules.algorithms.algorithms.remove
tests.unit.modules.algorithms.algorithms.remove
tests.unit.modules.algorithms.algorithms.remove1
tests.unit.modules.algorithms.algorithms.remove2
tests.unit.modules.algorithms.algorithms.remove_if
Expand All @@ -28,10 +25,8 @@ tests.unit.modules.algorithms.algorithms.replace_copy
tests.unit.modules.algorithms.algorithms.replace_copy_if
tests.unit.modules.algorithms.algorithms.reverse
tests.unit.modules.algorithms.algorithms.reverse_copy
tests.unit.modules.algorithms.algorithms.reverse_sender
tests.unit.modules.algorithms.algorithms.rotate
tests.unit.modules.algorithms.algorithms.rotate_copy
tests.unit.modules.algorithms.algorithms.rotate_sender
tests.unit.modules.algorithms.algorithms.search
tests.unit.modules.algorithms.algorithms.searchn
tests.unit.modules.algorithms.algorithms.set_difference
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ jobs:
queries: security-and-quality

- name: Install CMake
uses: ssrobins/install-cmake@v1
uses: jwlawson/[email protected]
with:
cmake-version: '3.22.x'

- name: Install Ninja
uses: seanmiddleditch/gha-setup-ninja@master
Expand Down Expand Up @@ -80,6 +82,7 @@ jobs:
# filter out all files from downloaded dependencies
patterns: |
-**/_deps/**
-**/concurrentqueue.hpp
input: sarif-results/cpp.sarif
output: sarif-results/cpp.sarif

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/macos_debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,5 @@ jobs:
tests.unit.modules.segmented_algorithms.distributed.tcp.partitioned_vector|\
tests.unit.threads.distributed.tcp.thread_stacksize|\
tests.unit.topology.numa_allocator|\
tests.unit.modules.runtime_components.distributed.tcp.migrate_polymorphic_component"
tests.unit.modules.runtime_components.distributed.tcp.migrate_polymorphic_component|\
tests.unit.modules.executors.limiting_executor"
3 changes: 2 additions & 1 deletion .github/workflows/macos_debug_fetch_boost.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,5 @@ jobs:
tests.unit.modules.segmented_algorithms.distributed.tcp.partitioned_vector|\
tests.unit.threads.distributed.tcp.thread_stacksize|\
tests.unit.topology.numa_allocator|\
tests.unit.modules.runtime_components.distributed.tcp.migrate_polymorphic_component"
tests.unit.modules.runtime_components.distributed.tcp.migrate_polymorphic_component|\
tests.unit.modules.executors.limiting_executor"
3 changes: 2 additions & 1 deletion .github/workflows/macos_debug_fetch_hwloc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,5 @@ jobs:
tests.unit.modules.segmented_algorithms.distributed.tcp.partitioned_vector|\
tests.unit.threads.distributed.tcp.thread_stacksize|\
tests.unit.topology.numa_allocator|\
tests.unit.modules.runtime_components.distributed.tcp.migrate_polymorphic_component"
tests.unit.modules.runtime_components.distributed.tcp.migrate_polymorphic_component|\
tests.unit.modules.executors.limiting_executor"
6 changes: 4 additions & 2 deletions .jenkins/lsu-perftests/env-perftests.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Copyright (c) 2020 ETH Zurich
# Copyright (c) 2022 Hartmut Kaiser
# Copyright (c) 2024 Alireza Kheirkhahan

#
# SPDX-License-Identifier: BSL-1.0
# Distributed under the Boost Software License, Version 1.0. (See accompanying
Expand All @@ -8,8 +10,8 @@ set -eu

module purge
module load cmake
module load llvm/13
module load boost/1.78.0-release
module load llvm/18
module load boost/1.85.0-release
module load hwloc
module load openmpi

Expand Down
3 changes: 2 additions & 1 deletion .jenkins/lsu-perftests/launch_perftests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ for executable in "${hpx_targets[@]}"; do

# Run performance tests
${perftests_dir}/driver.py -v -l $logfile_tmp perftest run --local True \
--run_output $result --targets-and-opts "${run_command[@]}" --n_executions $n_executions ||
--run_output $result --targets-and-opts "${run_command[@]}" \
--n_executions $n_executions -e $envfile ||
{
echo 'Running failed'
test_errors=1
Expand Down
3 changes: 2 additions & 1 deletion .jenkins/lsu/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

// Copyright (c) 2020 ETH Zurich
// Copyright (c) 2022 Hartmut Kaiser
// Copyright (c) 2024 Alireza Kheirkhahan
//
// SPDX-License-Identifier: BSL-1.0
// Distributed under the Boost Software License, Version 1.0. (See accompanying
Expand Down Expand Up @@ -36,7 +37,7 @@ pipeline {
axes {
axis {
name 'configuration_name'
values 'gcc-10', 'gcc-11', 'gcc-12', 'gcc-13', 'clang-12-apex', 'clang-12', 'clang-13', 'clang-14', 'clang-15', 'clang-16', 'clang-17','gcc-12-cuda-12', 'gcc-13-cuda-12-dgx', 'hipcc'
values 'gcc-11', 'gcc-12', 'gcc-13', 'gcc-14', 'clang-17-apex', 'clang-16', 'clang-17', 'clang-18', 'gcc-12-cuda-12', 'gcc-12-cuda-12-dgx', 'hipcc'
}
axis {
name 'build_type'
Expand Down
39 changes: 0 additions & 39 deletions .jenkins/lsu/env-clang-12.sh

This file was deleted.

39 changes: 0 additions & 39 deletions .jenkins/lsu/env-clang-13.sh

This file was deleted.

39 changes: 0 additions & 39 deletions .jenkins/lsu/env-clang-14.sh

This file was deleted.

5 changes: 4 additions & 1 deletion .jenkins/lsu/env-clang-16.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (c) 2020 ETH Zurich
# Copyright (c) 2024 Alireza Kheirkhahan
#
# SPDX-License-Identifier: BSL-1.0
# Distributed under the Boost Software License, Version 1.0. (See accompanying
Expand All @@ -10,7 +11,6 @@ module load llvm/16
module load boost/1.82.0-${build_type,,}
module load hwloc
module load openmpi
module load pwrapi/1.1.1

export HPXRUN_RUNWRAPPER=srun
export CXX_STD="20"
Expand All @@ -37,3 +37,6 @@ configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON"
# Make sure HWLOC does not report 'cores'. This is purely an option to enable
# testing the topology code under conditions close to those on FreeBSD.
configure_extra_options+=" -DHPX_TOPOLOGY_WITH_ADDITIONAL_HWLOC_TESTING=ON"

# enable additional handshaking in MPI parcelport
configure_extra_options+=" -DHPX_WITH_TESTS_COMMAND_LINE=--hpx:ini=hpx.parcel.mpi.ack_handshake!=1"
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@

module purge
module load cmake
module load llvm/12
module load boost/1.75.0-${build_type,,}
module load llvm/17
module load boost/1.84.0-${build_type,,}
module load hwloc
module load openmpi
module load pwrapi/1.1.1
module load papi/7.0.1
module load otf2/3.0.3
module load papi
module load otf2

export HPXRUN_RUNWRAPPER=srun
export CXX_STD="20"
Expand Down
4 changes: 2 additions & 2 deletions .jenkins/lsu/env-clang-17.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (c) 2020 ETH Zurich
# Copyright (c) 2024 Alireza Kheirkhahan
#
# SPDX-License-Identifier: BSL-1.0
# Distributed under the Boost Software License, Version 1.0. (See accompanying
Expand All @@ -7,10 +8,9 @@
module purge
module load cmake
module load llvm/17
module load boost/1.83.0-${build_type,,}
module load boost/1.84.0-${build_type,,}
module load hwloc
module load openmpi
module load pwrapi/1.1.1

export HPXRUN_RUNWRAPPER=srun
export CXX_STD="20"
Expand Down
6 changes: 3 additions & 3 deletions .jenkins/lsu/env-clang-15.sh → .jenkins/lsu/env-clang-18.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Copyright (c) 2020 ETH Zurich
# Copyright (c) 2024 Alireza Kheirkhahan
#
# SPDX-License-Identifier: BSL-1.0
# Distributed under the Boost Software License, Version 1.0. (See accompanying
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

module purge
module load cmake
module load llvm/15
module load boost/1.81.0-${build_type,,}
module load llvm/18
module load boost/1.85.0-${build_type,,}
module load hwloc
module load openmpi
module load pwrapi/1.1.1

export HPXRUN_RUNWRAPPER=srun
export CXX_STD="20"
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/lsu/env-gcc-11.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (c) 2020 ETH Zurich
# Copyright (c) 2024 Alireza Kheirkhahan
#
# SPDX-License-Identifier: BSL-1.0
# Distributed under the Boost Software License, Version 1.0. (See accompanying
Expand All @@ -10,7 +11,6 @@ module load gcc/11
module load boost/1.78.0-${build_type,,}
module load hwloc
module load openmpi
module load pwrapi/1.1.1

export HPXRUN_RUNWRAPPER=srun
export CXX_STD="20"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# Copyright (c) 2022-2023 Hartmut Kaiser
# Copyright (c) 2022-2024 Hartmut Kaiser
# Copyright (c) 2024 Alireza Kheirkhahan
#
# SPDX-License-Identifier: BSL-1.0
# Distributed under the Boost Software License, Version 1.0. (See accompanying
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

module purge
module load cmake
module load gcc/13
module load gcc/12
module load cuda/12
module load boost/1.83.0-${build_type,,}
module load boost/1.81.0-${build_type,,}
module load hwloc

export CXX_STD="17"
Expand Down
Loading

0 comments on commit 1b22fae

Please sign in to comment.