gasnet based parcelport

.circleci/config.yml

@@ -293,6 +293,7 @@ jobs:
                 -DHPX_WITH_MALLOC=system \
                 -DHPX_WITH_FETCH_ASIO=Off \
                 -DHPX_WITH_APEX=On \
+                -DHPX_WITH_FETCH_APEX=ON \
                 -DHPX_WITH_TESTS=On \
                 -DHPX_WITH_EXAMPLES=On
             rm -rf *

.cmake-format.py

@@ -393,7 +393,8 @@
                                                    'RUN_SERIAL',
                                                    'NO_PARCELPORT_TCP',
                                                    'NO_PARCELPORT_LCI',
-                                                   'NO_PARCELPORT_MPI'],
+                                                   'NO_PARCELPORT_MPI',
+                                                   'NO_PARCELPORT_GASNET'],
                                          'nargs': '2+'}},
     'add_hpx_source_group': { 'kwargs': { 'CLASS': 1,
                                           'NAME': 1,

.github/SUPPORT.md

@@ -30,7 +30,6 @@ for details.
   [`#hpx`](https://cpplang.slack.com/messages/C68QLPZB3) channel is another
   place where people usually offer support.
 
-
 ### Mailing Lists/Groups
 
 * [hpx-users group](mailto:[email protected]), see

.github/workflows/linux_release_fetchcontent.yml

@@ -26,6 +26,7 @@ jobs:
               -DHPX_WITH_MALLOC=system \
               -DHPX_WITH_FETCH_ASIO=ON \
               -DHPX_WITH_APEX=ON \
+              -DHPX_WITH_FETCH_APEX=ON \
               -DHPX_WITH_EXAMPLES=ON \
               -DHPX_WITH_TESTS=OFF \
               -DHPX_REPOSITORY="file:////$(pwd)" \

.jenkins/cscs/env-clang-apex.sh

@@ -34,6 +34,7 @@ configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON"
 configure_extra_options+=" -DHPX_WITH_SPINLOCK_DEADLOCK_DETECTION=ON"
 #configure_extra_options+=" -DHPX_WITH_LIBCDS=ON"
 configure_extra_options+=" -DHPX_WITH_APEX=ON"
+configure_extra_options+=" -DHPX_WITH_FETCH_APEX=ON"
 configure_extra_options+=" -DHPX_WITH_PAPI=ON"
 configure_extra_options+=" -DAPEX_WITH_PAPI=ON"
 configure_extra_options+=" -DAPEX_WITH_OTF2=ON"

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

@@ -14,6 +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
 
 configure_extra_options+=" -DCMAKE_BUILD_TYPE=${build_type}"
 configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
@@ -24,6 +25,11 @@ 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"
 
 # The pwrapi library still needs to be set up properly on rostam

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

@@ -14,6 +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
 
 configure_extra_options+=" -DCMAKE_BUILD_TYPE=${build_type}"
 configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
@@ -24,6 +25,11 @@ 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_TESTS_COMMAND_LINE=--hpx:queuing=local-workrequesting-fifo"
 

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

@@ -14,6 +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
 
 configure_extra_options+=" -DCMAKE_BUILD_TYPE=${build_type}"
 configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
@@ -24,6 +25,11 @@ 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"

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

@@ -14,6 +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
 
 configure_extra_options+=" -DCMAKE_BUILD_TYPE=${build_type}"
 configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
@@ -24,6 +25,11 @@ 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"

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

@@ -14,6 +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
 
 configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
 configure_extra_options+=" -DHPX_WITH_MALLOC=system"
@@ -24,6 +25,11 @@ 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=gcc"
+configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC"
+configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=smp"
 
 # The pwrapi library still needs to be set up properly on rostam
 # configure_extra_options+=" -DHPX_WITH_POWER_COUNTER=ON"

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

@@ -14,6 +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
 
 configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
 configure_extra_options+=" -DHPX_WITH_MALLOC=system"
@@ -23,6 +24,11 @@ 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=gcc"
+configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC"
+configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=smp"
 configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE"
 configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON"
 configure_extra_options+=" -DHPX_WITH_EVE_TAG=main"

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

@@ -14,6 +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
 
 configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
 configure_extra_options+=" -DHPX_WITH_MALLOC=system"
@@ -23,6 +24,11 @@ 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=gcc"
+configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC"
+configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=smp"
 configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE"
 configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON"
 configure_extra_options+=" -DHPX_WITH_EVE_TAG=main"

CMakeLists.txt

@@ -937,6 +937,15 @@ hpx_option(
   CATEGORY "Profiling"
 )
 
+hpx_option(
+  HPX_WITH_FETCH_APEX
+  BOOL
+  "Use FetchContent to fetch APEX. By default an installed APEX will be used. (default: OFF)"
+  OFF
+  CATEGORY "Build Targets"
+  ADVANCED
+)
+
 if(HPX_WITH_APEX)
   hpx_add_config_define(HPX_HAVE_APEX) # tell HPX that we use APEX
   hpx_option(
@@ -1143,6 +1152,27 @@ if(HPX_WITH_NETWORKING)
     ADVANCED
   )
 
+  hpx_option(
+    HPX_WITH_PARCELPORT_GASNET BOOL "Enable the GASNET based parcelport." OFF
+    CATEGORY "Parcelport"
+  )
+  hpx_option(
+    HPX_WITH_FETCH_GASNET
+    BOOL
+    "Use FetchContent to fetch GASNET. By default an installed GASNET will be used. (default: OFF)."
+    OFF
+    CATEGORY "Build Targets"
+    ADVANCED
+  )
+  if(HPX_WITH_PARCELPORT_GASNET)
+    hpx_add_config_define(HPX_HAVE_PARCELPORT_GASNET)
+    hpx_option(
+      HPX_WITH_PARCELPORT_GASNET_CONDUIT STRING
+      "Define which conduit to use for the gasnet parcelport" "udp"
+      STRINGS "smp;udp;mpi;ofi;ucx"
+    )
+  endif()
+
   hpx_option(
     HPX_WITH_PARCELPORT_TCP BOOL "Enable the TCP based parcelport." ON
     CATEGORY "Parcelport"
@@ -1180,7 +1210,10 @@ else(HPX_WITH_NETWORKING)
   )
 endif(HPX_WITH_NETWORKING)
 
-if((HPX_WITH_NETWORKING AND HPX_WITH_PARCELPORT_MPI) OR HPX_WITH_ASYNC_MPI)
+if((HPX_WITH_NETWORKING AND HPX_WITH_PARCELPORT_MPI)
+   OR HPX_WITH_ASYNC_MPI
+   OR ("${HPX_WITH_PARCELPORT_GASNET_CONDUIT}" STREQUAL "mpi")
+)
   # mpi parcelport settings
   hpx_option(
     HPX_WITH_PARCELPORT_MPI_ENV
@@ -2132,13 +2165,20 @@ add_hpx_library_headers_noglob(hpx_external)
 # Setup plugins (set here cause if we include it inside plugins, it will not be
 # defined in src/CMakeLists.txt where we call add_static_parcelports)
 include(HPX_SetupMPI) # must come before APEX
-if((HPX_WITH_NETWORKING AND HPX_WITH_PARCELPORT_MPI) OR HPX_WITH_ASYNC_MPI)
+if((HPX_WITH_NETWORKING AND HPX_WITH_PARCELPORT_MPI)
+   OR HPX_WITH_ASYNC_MPI
+   OR ("${HPX_WITH_PARCELPORT_GASNET_CONDUIT}" STREQUAL "mpi")
+)
   hpx_setup_mpi()
 endif()
-include(HPX_SetupLCI)
 if(HPX_WITH_NETWORKING AND HPX_WITH_PARCELPORT_LCI)
+  include(HPX_SetupLCI)
   hpx_setup_lci()
 endif()
+if(HPX_WITH_NETWORKING AND HPX_WITH_PARCELPORT_GASNET)
+  include(HPX_SetupGasnet)
+  hpx_setup_gasnet()
+endif()
 
 # Setup packages and subprojects
 include(HPX_SetupSYCL)

cmake/FindGasnet.cmake

@@ -0,0 +1,51 @@
+# Copyright (c)      2017 Thomas Heller
+# Copyright (c)      2023 Christopher Taylor
+#
+# 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)
+
+macro(find_gasnet)
+  set(GASNET_MPI_FOUND FALSE)
+  set(GASNET_UDP_FOUND FALSE)
+  set(GASNET_SMP_FOUND FALSE)
+
+  if(HPX_WITH_NETWORKING)
+    pkg_check_modules(GASNET QUIET gasnet-mpi-seq)
+    if(NOT GASNET_FOUND)
+      pkg_check_modules(PC_GASNET QUIET gasnet-udp-seq)
+      if(NOT GASNET_FOUND)
+        hpx_error(
+          "Could not find GASNET MPI/udp please set the PKG_CONFIG_PATH environment variable"
+        )
+      else()
+        set(GASNET_UDP_FOUND TRUE)
+      endif()
+    else()
+      set(GASNET_MPI_FOUND TRUE)
+      hpx_setup_mpi()
+    endif()
+  else()
+    pkg_check_modules(GASNET QUIET gasnet-smp-seq)
+    if(NOT GASNET_FOUND)
+      hpx_error(
+        "Could not find GASNET please set the PKG_CONFIG_PATH environment variable"
+      )
+    else()
+      set(GASNET_SMP_FOUND TRUE)
+    endif()
+  endif()
+
+  if(NOT GASNET_INCLUDE_DIRS OR NOT GASNET_LIBRARY_DIRS)
+    hpx_error(
+      "Could not find GASNET_INCLUDE_DIRS or GASNET_LIBRARY_DIRS please \
+  set the PKG_CONFIG_PATH environment variable"
+    )
+  endif()
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(
+    Gasnet DEFAULT_MSG GASNET_LIBRARY_DIRS GASNET_INCLUDE_DIRS
+  )
+
+endmacro()

cmake/FindHwloc.cmake

@@ -35,7 +35,7 @@ if(NOT TARGET Hwloc::hwloc)
 
   find_library(
     Hwloc_LIBRARY
-    NAMES libhwloc.so hwloc
+    NAMES libhwloc.so libhwloc.lib hwloc
     HINTS ${Hwloc_ROOT}
           ENV
           HWLOC_ROOT