Merge branch 'main' into status-const

Author: dalcinl

.github/workflows/ci.yml

@@ -25,12 +25,17 @@ jobs:
       fail-fast: false
       matrix:
         os:
+          - ubuntu-24.04
           - ubuntu-22.04
-          - ubuntu-20.04
+          - ubuntu-24.04-arm
+          - ubuntu-22.04-arm
+          - macos-15
           - macos-14
           - macos-13
+          - windows-2025
+          - windows-2022
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - run:  bash -x build-cmake.sh
     - run:  bash check.sh
 
@@ -40,13 +45,16 @@ jobs:
       fail-fast: false
       matrix:
         os:
+          - ubuntu-24.04
           - ubuntu-22.04
-          - ubuntu-20.04
+          - ubuntu-24.04-arm
+          - ubuntu-22.04-arm
+          - macos-15
           - macos-14
           - macos-13
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
+    - uses: actions/checkout@v5
+    - uses: actions/setup-python@v6
       with: {python-version: '3.x'}
     - run:  python -m pip install meson ninja
     - run:  bash -x build-meson.sh
@@ -58,11 +66,14 @@ jobs:
       fail-fast: false
       matrix:
         os:
+          - ubuntu-24.04
           - ubuntu-22.04
-          - ubuntu-20.04
+          - ubuntu-24.04-arm
+          - ubuntu-22.04-arm
+          - macos-15
           - macos-14
           - macos-13
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - run:  make
     - run:  bash check.sh

.github/workflows/mpi4py.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
 
     - name: Checkout mpi-stubs
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         path: mpi-stubs
 
@@ -36,12 +36,12 @@ jobs:
         echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$mpi_stubs/lib >> $GITHUB_ENV
 
     - name: Setup Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3
 
     - name: Checkout mpi4py
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         repository: mpi4py/mpi4py
         path: mpi4py

CMakeLists.txt

@@ -1,10 +1,11 @@
-cmake_minimum_required(VERSION 3.5.0)
-project(mpi-stubs VERSION 4.2 LANGUAGES C)
+cmake_minimum_required(VERSION 3.5.0...4.1.0)
+project(mpi-abi-stubs VERSION 5.0 LANGUAGES C)
 
 option(BUILD_SHARED_LIBS "Build libraries as SHARED" TRUE)
 
 add_library(mpi_abi mpistubs.c)
 set_target_properties(mpi_abi PROPERTIES VERSION 0)
+set_target_properties(mpi_abi PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS 1)
 
 include(GNUInstallDirs)
 install(FILES mpi.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

README.md

@@ -1,3 +1,3 @@
-# header_and_stub_library
+# mpi-abi-stubs
 
 The reference for the MPI standard ABI instantiated in mpi.h and a stub library libmpi_abi.so

build-cmake.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -eu
 cmake -B build -DCMAKE_INSTALL_PREFIX="${PREFIX:-$PWD}"
-cmake --build build
-cmake --install build
+cmake --build build --config Release
+cmake --install build --config Release
 (test -d lib64 && ln -f -s lib64 lib) || true

check.sh

@@ -6,12 +6,18 @@ export PATH=${prefix}/bin:$PATH
 
 case "$(uname)" in
     Linux)
+        lib="lib"
         so=".so"
         ;;
     Darwin)
         ldd () { otool -L "$1"; }
+        lib="lib"
         so=".dylib"
         ;;
+    *_NT-*)
+        lib=""
+        so=".dll"
+        ;;
 esac
 
 tempdir="$(mktemp -d)"
@@ -41,13 +47,11 @@ command -v mpicc
 command -v mpicxx
 echo "$(mpicc -show-incdir)/mpi.h":
 grep -E 'MPI_(SUB)?VERSION' "$(mpicc -show-incdir)/mpi.h"
-echo "$(mpicc -show-libdir)/lib$(mpicc -show-libs)$so":
-ldd "$(mpicc -show-libdir)/lib$(mpicc -show-libs)$so"
+echo "$(mpicc -show-libdir)/$lib$(mpicc -show-libs)$so":
+ldd "$(mpicc -show-libdir)/$lib$(mpicc -show-libs)$so"
 
 set -x
 
-RPATH=-Wl,-rpath,$(mpicc -show-libdir)
-
 mpicc -show
 mpicc -show-incdir
 mpicc -show-libdir
@@ -58,8 +62,8 @@ for cc in gcc clang; do
     diff cc.log mpicc.log
     mpicc -cc="$cc" ./helloworld.c -c
     test -f helloworld.o && rm helloworld.o
-    mpicc -cc="$cc" ./helloworld.c "$RPATH"
-    ldd a.out && rm a.out
+    mpicc -cc="$cc" ./helloworld.c -o hw.exe
+    ldd hw.exe && rm hw.exe
 done
 
 mpicxx -show
@@ -72,6 +76,6 @@ for cxx in g++ clang++; do
     diff cxx.log mpicxx.log
     mpicxx -cxx="$cxx" ./helloworld.cxx -c
     test -f helloworld.o && rm helloworld.o
-    mpicxx -cxx="$cxx" ./helloworld.cxx "$RPATH"
-    ldd a.out && rm a.out
+    mpicxx -cxx="$cxx" ./helloworld.cxx -o hw.exe
+    ldd hw.exe && rm hw.exe
 done