Skip to content

Commit

Permalink
Merge pull request #6507 from akheir/master
Browse files Browse the repository at this point in the history
Update LSU Jenkins libraries to match Rostam 3.0 with RHEL9
  • Loading branch information
hkaiser authored Jul 1, 2024
2 parents daa1fd5 + 13e0d53 commit 94f0ef0
Show file tree
Hide file tree
Showing 43 changed files with 157 additions and 241 deletions.
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/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.

2 changes: 1 addition & 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 Down
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
3 changes: 2 additions & 1 deletion .jenkins/lsu/env-gcc-12-cuda-12.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,7 +8,7 @@
module purge
module load cmake
module load gcc/12
module load boost/1.82.0-${build_type,,}
module load boost/1.81.0-${build_type,,}
module load hwloc
module load cuda/12
module load openmpi
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/lsu/env-gcc-12.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/12
module load boost/1.81.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
4 changes: 2 additions & 2 deletions .jenkins/lsu/env-gcc-13.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 gcc/13
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
14 changes: 7 additions & 7 deletions .jenkins/lsu/env-gcc-10.sh → .jenkins/lsu/env-gcc-14.sh
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
# 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 gcc/10
module load boost/1.75.0-${build_type,,}
module load gcc/14
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="17"
export CXX_STD="20"
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH

configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
configure_extra_options+=" -DHPX_WITH_MALLOC=system"
configure_extra_options+=" -DHPX_WITH_FETCH_ASIO=ON"
configure_extra_options+=" -DHPX_WITH_ASIO_TAG=asio-1-12-0"
configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS=ON"
configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_MPI=ON"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON"
configure_extra_options+=" -DCMAKE_C_COMPILER=gcc"
configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC"
configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE"
configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON"
configure_extra_options+=" -DHPX_WITH_EVE_TAG=main"

# The pwrapi library still needs to be set up properly on rostam
# configure_extra_options+=" -DHPX_WITH_POWER_COUNTER=ON"

configure_extra_options+=" -DHPX_COROUTINES_WITH_THREAD_SCHEDULE_HINT_RUNS_AS_CHILD=ON"
11 changes: 8 additions & 3 deletions .jenkins/lsu/env-hipcc.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
# Copyright (c) 2020-2021 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 rocm
module load boost
export CXX=hipcc
module load boost/1.84.0-${build_type,,}
#export CXX=hipcc

export HPXRUN_RUNWRAPPER=srun
export CXX_STD="17"
export CXX_STD="20"

configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
configure_extra_options+=" -DHPX_WITH_MALLOC=system"
Expand All @@ -20,3 +24,4 @@ configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS=ON"
configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=OFF"

ctest_extra_args+=" -E tests.unit.modules.algorithms.detail "
ctest_extra_args+=" -E tests.regressions.modules.coroutines.coroutine_function_destructor_yield_4800"
Loading

0 comments on commit 94f0ef0

Please sign in to comment.