fixes for MacOS and new CI to prevent future breaks

.github/workflows/dependencies-macos.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+set -eu -o pipefail
+
+brew install open-mpi autoconf automake libtool ossp-uuid
+
+# libfabric
+wget https://github.com/ofiwg/libfabric/archive/refs/tags/v1.12.1.tar.gz
+tar xf v1.12.1.tar.gz
+cd libfabric-1.12.1
+./autogen.sh
+./configure --disable-usnic --disable-mrail --disable-rstream --disable-perf --disable-efa --disable-psm2 --disable-psm --disable-verbs --disable-shm --disable-static --disable-silent-rules
+make -j2 && sudo make install
+make check
+cd ..
+
+# Mercury
+git clone --recursive https://github.com/mercury-hpc/mercury.git
+cd mercury
+git checkout v2.1.0
+mkdir build && cd build
+cmake ../ -DCMAKE_C_COMPILER=gcc -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=ON -DNA_USE_OFI=ON -DNA_USE_SM=OFF -DMERCURY_USE_CHECKSUMS=OFF -DNA_OFI_TESTING_PROTOCOL=sockets
+make -j2 && sudo make install
+ctest

.github/workflows/macos.yml

@@ -0,0 +1,25 @@
+name: MacOS
+
+on:
+ pull_request:
+ branches: [ stable, develop ]
+
+ # Allows to run this workflow manually from the Actions tab
+ workflow_dispatch:
+
+jobs:
+ PDC:
+ runs-on: macos-13
+ timeout-minutes: 60
+
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Dependencies
+ run: .github/workflows/dependencies-macos.sh
+
+ - name: Build PDC
+ run: |
+ mkdir build && cd build
+ cmake ../ -DBUILD_MPI_TESTING=ON -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=ON -DPDC_ENABLE_MPI=ON -DCMAKE_C_COMPILER=mpicc
+ make -j 2

.github/workflows/linux.yml → .github/workflows/ubuntu.yml

@@ -1,8 +1,6 @@
-name: linux 
+name: Ubuntu
 
 on:
- # push:
- # branches: [ stable ]
  pull_request:
  branches: [ stable, develop ]
 
@@ -27,14 +25,6 @@ jobs:
  cmake ../ -DBUILD_MPI_TESTING=ON -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=ON -DPDC_ENABLE_MPI=ON -DCMAKE_C_COMPILER=mpicc
  make -j2
 
- # - name: Debug test PDC
- # working-directory: ./src/build/bin
- # run: |
- # mpirun -n 1 ./pdc_server.exe &
- # sleep 1
- # mpirun -n 1 ./pdc_init
- # mpirun -n 1 ./close_server
-
  - name: Test PDC
  working-directory: build
  run: ctest -L serial

CMake/FindMERCURY.cmake

@@ -27,14 +27,14 @@ if(MERCURY_FOUND)
  HINTS ${MERCURY_DIR}
  )
 
- # find_library(MERCURY_UTIL_LIBRARY
- # NAMES
- # mercury_util
- # HINTS ${MERCURY_DIR}
- # )
+ find_library(MERCURY_UTIL_LIBRARY
+   NAMES
+   mercury_util
+   HINTS ${MERCURY_DIR}
+ )
 
- # set(MERCURY_LIBRARIES ${MERCURY_LIBRARY} ${MERCURY_NA_LIBRARY} ${MERCURY_UTIL_LIBRARY})
- set(MERCURY_LIBRARIES ${MERCURY_LIBRARY} ${MERCURY_NA_LIBRARY})
+ set(MERCURY_LIBRARIES ${MERCURY_LIBRARY} ${MERCURY_NA_LIBRARY} ${MERCURY_UTIL_LIBRARY})
+ # set(MERCURY_LIBRARIES ${MERCURY_LIBRARY} ${MERCURY_NA_LIBRARY})
  set(MERCURY_INCLUDE_DIRS ${MERCURY_INCLUDE_DIR})
  message(STATUS "mercury include dir = ${MERCURY_INCLUDE_DIRS}")
  message(STATUS "mercury lib = ${MERCURY_LIBRARIES}")

CMake/FindUUID.cmake

