Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

resolve CI test breaking gasnet issues #6386

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
+250 −56
Open

resolve CI test breaking gasnet issues #6386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
4648b8f
effort to resolve build breaking gasnet issues
ct-clmsn Nov 10, 2023
85494d9
working on corrections to gasnet-mpi
ct-clmsn Nov 10, 2023
be6d3fe
fixed logical error in cmake gasnet script
ct-clmsn Nov 10, 2023
fb32dfc
added gasnet mpi-cflag
ct-clmsn Nov 10, 2023
5415d7e
added missing MPI detection support to gasnet
ct-clmsn Nov 11, 2023
b348e42
check for add_library Mpi::mpi
ct-clmsn Nov 11, 2023
3e6a85d
fix add_library Mpi::mpi
ct-clmsn Nov 11, 2023
01c6a3a
continue work to fix Mpi::mpi
ct-clmsn Nov 12, 2023
6f746f0
fixed broken runwrapper argument handling by adding gasnet
ct-clmsn Nov 15, 2023
d64ae2c
gasnet cmake format isse
ct-clmsn Nov 15, 2023
b9ec34f
Merge branch 'master' into gasnet_updates
ct-clmsn Nov 17, 2023
53b34d7
expanded compilation and include arguments
ct-clmsn Nov 17, 2023
38f50cb
added escaped quotes around -fPIC arguments
ct-clmsn Nov 17, 2023
6154488
added debug message
ct-clmsn Nov 18, 2023
d9325e8
added gasnet_tools to mpi build
ct-clmsn Nov 20, 2023
e1e864f
switching to pkgconfig for mpi check
ct-clmsn Nov 20, 2023
a28ca44
switching to pkgconfig for mpi check
ct-clmsn Nov 20, 2023
116e7f5
fixed logic error
ct-clmsn Nov 21, 2023
6c2970f
fixed logic error
ct-clmsn Nov 21, 2023
42d6c6d
debugging pkgconfig
ct-clmsn Nov 21, 2023
e231a2a
adding debugging messages
ct-clmsn Nov 21, 2023
731d06d
adding debugging messages
ct-clmsn Nov 21, 2023
c339b4b
ordering corrections
ct-clmsn Nov 21, 2023
3eb8c76
rollback to cmake find mpi
ct-clmsn Nov 22, 2023
6d6cdb1
debugging prints
ct-clmsn Nov 22, 2023
c18df1e
using different pkgconfig functionality
ct-clmsn Nov 22, 2023
67ffe95
fixing variable naming issue
ct-clmsn Nov 22, 2023
c77ff3b
fixing situation where MPI is found but none of the associated cmake …
ct-clmsn Nov 22, 2023
fa4dd59
fixing missing flag and redundant flags
ct-clmsn Nov 22, 2023
6b27528
rm'ing extraneous flags
ct-clmsn Nov 24, 2023
4000c36
rm'ing extraneous quotes
ct-clmsn Nov 26, 2023
9c71cfe
added manual pkgconfig commands
ct-clmsn Nov 26, 2023
08449fa
forgot to remove from pkgconfig cflags and libs
ct-clmsn Nov 26, 2023
15b73a3
added default configuration mode
ct-clmsn Nov 26, 2023
6b20543
modified configuration ordering
ct-clmsn Nov 26, 2023
de62809
modified configuration ordering
ct-clmsn Nov 26, 2023
0c73168
switching from gasnet-mpi to gasnet-udp due to openmpi pkgconfig issues
ct-clmsn Nov 27, 2023
0194f1d
switching to gasnet-udp due to openmpi pkgconfig issues
ct-clmsn Nov 27, 2023
6041e26
switching to gasnet-udp due to openmpi pkgconfig issues
ct-clmsn Nov 28, 2023
87d15d0
changing how gasnet is deployed within hpxrun
ct-clmsn Nov 28, 2023
094dba6
changing how gasnet hpxrun.py to amudprun w/ssh support
ct-clmsn Nov 29, 2023
7a63a9a
explicitly turn off gasnet conduits the user does not select; test th…
ct-clmsn Nov 29, 2023
3492614
Merge branch 'STEllAR-GROUP:master' into gasnet_updates
ct-clmsn Nov 30, 2023
8877fed
refined amudprun support in the test code and in the hpxrun launcher
ct-clmsn Nov 30, 2023
b5694fc
updates to correct for gasnet on srun, removed amudprun support
ct-clmsn Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .jenkins/lsu/env-clang-12.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ 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
export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH

configure_extra_options+=" -DCMAKE_BUILD_TYPE=${build_type}"
configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
Expand All @@ -27,6 +27,9 @@ configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON"
configure_extra_options+=" -DCMAKE_C_COMPILER=clang"
configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=udp"
configure_extra_options+=" -DHPX_WITH_LOGGING=OFF"

