proof-of-concept: initial support for reconverse

.github/workflows/ci.yaml

@@ -443,3 +443,32 @@ jobs:
       run: |
         make -C netlrts-win-x86_64/tests test TESTOPTS="++local"
 
+  multicore-linux-x86_64_reconverse:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y cmake libfabric-bin libfabric-dev
+    - name: build
+      run: ./build charm++ multicore-linux-x86_64 -j3 --with-production 
+    - name: test
+      run: |
+        multicore-linux-x86_64/_deps/lci-src/lcrun -n 2 multicore-linux-x86_64/bin/ckhello +pe 4
+
+  multicore-darwin-x86_64_reconverse:
+    timeout-minutes: 60
+    runs-on: macos-13
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Dependencies
+      run: |
+        brew update
+        brew install cmake libfabric
+    - name: build
+      run: ./build charm++ multicore-darwin-x86_64 -j3 --with-production 
+    - name: test
+      run: |
+        multicore-darwin-x86_64/_deps/lci-src/lcrun -n 2 multicore-darwin-x86_64/bin/ckhello +pe 4

CMakeLists.txt

@@ -185,7 +185,7 @@ option(ZLIB                "Enable zlib support" ON)
 option(AMPI_MPICH_TESTS    "Enable mpich tests for AMPI" OFF)
 option(DRONE_MODE          "Enable drone mode" OFF)
 option(TASK_QUEUE          "Enable task queue" OFF)
-
+option(RECONVERSE          "Use the Reconverse communication layer" OFF)
 
 if(TRACING STREQUAL "")
   if(CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -266,6 +266,11 @@ else()
   set(CMK_TASKQUEUE 0)
 endif()
 
+if(${RECONVERSE})
+  set(CMK_RECONVERSE 1)
+else()
+  set(CMK_RECONVERSE 0)
+endif()
 
 if(${AMPI_MPICH_TESTS})
   add_definitions(-DAMPI_ERRHANDLER_RETURN=1)
@@ -355,6 +360,7 @@ set(CMK_LBTIME_TYPE ${LBTIME_TYPE})
 
 set(CMK_LB_USER_DATA ${LBUSERDATA})
 
+
 set(CMK_RANDOMIZED_MSGQ ${RANDOMIZED_MSGQ})
 set(CMK_SHRINK_EXPAND ${SHRINKEXPAND})
 set(CMK_SMP_TRACE_COMMTHREAD ${TRACING_COMMTHREAD})
@@ -449,7 +455,11 @@ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/)
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/include/cklibs)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib_so)
+if(BUILD_SHARED)
+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib_so)
+else()
+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+endif()
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 if (NOT CMAKE_INSTALL_PREFIX)
@@ -461,6 +471,12 @@ if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
+if(RECONVERSE)
+  # This needs to be include before we set charmc as the linker
+  # but after CMAKE_LIBRARY_OUTPUT_DIRECTORY has been set
+  add_subdirectory(cmake/fetch_reconverse)
+endif()
+
 if (NOT CMK_MEMPOOL_CUTOFFNUM)
   set(CMK_MEMPOOL_CUTOFFNUM 28)
 endif()
@@ -872,8 +888,8 @@ include(cmake/hwloc.cmake)
 # Converse
 include(cmake/converse.cmake)
 add_subdirectory(src/QuickThreads)
-add_subdirectory(src/util/boost-context)
-add_subdirectory(src/conv-core)
+# add_subdirectory(src/util/boost-context)
+# add_subdirectory(src/conv-core)
 
 # LIBS
 if(${TARGET} STREQUAL "LIBS")
@@ -908,14 +924,16 @@ configure_file(src/scripts/testrun bin/ COPYONLY)
 # Charm++ libraries
 
 # CkLoop
+#[[
 set(ckloop-cxx-files src/libs/ck-libs/ckloop/CkLoop.C)
-set(ckloop-h-files src/libs/ck-libs/ckloop/CkLambda.h src/libs/ck-libs/ckloop/CkLoopAPI.h src/libs/ck-libs/ckloop/CkLoop.h)
-add_library(moduleCkLoop ${ckloop-cxx-files} ${ckloop-h-files} ${CMAKE_BINARY_DIR}/include/CkLoop.decl.h)
-add_dependencies(moduleCkLoop ck)
+#set(ckloop-h-files src/libs/ck-libs/ckloop/CkLambda.h src/libs/ck-libs/ckloop/CkLoopAPI.h src/libs/ck-libs/ckloop/CkLoop.h)
+#add_library(moduleCkLoop ${ckloop-cxx-files} ${ckloop-h-files} ${CMAKE_BINARY_DIR}/include/CkLoop.decl.h)
+#add_dependencies(moduleCkLoop ck)
 
-foreach(file ${ckloop-h-files})
-  configure_file(${file} ${CMAKE_BINARY_DIR}/include COPYONLY)
-endforeach(file)
+#foreach(file ${ckloop-h-files})
+  #configure_file(${file} ${CMAKE_BINARY_DIR}/include COPYONLY)
+#endforeach(file)
+]]
 
 # allGather
 configure_file(src/libs/ck-libs/allGather/allGather.h  ${CMAKE_BINARY_DIR}/include COPYONLY)
