Skip to content

Commit c4028b9

Browse files
authored
Merge pull request STEllAR-GROUP#6725 from akheir/master
Adding Boost 1.88
2 parents 54a0c60 + e41a63a commit c4028b9

File tree

5 files changed

+97
-15
lines changed

5 files changed

+97
-15
lines changed

.circleci/config.yml

Lines changed: 63 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -480,15 +480,53 @@ jobs:
480480
paths:
481481
- ./build
482482

483-
tests.examples:
483+
tests.examples1:
484484
<<: *defaults
485485
steps:
486486
- attach_workspace:
487487
at: /hpx
488488
- run:
489-
name: Building Examples
489+
name: Building Examples (1)
490490
command: |
491-
ninja -j2 -k 0 examples
491+
ninja -j2 -k 0 \
492+
`grep -v -e ^# -e ^$ /hpx/source/.circleci/tests.examples1.targets`
493+
- run:
494+
name: Running Example Tests
495+
when: always
496+
command: |
497+
ulimit -c unlimited
498+
ctest \
499+
--timeout 180 \
500+
-T test \
501+
--no-compress-output \
502+
--output-on-failure \
503+
--tests-regex \
504+
`grep -v -e ^# -e ^$ /hpx/source/.circleci/tests.examples1.targets | sed ':b;N;$!bb;s/\n/|/g'`
505+
- run:
506+
<<: *convert_xml
507+
- run:
508+
<<: *move_core_dump
509+
- run:
510+
<<: *move_debug_log
511+
- store_test_results:
512+
path: tests.examples1
513+
- store_artifacts:
514+
path: tests.examples1
515+
- persist_to_workspace:
516+
root: /hpx
517+
paths:
518+
- ./build
519+
520+
tests.examples2:
521+
<<: *defaults
522+
steps:
523+
- attach_workspace:
524+
at: /hpx
525+
- run:
526+
name: Building Examples (2)
527+
command: |
528+
ninja -j2 -k 0 \
529+
`grep -v -e ^# -e ^$ /hpx/source/.circleci/tests.examples2.targets`
492530
- run:
493531
name: Running Example Tests
494532
when: always
@@ -497,19 +535,25 @@ jobs:
497535
# NOTE: transpose_block_numa is disabled because
498536
# hwloc_get_area_membind_nodeset (which is used by the
499537
# numa_allocator) fails with EPERM.
500-
ctest --timeout 60 -T test --no-compress-output --output-on-failure \
501-
-R tests.examples \
502-
-E tests.examples.transpose.transpose_block_numa
538+
ctest \
539+
--timeout 180 \
540+
-T test \
541+
--no-compress-output \
542+
--output-on-failure \
543+
--tests-regex \
544+
`grep -v -e ^# -e ^$ /hpx/source/.circleci/tests.examples2.targets | sed ':b;N;$!bb;s/\n/|/g'` \
545+
--exclude-regex \
546+
tests.examples.transpose.transpose_block_numa
503547
- run:
504548
<<: *convert_xml
505549
- run:
506550
<<: *move_core_dump
507551
- run:
508552
<<: *move_debug_log
509553
- store_test_results:
510-
path: tests.examples
554+
path: tests.examples2
511555
- store_artifacts:
512-
path: tests.examples
556+
path: tests.examples2
513557
- persist_to_workspace:
514558
root: /hpx
515559
paths:
@@ -1210,7 +1254,9 @@ workflows:
12101254
requires:
12111255
- configure
12121256
<<: *gh_pages_filter
1213-
- tests.examples:
1257+
- tests.examples1:
1258+
<<: *core_dependency
1259+
- tests.examples2:
12141260
<<: *core_dependency
12151261
- tests.unit1.algorithms:
12161262
<<: *core_dependency
@@ -1255,7 +1301,8 @@ workflows:
12551301
- configure
12561302
# Force docs to be built after examples so that workspace doesn't
12571303
# have conflicts
1258-
- tests.examples
1304+
- tests.examples1
1305+
- tests.examples2
12591306
<<: *gh_pages_filter
12601307
- depreport:
12611308
requires:
@@ -1266,14 +1313,16 @@ workflows:
12661313
- configure
12671314
# Force docs to be built after examples so that workspace doesn't
12681315
# have conflicts
1269-
- tests.examples
1316+
- tests.examples1
1317+
- tests.examples2
12701318
<<: *additional_docs_filter
12711319
- docs-latexpdf:
12721320
requires:
12731321
- configure
12741322
# Force docs to be built after examples so that workspace doesn't
12751323
# have conflicts
1276-
- tests.examples
1324+
- tests.examples1
1325+
- tests.examples2
12771326
<<: *additional_docs_filter
12781327
- docs_push:
12791328
requires:
@@ -1285,7 +1334,8 @@ workflows:
12851334
- install:
12861335
requires:
12871336
- core
1288-
- tests.examples
1337+
- tests.examples1
1338+
- tests.examples2
12891339
- tests.unit1.algorithms
12901340
- tests.unit2.algorithms
12911341
- tests.unit3.algorithms

.circleci/tests.examples1.targets

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Copyright (c) 2025 Hartmut Kaiser
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+
tests.examples.modules.algorithms
8+
tests.examples.modules.executors
9+
tests.examples.modules.program_options
10+
tests.examples.modules.resiliency
11+
tests.examples.modules.resource_partitioner
12+
tests.examples.modules.checkpoint
13+
tests.examples.modules.collectives
14+
tests.examples.modules.resiliency_distributed
15+
tests.examples.1d_stencil
16+
tests.examples.async_io.async_io_simple
17+
tests.examples.balancing
18+
tests.examples.cancelable_action
19+
tests.examples.future_reduce
20+
tests.examples.jacobi_smp
21+
tests.examples.performance_counters

.circleci/tests.examples2.targets

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Copyright (c) 2025 Hartmut Kaiser
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+
tests.examples.quickstart
8+
tests.examples.random_mem_access
9+
tests.examples.spell_check
10+
tests.examples.tuplespace
11+
tests.examples.transpose

.jenkins/lsu/env-clang-20.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
module purge
99
module load cmake # for now: cmake/4
1010
module load llvm/20
11-
module load boost/1.87.0-${build_type,,}
11+
module load boost/1.88.0-${build_type,,}
1212
module load hwloc
1313
module load openmpi
1414

.jenkins/lsu/env-gcc-15.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
module purge
88
module load cmake
99
module load gcc/15
10-
module load boost/1.87.0-${build_type,,}
10+
module load boost/1.88.0-${build_type,,}
1111
module load hwloc
1212
module load openmpi
1313

0 commit comments

Comments
 (0)