# The pwrapi library still needs to be set up properly on rostam
Expand Down
5 changes: 4 additions & 1 deletion .jenkins/lsu/env-clang-13.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module load pwrapi/1.1.1

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

configure_extra_options+=" -DCMAKE_BUILD_TYPE=${build_type}"
configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
Expand All @@ -27,6 +27,9 @@ configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON"
configure_extra_options+=" -DCMAKE_C_COMPILER=clang"
configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=udp"
configure_extra_options+=" -DHPX_WITH_LOGGING=OFF"
configure_extra_options+=" -DHPX_WITH_TESTS_COMMAND_LINE=--hpx:queuing=local-workrequesting-fifo"

Expand Down
5 changes: 4 additions & 1 deletion .jenkins/lsu/env-clang-14.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ 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
export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH

configure_extra_options+=" -DCMAKE_BUILD_TYPE=${build_type}"
configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
Expand All @@ -27,6 +27,9 @@ configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON"
configure_extra_options+=" -DCMAKE_C_COMPILER=clang"
configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=udp"
configure_extra_options+=" -DHPX_WITH_LOGGING=OFF"
configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE"
configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON"
Expand Down
5 changes: 4 additions & 1 deletion .jenkins/lsu/env-clang-15.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ 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
export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH

configure_extra_options+=" -DCMAKE_BUILD_TYPE=${build_type}"
configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
Expand All @@ -27,6 +27,9 @@ configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON"
configure_extra_options+=" -DCMAKE_C_COMPILER=clang"
configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=udp"
configure_extra_options+=" -DHPX_WITH_LOGGING=OFF"
configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE"
configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON"
Expand Down
5 changes: 4 additions & 1 deletion .jenkins/lsu/env-clang-16.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ 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
export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH

configure_extra_options+=" -DCMAKE_BUILD_TYPE=${build_type}"
configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
Expand All @@ -27,6 +27,9 @@ configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON"
configure_extra_options+=" -DCMAKE_C_COMPILER=clang"
configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=udp"
configure_extra_options+=" -DHPX_WITH_LOGGING=OFF"
configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE"
configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON"
Expand Down
5 changes: 4 additions & 1 deletion .jenkins/lsu/env-clang-17.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ 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
export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH

configure_extra_options+=" -DCMAKE_BUILD_TYPE=${build_type}"
configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
Expand All @@ -27,6 +27,9 @@ configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON"
configure_extra_options+=" -DCMAKE_C_COMPILER=clang"
configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=udp"
configure_extra_options+=" -DHPX_WITH_LOGGING=OFF"
configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE"
configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON"
Expand Down
5 changes: 4 additions & 1 deletion .jenkins/lsu/env-gcc-10.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module load pwrapi/1.1.1

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

configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
configure_extra_options+=" -DHPX_WITH_MALLOC=system"
Expand All @@ -27,6 +27,9 @@ 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_PARCELPORT_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=udp"

# The pwrapi library still needs to be set up properly on rostam
# configure_extra_options+=" -DHPX_WITH_POWER_COUNTER=ON"
Expand Down
5 changes: 4 additions & 1 deletion .jenkins/lsu/env-gcc-12.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ 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
export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH

configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
configure_extra_options+=" -DHPX_WITH_MALLOC=system"
Expand All @@ -26,6 +26,9 @@ 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_PARCELPORT_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=udp"
configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE"
configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON"
configure_extra_options+=" -DHPX_WITH_EVE_TAG=main"
Expand Down
5 changes: 4 additions & 1 deletion .jenkins/lsu/env-gcc-13.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ 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
export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH

configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
configure_extra_options+=" -DHPX_WITH_MALLOC=system"
Expand All @@ -26,6 +26,9 @@ 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_PARCELPORT_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=udp"
configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE"
configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON"
configure_extra_options+=" -DHPX_WITH_EVE_TAG=main"
Expand Down
4 changes: 3 additions & 1 deletion cmake/HPX_AddTest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ function(add_hpx_test category name)
set(Python_EXECUTABLE ${PYTHON_EXECUTABLE})
endif()

set(ENV_VAR "")

# cmake-format: off
set(cmd
"${Python_EXECUTABLE}"
Expand Down Expand Up @@ -196,7 +198,7 @@ function(add_hpx_test category name)
if(_add_test)
set(_full_name "${category}.distributed.gasnet.${name}")
add_test(NAME "${_full_name}" COMMAND ${cmd} "-p" "gasnet" "-r"
"gasnet-smp" ${args}
"srun" ${args}
)
set_tests_properties(
"${_full_name}"
Expand Down
Loading
Loading