@@ -942,6 +960,7 @@ configure_file(src/libs/ck-libs/NDMeshStreamer/libmoduleNDMeshStreamer.dep ${CMA
 
 
 # TCharm
+#[[
 file(GLOB tcharm-c-sources src/libs/ck-libs/tcharm/*.c)
 set(tcharm-h-sources
     src/libs/ck-libs/tcharm/tcharm.h
@@ -965,9 +984,11 @@ foreach(f ${tcharm-h-sources})
     configure_file(${f} ${CMAKE_BINARY_DIR}/include COPYONLY)
 endforeach(f)
 
+
 add_dependencies(moduletcharmmain ck)
 add_dependencies(moduletcharm ck)
 add_dependencies(tcharm-compat ck)
+]]
 
 if(${TARGET} STREQUAL "AMPI" OR (${TARGET} STREQUAL "LIBS" AND NOT BUILD_CHANGA))
   add_subdirectory(src/libs/ck-libs/ampi)
@@ -1004,8 +1025,11 @@ if(${TARGET} STREQUAL "charm4py")
 else()
   # Check that we are able to build and link an executable
   add_executable(ckhello ${CMAKE_SOURCE_DIR}/tests/charm++/simplearrayhello/hello.C)
-  add_dependencies(ckhello ck ldb-none memory-default threads-default conv-static
-    converse ckmain ckqt
+  if(RECONVERSE)
+    target_link_libraries(ckhello PRIVATE reconverse)
+  endif()
+  add_dependencies(ckhello ck ckqt conv-static
+    converse ckmain
     moduleNDMeshStreamer modulecompletion)
 endif()
 

buildcmake

@@ -131,6 +131,10 @@ opt_shmem=0
 opt_xpmem=0
 opt_qlogic=0
 opt_randomized_msgq=0
+opt_reconverse=1 # fake argument for now
+opt_fetch_reconverse_tag=""
+opt_fetch_reconverse_dir=""
+opt_reconverse_fetch_lci=1
 opt_refnum_type="unsigned short"
 opt_replay=0
 opt_shrinkexpand=0
@@ -143,6 +147,7 @@ opt_tcp=0
 opt_tracing= #undef
 opt_tracing_commthread=0
 opt_zlib=1
+declare -a opt_cmake_extra_args=()
 
 # default to not building ROMIO on AMPI due to GCC 14 cascade failures
 case "$actual_triplet" in
@@ -348,6 +353,18 @@ function processArgs() {
       --enable-ccs)
         opt_ccs=1
         ;;
+      --enable-reconverse)
+        opt_reconverse=1
+        ;;
+      --with-fetch-reconverse-tag=*)
+        opt_fetch_reconverse_tag=${arg#*=}
+        ;;
+      --with-fetch-reconverse-dir=*)
+        opt_fetch_reconverse_dir=${arg#*=}
+        ;;
+      --without-reconverse-fetch-lci)
+        opt_reconverse_fetch_lci=0
+        ;;
       --enable-controlpoint)
         opt_controlpoint=1
         ;;
@@ -462,6 +479,11 @@ function processArgs() {
       --incdir=*)
         opt_incdir+=("-I${arg#*=}")
         ;;
+      --with-cmake-args=*)
+        # Split the value into words (quotes preserved by the shell before this point)
+        read -r -a _vals <<< "${arg#*=}"
+        opt_cmake_extra_args+=("${_vals[@]}")
+        ;;
       *)
         echo "*** Note: Adding unknown option '$arg' to compiler flags."
         opt_extra_opts+=("$arg")
@@ -634,6 +656,17 @@ fi
 
 # Run configure step
 
+CMAKE_EXTRA_ARGS=()
+if [[ -n "$opt_fetch_reconverse_tag" ]]; then
+  CMAKE_EXTRA_ARGS+=(-DAUTOFETCH_RECONVERSE_TAG="$opt_fetch_reconverse_tag")
+fi
+if [[ -n "$opt_fetch_reconverse_dir" ]]; then
+  CMAKE_EXTRA_ARGS+=(-DFETCHCONTENT_SOURCE_DIR_RECONVERSE="$opt_fetch_reconverse_dir")
+fi
+if (( ${#opt_cmake_extra_args[@]} > 0 )); then
+  CMAKE_EXTRA_ARGS+=("${opt_cmake_extra_args[@]}")
+fi
+
 CC=$opt_CC CXX=$opt_CXX FC=$opt_FC cmake "$my_srcdir" \
   -G "Unix Makefiles" \
   -DARCH="$opt_arch" \
@@ -670,6 +703,8 @@ CC=$opt_CC CXX=$opt_CXX FC=$opt_FC cmake "$my_srcdir" \
   -DCMK_USE_SHMEM="$opt_shmem" \
   -DQLOGIC="$opt_qlogic" \
   -DRANDOMIZED_MSGQ="$opt_randomized_msgq" \
+  -DRECONVERSE="$opt_reconverse" \
+  -DRECONVERSE_AUTOFETCH_LCI2="$opt_reconverse_fetch_lci" \
   -DREFNUM_TYPE="$opt_refnum_type" \
   -DREPLAY="$opt_replay" \
   -DSHRINKEXPAND="$opt_shrinkexpand" \
@@ -683,7 +718,8 @@ CC=$opt_CC CXX=$opt_CXX FC=$opt_FC cmake "$my_srcdir" \
   -DTRACING_COMMTHREAD="$opt_tracing_commthread" \
   -DCXI="$opt_cxi" \
   -DCMK_BUILD_OFI="$opt_build_ofi" \
-  -DZLIB="$opt_zlib"
+  -DZLIB="$opt_zlib" \
+  "${CMAKE_EXTRA_ARGS[@]}"
 
 
 # Run build step