CI changes and bugfixes

.github/docker-compose.yml

@@ -3,11 +3,12 @@ services:
     image: "bootstrap"
     build:
       dockerfile_inline: |
-        FROM spack/ubuntu-jammy:0.22.2
+        FROM spack/ubuntu-jammy:0.23
         VOLUME /configs
         ARG OMPI_VERSION
         ENV OMPI_VERSION=$${OMPI_VERSION}
         CMD cp /configs/spack.yaml . && \
+            export OMPI_VERSION=$( [[ "$${OMPI_VERSION}" == git.* ]] && echo "$${OMPI_VERSION}=main" || echo "$${OMPI_VERSION}" ) && \
             spack -e . add openmpi@$${OMPI_VERSION} && \
             spack -e . containerize >/configs/spack.Dockerfile
       args:
@@ -36,8 +37,8 @@ services:
             cmake /fenix \
                 -DCMAKE_BUILD_TYPE=Release \
                 -DCMAKE_C_COMPILER=mpicc \
-                -DFENIX_EXAMPLES=ON \
-                -DFENIX_TESTS=ON \
+                -DBUILD_EXAMPLES=ON \
+                -DBUILD_TESTING=ON \
                 -DMPIEXEC_PREFLAGS="--allow-run-as-root;--map-by;:oversubscribe" && \
             make -j
 

.github/workflows/ci_checks.yaml

@@ -12,6 +12,9 @@ jobs:
         ompi_version:
           - main
           - 5.0.3
+          - git.v5.0.5
+          - git.v5.0.7
+          - git.v5.0.x
 
     steps:
       - name: Checkout
@@ -37,4 +40,4 @@ jobs:
             *.args.OMPI_VERSION=${{ matrix.ompi_version }}
 
       - name: Test Fenix
-        run: docker run fenix
+        run: docker run fenix ctest --output-on-failure --timeout 20 --repeat after-timeout:3

include/fenix.h

@@ -547,8 +547,8 @@ int Fenix_Data_member_lrestore(int group_id, int member_id, void *target_buffer,
 
 //!@unimplemented As #Fenix_Data_member_restore, but restores from a specific rank's data.
 int Fenix_Data_member_restore_from_rank(int group_id, int member_id, void *data,
-                                        int max_count, int time_stamp, int group_id,
-                                        int source_rank);
+                                        int max_count, int time_stamp,
+                                        Fenix_Data_subset* found_data, int source_rank);
 
 /**
  * @brief Create a data subset for use in store operations.

src/fenix.c

@@ -138,7 +138,7 @@ int Fenix_Data_member_lrestore(int group_id, int member_id, void *target_buffer,
     return __fenix_member_lrestore(group_id, member_id, target_buffer, max_count, time_stamp, data_found);
 }
 
-int Fenix_Data_member_restore_from_rank(int group_id, int member_id, void *target_buffer, int max_count, int time_stamp, int source_rank) {
+int Fenix_Data_member_restore_from_rank(int group_id, int member_id, void *target_buffer, int max_count, int time_stamp, Fenix_Data_subset* data_found, int source_rank) {
     return 0;
 }
 

src/fenix_data_recovery.c

@@ -920,8 +920,8 @@ int __fenix_member_set_attribute(int groupid, int memberid, int attributename,
 
         if( myerr ) {
           debug_print(
-                  "ERROR Fenix_Data_member_attr_get: Fenix currently does not support this MPI_DATATYPE; invalid attribute_value <%d>\n",
-                  attributevalue);
+                  "ERROR Fenix_Data_member_attr_get: Fenix currently does not support this MPI_DATATYPE; error %d\n", myerr
+          );
           retval = FENIX_ERROR_INVALID_ATTRIBUTE_NAME;
         }