Merge branch 'main' into nodegrpPrio

.github/workflows/ci.yaml

@@ -129,7 +129,7 @@ jobs:
 
   multicore-darwin-x86_64_projections:
     timeout-minutes: 60
-    runs-on: macos-latest
+    runs-on: macos-12
     steps:
     - uses: actions/checkout@v4
     - name: build
@@ -148,6 +148,28 @@ jobs:
         files=$(find . -name *.sts)
         for f in $files; do echo $f; pushd .; cd $(dirname $f); $proj --exit $(basename $f); popd; done
 
+  # FIXME: disabled since tests don't pass
+  # multicore-darwin-arm8_projections:
+  #   timeout-minutes: 60
+  #   runs-on: macos-latest
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #   - name: build
+  #     run: ./build LIBS multicore-darwin-arm8 -g -j3 --with-production --enable-tracing
+  #   - name: test
+  #     run: |
+  #       make -C multicore-darwin-arm8/tmp all-test -j3 OPTS="-g -tracemode projections"
+  #       make -C multicore-darwin-arm8/tmp test
+  #   - name: projections
+  #     run: |
+  #       git clone https://github.com/UIUC-PPL/projections
+  #       cd projections
+  #       make
+  #       proj=$PWD/bin/projections
+  #       cd ..
+  #       files=$(find . -name *.sts)
+  #       for f in $files; do echo $f; pushd .; cd $(dirname $f); $proj --exit $(basename $f); popd; done
+
   namd_netlrts-linux-x86_64:
     # Since NAMD requires a secret to download its source from Gitlab, CI builds from outside PPL
     # always fail in this test since the secret is not available.
@@ -208,7 +230,7 @@ jobs:
 
   netlrts-darwin-x86_64:
     timeout-minutes: 60
-    runs-on: macos-latest
+    runs-on: macos-12
     steps:
     - uses: actions/checkout@v4
     - name: build
@@ -219,6 +241,20 @@ jobs:
     - name: testp P=2
       run: make -C netlrts-darwin-x86_64/tmp testp P=2 TESTOPTS="++local"
 
+  # FIXME: disabled since tests don't pass
+  # netlrts-darwin-arm8:
+  #   timeout-minutes: 60
+  #   runs-on: macos-latest
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #   - name: build
+  #     run: ./build all-test netlrts-darwin-arm8 --build-shared --with-production --enable-error-checking --enable-lbuserdata -j3 -g -Werror=vla
+  #     # TODO: this should build tests with "-charm-shared". See #2735 on why this is not done currently.
+  #   - name: test
+  #     run: make -C netlrts-darwin-arm8/tmp test TESTOPTS="++local"
+  #   - name: testp P=2
+  #     run: make -C netlrts-darwin-arm8/tmp testp P=2 TESTOPTS="++local"
+
   netlrts-linux-i386:
     timeout-minutes: 60
     runs-on: ubuntu-latest
@@ -300,7 +336,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-12]
 
     steps:
     - uses: actions/checkout@v4

CMakeLists.txt

@@ -989,7 +989,11 @@ if(${TARGET} STREQUAL "charm4py")
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
   add_library(charm SHARED empty.cpp)
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib_so)
-  target_link_libraries(charm ck converse memory-default threads-default ldb-rand "-Llib/ -standalone -whole-archive -c++stl -shared")
+  if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    target_link_libraries(charm ck converse memory-default threads-default ldb-rand "-Llib/ -standalone -all_load -c++stl -shared")
+  else()
+    target_link_libraries(charm ck converse memory-default threads-default ldb-rand "-Llib/ -standalone -whole-archive -c++stl -shared")
+  endif()
 
   add_dependencies(charm hwloc)
 endif()

src/scripts/Makefile

@@ -82,7 +82,7 @@ AMPIC AMPIF: AMPI
 f90charm: charm++
 
 libcharm: charm++
-	cd $(L) ; $(CHARMC) -standalone -whole-archive -c++stl -shared -o libcharm.so $(LIBCHARM_LIBS)
+	cd $(L) ; $(CHARMC) -standalone -whole-archive -c++stl -shared -o libcharm.$(CMK_SHARED_SUF) $(LIBCHARM_LIBS)
 
 charm4py: libcharm