Skip to content

Commit

Permalink
Merge #6375
Browse files Browse the repository at this point in the history
6375: Update LSU Jenkins with 2023-10 libraries r=hkaiser a=akheir

Adding new libraries to LSU Jenkins:

- gcc/13.2 with boost 1.83
- llvm/17 with boost 1.83
- llvm/16 with boost 1.82
- gcc/13 + cuda 12 with boost 1.83
- gcc/12 + cuda 12 with boost 1.82

Co-authored-by: Alireza Kheirkhahan <[email protected]>
  • Loading branch information
StellarBot and akheir committed Oct 28, 2023
2 parents fddf295 + 6bd7fbf commit 4fa1b61
Show file tree
Hide file tree
Showing 8 changed files with 93 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .jenkins/lsu/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pipeline {
axes {
axis {
name 'configuration_name'
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'
values 'gcc-10', 'gcc-11', 'gcc-12', 'gcc-13', 'clang-12', 'clang-13', 'clang-14', 'clang-15', 'clang-16', 'clang-17','gcc-12-cuda-12', 'gcc-13-cuda-12-dgx', 'hipcc'
}
axis {
name 'build_type'
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/lsu/env-clang-15.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
module purge
module load cmake
module load llvm/15
module load boost/1.82.0-${build_type,,}
module load boost/1.81.0-${build_type,,}
module load hwloc
module load openmpi
module load pwrapi/1.1.1
Expand Down
42 changes: 42 additions & 0 deletions .jenkins/lsu/env-clang-16.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Copyright (c) 2020 ETH Zurich
#
# 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/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"
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH

configure_extra_options+=" -DCMAKE_BUILD_TYPE=${build_type}"
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_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+=" -DHPX_WITH_PARCELPORT_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON"
configure_extra_options+=" -DCMAKE_C_COMPILER=clang"
configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=smp"
configure_extra_options+=" -DHPX_WITH_LOGGING=OFF"
configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE"
configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON"

# The pwrapi library still needs to be set up properly on rostam
# configure_extra_options+=" -DHPX_WITH_POWER_COUNTER=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"
42 changes: 42 additions & 0 deletions .jenkins/lsu/env-clang-17.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Copyright (c) 2020 ETH Zurich
#
# 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/17
module load boost/1.83.0-${build_type,,}
module load hwloc
module load openmpi
module load pwrapi/1.1.1

export HPXRUN_RUNWRAPPER=srun
export CXX_STD="20"
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH

configure_extra_options+=" -DCMAKE_BUILD_TYPE=${build_type}"
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_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+=" -DHPX_WITH_PARCELPORT_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON"
configure_extra_options+=" -DCMAKE_C_COMPILER=clang"
configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=smp"
configure_extra_options+=" -DHPX_WITH_LOGGING=OFF"
configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE"
configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON"

# The pwrapi library still needs to be set up properly on rostam
# configure_extra_options+=" -DHPX_WITH_POWER_COUNTER=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"
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

module purge
module load cmake
module load gcc/10
module load boost/1.75.0-${build_type,,}
module load gcc/12
module load boost/1.82.0-${build_type,,}
module load hwloc
module load cuda/11.5
module load cuda/12
module load openmpi

export CXX_STD="17"
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/lsu/env-gcc-12.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
module purge
module load cmake
module load gcc/12
module load boost/1.80.0-${build_type,,}
module load boost/1.81.0-${build_type,,}
module load hwloc
module load openmpi
module load pwrapi/1.1.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

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

export CXX_STD="17"
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/lsu/env-gcc-13.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
module purge
module load cmake
module load gcc/13
module load boost/1.82.0-${build_type,,}
module load boost/1.83.0-${build_type,,}
module load hwloc
module load openmpi
module load pwrapi/1.1.1
Expand Down

0 comments on commit 4fa1b61

Please sign in to comment.