Skip to content

Commit ca2b966

Browse files
hkaiserhkaiser
authored
Merge pull request #6254 from STEllAR-GROUP/release-1.9.1
Preparing V1.9.1 release
2 parents e6d0ded + bf05f03 commit ca2b966

1,003 files changed

Lines changed: 7559 additions & 5471 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ jobs:
568568
command: |
569569
ulimit -c unlimited
570570
ctest \
571-
--timeout 180 \
571+
--timeout 270 \
572572
-T test \
573573
--no-compress-output \
574574
--output-on-failure \

‎.clang-tidy‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Checks: >
1111
-bugprone-exception-escape,
1212
-bugprone-forward-declaration-namespace,
1313
-bugprone-macro-parentheses,
14+
-bugprone-branch-clone,
1415
modernize-use-nullptr,
1516
misc-assert-side-effect
1617
misc-dangling-handle

‎.cmake-format.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@
352352
'nargs': '1+'}},
353353
'add_hpx_module': { 'kwargs': { 'CMAKE_SUBDIRS': '+',
354354
'COMPAT_HEADERS': '+',
355+
'GENERATED_HEADERS': '+',
355356
'DEPENDENCIES': '+',
356357
'EXCLUDE_FROM_GLOBAL_HEADER': '+',
357358
'ADD_TO_GLOBAL_HEADER': '+',

‎.github/workflows/windows_release_gcc_mingw.yml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# Copyright (c) 2023 The STE||AR-Group
2+
#
3+
# SPDX-License-Identifier: BSL-1.0
4+
# Distributed under the Boost Software License, Version 1.0. (See accompanying
5+
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
6+
7+
name: Windows CI (Release, gcc/mingw toolset)
8+
9+
on: [pull_request]
10+
11+
jobs:
12+
build:
13+
runs-on: windows-latest
14+
15+
steps:
16+
- uses: actions/checkout@v3
17+
- uses: jwlawson/actions-setup-cmake@v1.9
18+
with:
19+
cmake-version: '3.22.x'
20+
- name: Install dependencies
21+
run: |
22+
choco install ninja -y
23+
md C:\projects
24+
$client = new-object System.Net.WebClient
25+
$client.DownloadFile("https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.7z","C:\projects\boost_1_78_0.7z")
26+
7z x C:\projects\boost_1_78_0.7z -y -oC:\projects\boost
27+
cd C:\projects\boost\boost_1_78_0
28+
.\bootstrap.bat gcc
29+
.\b2.exe `
30+
link=shared `
31+
variant=release `
32+
architecture=x86 `
33+
address-model=64 `
34+
threading=multi `
35+
--with-iostreams `
36+
--build-type=complete `
37+
install
38+
$client.DownloadFile("https://download.open-mpi.org/release/hwloc/v2.8/hwloc-win64-build-2.8.0.zip","C:\projects\hwloc-win64-build-2.8.0.zip")
39+
7z x C:\projects\hwloc-win64-build-2.8.0.zip -y -oC:\projects
40+
- name: Configure
41+
shell: bash
42+
run: |
43+
cmake . -Bbuild -G'Ninja' \
44+
-DCMAKE_BUILD_TYPE=Release \
45+
-DCMAKE_CXX_COMPILER=g++ \
46+
-DBOOST_ROOT="C:\Boost" \
47+
-DHWLOC_ROOT="C:\projects\hwloc-win64-build-2.8.0" \
48+
-DHPX_WITH_CXX_STANDARD=20 \
49+
-DHPX_WITH_STATIC_LINKING=ON \
50+
-DHPX_WITH_MALLOC=system \
51+
-DHPX_WITH_FETCH_ASIO=ON \
52+
-DHPX_WITH_PKGCONFIG=OFF \
53+
-DHPX_WITH_TESTS_MAX_THREADS_PER_LOCALITY=2 \
54+
-DHPX_WITH_EXAMPLES=ON \
55+
-DHPX_WITH_TESTS=ON \
56+
-DHPX_WITH_TESTS_UNIT=ON \
57+
-DHPX_WITH_DEPRECATION_WARNINGS=OFF \
58+
-DHPX_WITH_MODULES_AS_STATIC_LIBRARIES=OFF
59+
- name: Build
60+
shell: bash
61+
run: |
62+
cmake --build build --config Release -- -j 2

‎.jenkins/lsu/Jenkinsfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ pipeline {
3535
axes {
3636
axis {
3737
name 'configuration_name'
38-
values 'gcc-9', 'gcc-10', 'gcc-11', 'gcc-12', 'clang-11', 'clang-12', 'clang-13', 'clang-14', 'gcc-10-cuda-11', 'hipcc'
38+
values 'gcc-9', 'gcc-10', 'gcc-11', 'gcc-12', 'clang-11', 'clang-12', 'clang-13', 'clang-14', 'gcc-10-cuda-11', 'gcc-12-cuda-12-dgx', 'hipcc'
39+
values 'gcc-10', 'gcc-11', 'gcc-12', 'gcc-13', 'clang-12', 'clang-13', 'clang-14', 'clang-15', 'gcc-10-cuda-11', 'gcc-12-cuda-12-dgx', 'hipcc'
3940
}
4041
axis {
4142
name 'build_type'

‎.jenkins/lsu/batch.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ulimit -l unlimited
2121

2222
set +e
2323
ctest \
24-
--verbose \
24+
${ctest_extra_args} \
2525
-S ${src_dir}/.jenkins/lsu/ctest.cmake \
2626
-DCTEST_CONFIGURE_EXTRA_OPTIONS="${configure_extra_options}" \
2727
-DCTEST_BUILD_CONFIGURATION_NAME="${configuration_name_with_build_type}" \

‎.jenkins/lsu/entry.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ sbatch \
4646
--job-name="${job_name}" \
4747
--nodes="${configuration_slurm_num_nodes}" \
4848
--partition="${configuration_slurm_partition}" \
49+
--exclude="bahram" \
4950
--time="03:00:00" \
5051
--output="jenkins-hpx-${configuration_name_with_build_type}.out" \
5152
--error="jenkins-hpx-${configuration_name_with_build_type}.err" \

‎.jenkins/lsu/env-clang-15.sh‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Copyright (c) 2020 ETH Zurich
2+
#
3+
# SPDX-License-Identifier: BSL-1.0
4+
# Distributed under the Boost Software License, Version 1.0. (See accompanying
5+
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
6+
7+
module purge
8+
module load cmake
9+
module load llvm/15
10+
module load boost/1.82.0-${build_type,,}
11+
module load hwloc
12+
module load openmpi
13+
module load pwrapi/1.1.1
14+
15+
export HPXRUN_RUNWRAPPER=srun
16+
export CXX_STD="20"
17+
18+
configure_extra_options+=" -DCMAKE_BUILD_TYPE=${build_type}"
19+
configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
20+
configure_extra_options+=" -DHPX_WITH_MALLOC=system"
21+
configure_extra_options+=" -DHPX_WITH_FETCH_ASIO=ON"
22+
configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS=ON"
23+
configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON"
24+
configure_extra_options+=" -DHPX_WITH_PARCELPORT_MPI=ON"
25+
configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON"
26+
configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON"
27+
configure_extra_options+=" -DHPX_WITH_LOGGING=OFF"
28+
configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE"
29+
configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON"
30+
31+
# The pwrapi library still needs to be set up properly on rostam
32+
# configure_extra_options+=" -DHPX_WITH_POWER_COUNTER=ON"
33+
34+
# Make sure HWLOC does not report 'cores'. This is purely an option to enable
35+
# testing the topology code under conditions close to those on FreeBSD.
36+
configure_extra_options+=" -DHPX_TOPOLOGY_WITH_ADDITIONAL_HWLOC_TESTING=ON"

‎.jenkins/lsu/env-common.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@ if [ "${build_type}" = "Debug" ]; then
1111
configure_extra_options+=" -DLCI_DEBUG=ON"
1212
fi
1313

14+
ctest_extra_args+=" --verbose "
15+
1416
hostname
1517
module avail

‎.jenkins/lsu/env-gcc-10-cuda-11.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ configure_extra_options+=" -DHPX_WITH_CUDA=ON"
2323
configure_extra_options+=" -DHPX_WITH_NETWORKING=OFF"
2424
configure_extra_options+=" -DHPX_WITH_DISTRIBUTED_RUNTIME=OFF"
2525
configure_extra_options+=" -DHPX_WITH_ASYNC_MPI=ON"
26-
configure_extra_options+=" -DCMAKE_CUDA_ARCHITECTURES='37;70'"
26+
configure_extra_options+=" -DCMAKE_CUDA_ARCHITECTURES='70;80'"

0 commit comments

Comments
 (0)