@@ -1,36 +1,41 @@
-# FindUUID.cmake
+# On Mac OS X the uuid functions are in the System library
 
-# Find the system's UUID library
-# This will define:
-#
-# UUID_FOUND - System has UUID
-# UUID_INCLUDE_DIRS - The UUID include directory
-# UUID_LIBRARIES - The libraries needed to use UUID
+if(APPLE)
+ set(UUID_LIBRARY_VAR System)
+else()
+ set(UUID_LIBRARY_VAR uuid)
+endif()
 
-# - Try to find UUID
-# Once done this will define
-# UUID_FOUND - System has UUID
-# UUID_INCLUDE_DIRS - The UUID include directories
-# UUID_LIBRARIES - The libraries needed to use UUID
-
-find_package(PkgConfig)
-pkg_check_modules(PC_UUID uuid)
+find_library(UUID_LIBRARY
+ NAMES ${UUID_LIBRARY_VAR}
+ PATHS /usr/local/lib64 /usr/local/lib /usr/lib64 /usr/lib
+)
 
 find_path(UUID_INCLUDE_DIR uuid/uuid.h
  HINTS ${PC_UUID_INCLUDEDIR} ${PC_UUID_INCLUDE_DIRS}
- PATHS /usr/local/include /usr/include)
-
-find_library(UUID_LIBRARY NAMES uuid
- HINTS ${PC_DRC_LIBDIR} ${PC_DRC_LIBRARY_DIRS}
- PATHS /usr/local/lib64 /usr/local/lib /usr/lib64 /usr/lib)
-
-set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR})
-set(UUID_LIBRARIES ${UUID_LIBRARY})
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set UUID_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(UUID DEFAULT_MSG
- UUID_INCLUDE_DIR UUID_LIBRARY)
-
-mark_as_advanced(UUID_INCLUDE_DIR UUID_LIBRARY)
+ PATHS /usr/local/include /usr/include
+)
+
+if (UUID_LIBRARY AND UUID_INCLUDE_DIR)
+ set(UUID_LIBRARIES ${UUID_LIBRARY})
+ set(UUID_FOUND "YES")
+else ()
+ set(UUID_FOUND "NO")
+endif ()
+
+if (UUID_FOUND)
+ if (NOT UUID_FIND_QUIETLY)
+ message(STATUS "Found UUID: ${UUID_LIBRARIES}")
+ endif ()
+else ()
+ if (UUID_FIND_REQUIRED)
+ message( "library: ${UUID_LIBRARY}" )
+ message( "include: ${UUID_INCLUDE_DIR}" )
+ message(FATAL_ERROR "Could not find UUID library")
+ endif ()
+endif ()
+
+mark_as_advanced(
+ UUID_LIBRARY
+ UUID_INCLUDE_DIR
+)

src/api/CMakeLists.txt

@@ -42,7 +42,7 @@ if(MERCURY_FOUND)
  set(PDC_EXT_INCLUDE_DEPENDENCIES ${MERCURY_INCLUDE_DIR}
  ${PDC_EXT_INCLUDE_DEPENDENCIES}
  )
- set(PDC_EXT_LIB_DEPENDENCIES mercury ${PDC_EXT_LIB_DEPENDENCIES})
+ set(PDC_EXT_LIB_DEPENDENCIES ${MERCURY_LIBRARIES} ${PDC_EXT_LIB_DEPENDENCIES})
 endif()
 
 include_directories(${PDC_EXT_INCLUDE_DEPENDENCIES})

src/commons/utils/include/pdc_malloc.h

@@ -76,8 +76,8 @@ void *PDC_free(void *mem);
  */
 size_t PDC_get_global_mem_usage();
 
-#define PDC_MALLOC(t) (t *)PDC_malloc(sizeof(t))
-#define PDC_CALLOC(c, t) (t *)PDC_calloc(c, sizeof(t))
+#define PDC_MALLOC(t) (t *)PDC_malloc(sizeof(t) + 1)
+#define PDC_CALLOC(c, t) (t *)PDC_calloc(c, sizeof(t) + 1)
 
 #define PDC_FREE(t, obj) (t *)(intptr_t) PDC_free(obj)