Merge branch 'housekeeping_2026-02-06' into 'development'

eisenlohr · eisenlohr · commit f74b1e67c488 · 2026-02-13T09:31:53.000-05:00
enable compilation on arm64 mac

See merge request damask/DAMASK!1172
diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
@@ -2,7 +2,7 @@ name: Grid and Mesh Solver
 on: [push]
 
 env:
-  PETSC_VERSION: '3.24.2'
+  PETSC_VERSION: '3.24.4'
   HOMEBREW_NO_ANALYTICS: 'ON'     # Make Homebrew installation a little quicker
   HOMEBREW_NO_AUTO_UPDATE: 'ON'
   HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 'ON'
@@ -25,12 +25,13 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v4
+      - name: DAMASK - Checkout
+        uses: actions/checkout@v4
 
       - name: GCC - Install
         run: |
           sudo apt-get update
-          sudo apt-get install liblapack-dev
+          sudo apt-get install liblapack-dev libbz2-dev libfyaml-dev
           sudo apt-get install -y gcc-${GCC_V} gfortran-${GCC_V} g++-${GCC_V}
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \
           --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \
@@ -66,8 +67,10 @@ jobs:
       - name: PETSc - Installation
         run: |
           cd petsc-${PETSC_VERSION}
-          ./configure --with-fc=gfortran --with-cc=gcc --with-cxx=g++ \
-          --download-openmpi --download-fftw --download-hdf5 --with-hdf5-fortran-bindings=1 --download-zlib \
+          sed -i 's/self.getCompiler().lower()/self.getCompiler()/g' config/BuildSystem/config/packages/boost.py # https://gitlab.com/petsc/petsc/-/merge_requests/9012
+          ./configure \
+          --with-fc=gfortran --with-cc=gcc --with-cxx=g++ \
+          --download-openmpi --download-fftw --download-hdf5 --with-hdf5-fortran-bindings=1 --download-zlib --download-boost \
           --with-mpi-f90module-visibility=1
           make all
 
@@ -91,7 +94,9 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v4
+
+      - name: DAMASK - Checkout
+        uses: actions/checkout@v4
 
       - name: Intel - Install
         run: |
@@ -104,7 +109,7 @@ jobs:
           | sudo tee /etc/apt/sources.list.d/oneAPI.list
           sudo apt-get update
           sudo apt-get install \
-          intel-basekit intel-hpckit
+          intel-basekit intel-hpckit libbz2-dev libfyaml-dev
           source /opt/intel/oneapi/setvars.sh
           printenv >> $GITHUB_ENV
 
@@ -138,11 +143,9 @@ jobs:
         run: |
           cd petsc-${PETSC_VERSION}
           ./configure \
-          --with-fc=mpiifx \
-          --with-cc=mpiicx \
-          --with-cxx=mpiicpx \
+          --with-fc=mpiifx --with-cc=mpiicx --with-cxx=mpiicpx \
           --with-x=0 \
-          --download-fftw --download-hdf5 --with-hdf5-fortran-bindings=1 --download-zlib
+          --download-fftw --download-hdf5 --with-hdf5-fortran-bindings=1 --download-zlib --download-boost
           make all
 
       - name: DAMASK - Compile
@@ -155,3 +158,63 @@ jobs:
         run: |
           ./bin/DAMASK_grid -l tensionX.yaml -g 20grains16x16x16.vti -m material.yaml -w examples/grid
           ./bin/DAMASK_mesh -l tensionZ_3g.yaml -g cube_3grains.msh -m material.yaml -w examples/mesh
+
+
+  macos_homebrew:
+
+    runs-on: macos-26
+
+    steps:
+
+      - name: DAMASK - Checkout
+        uses: actions/checkout@v4
+
+      - name: GCC - Install
+        uses: gerlero/brew-install@v1
+        with:
+          packages: gcc open-mpi bzip2 libfyaml
+
+      - name: PETSc - Cache download
+        id: petsc-download
+        uses: actions/cache@v4
+        with:
+          path: download
+          key: petsc-${{ env.PETSC_VERSION }}.tar.gz
+
+      - name: PETSc - Download
+        if: steps.petsc-download.outputs.cache-hit != 'true'
+        run: |
+          wget -q https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${PETSC_VERSION}.tar.gz -P download
+
+      - name: PETSc - Prepare
+        run: |
+          tar -xf download/petsc-${PETSC_VERSION}.tar.gz -C .
+          export PETSC_DIR=${PWD}/petsc-${PETSC_VERSION}
+          export PETSC_ARCH=macos${GCC_V}
+          printenv >> $GITHUB_ENV
+
+      - name: PETSc - Cache Installation
+        id: petsc-install
+        uses: actions/cache@v4
+        with:
+          path: petsc-${{ env.PETSC_VERSION }}
+          key: petsc-${{ env.PETSC_VERSION }}-macos-${{ hashFiles('**/petscversion.h') }}
+
+      - name: PETSc - Installation
+        run: |
+          ln -s /opt/homebrew/bin/gfortran-15 /opt/homebrew/bin/gfortran
+          cd petsc-${PETSC_VERSION}
+          ./configure --with-fc=mpifort --with-cc=mpicc --with-cxx=mpic++ \
+          --download-fftw --download-hdf5 --with-hdf5-fortran-bindings=1 --download-zlib --download-boost
+          make all
+
+      - name: DAMASK - Compile
+        run: |
+          cmake -B build -DGRID=ON -DMESH=ON -DCMAKE_INSTALL_PREFIX=${PWD} -DBUILDCMD_POST="--include-directory-after=$(gfortran -print-file-name=include)"
+          cmake --build build --parallel
+          cmake --install build
+
+      - name: DAMASK - Run
+        run: |
+          ./bin/DAMASK_grid -l tensionX.yaml -g 20grains16x16x16.vti -m material.yaml -w examples/grid
+          ./bin/DAMASK_mesh -l tensionZ_3g.yaml -g cube_3grains.msh -m material.yaml -w examples/mesh
diff --git a/.github/workflows/processing.yml b/.github/workflows/processing.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.18.0)
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_C_STANDARD 17)
 include(FindPkgConfig REQUIRED)
+include(CheckCXXSymbolExists REQUIRED)
 
 if(DEFINED ENV{PETSC_DIR})
   message("PETSC_DIR:\n$ENV{PETSC_DIR}\n")
@@ -41,16 +42,12 @@ project(DAMASK
         HOMEPAGE_URL https://damask-multiphysics.org
         LANGUAGES Fortran C CXX VERSION "${DAMASK_VERSION_CMAKE}")
 
-if(NOT ${CMAKE_Fortran_COMPILER_ID} STREQUAL "LLVMFlang")
-  if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL ${CMAKE_Fortran_COMPILER_ID})
-    message(FATAL_ERROR "C compiler (${CMAKE_C_COMPILER_ID}) does not match Fortran compiler (${CMAKE_Fortran_COMPILER_ID})")
-  endif()
-  if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL ${CMAKE_Fortran_COMPILER_ID})
-    message(FATAL_ERROR "C++ compiler (${CMAKE_CXX_COMPILER_ID}) does not match Fortran compiler (${CMAKE_Fortran_COMPILER_ID})")
-  endif()
-endif()
-
 set(CMAKE_Fortran_PREPROCESS "ON")
+# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
+set(CMAKE_MACOSX_RPATH TRUE)
+set(CMAKE_SKIP_BUILD_RPATH TRUE)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 pkg_check_modules(fYAML libfyaml)
 set(Boost_DEBUG ON)
@@ -185,9 +182,10 @@ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
 endif()
 
 set(CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE}} ${PETSC_INCLUDES} ${BUILDCMD_POST}")
+set(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}       "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}       ${PETSC_INCLUDES} ${BUILDCMD_POST}")
 set(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}     "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}}     ${PETSC_INCLUDES} ${BUILDCMD_POST}")
 
-set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} <LINK_FLAGS> <FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -L${PETSC_LIBRARY_DIRS} -lpetsc ${PETSC_EXTERNAL_LIB}")
+set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} <LINK_FLAGS> <FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
 if(${GRID})
   set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} -lz")
 endif()
@@ -202,8 +200,6 @@ if(fYAML_FOUND STREQUAL "1")
   set(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}} -I${fYAML_INCLUDE_DIR}")
 endif()
 
-# Link with Fortran compiler requires to add C++ standard library
-set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} -lstdc++ ${BUILDCMD_POST}")
 
 message("Fortran Compiler Flags:\n${CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE}}\n")
 message("C Compiler Flags:\n${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}\n")
diff --git a/python/tests/test_grid_filters.py b/python/tests/test_grid_filters.py
@@ -33,7 +33,7 @@ def test_coord0(np_rng):
 def test_grid_DNA(np_rng,mode,atol):
     """Ensure that cellsSizeOrigin_coordinates0_xx is the inverse of coordinates0_xx."""
     cells  = np_rng.integers(8,32,(3))
-    size   = np_rng.random(3)
+    size   = np_rng.random(3) + atol*100.
     origin = np_rng.random(3)
     coord0 = eval(f'grid_filters.coordinates0_{mode}(cells,size,origin)')                         # noqa
     coord0 += (np_rng.random(coord0.shape)-0.5) * atol                                            # add noise
diff --git a/src/CLI.cpp b/src/CLI.cpp
@@ -34,7 +34,7 @@
 #include <filesystem>
 #include <stdexcept>
 #include <utility>
-#include "petscversion.h"
+#include <petscversion.h>
 
 namespace fs = std::filesystem;
 
diff --git a/src/CLI.f90 b/src/CLI.f90
@@ -90,7 +90,11 @@ subroutine CLI_init()
 #elif PETSC_VERSION_MINOR==24
 #define PETSC_DOI '10.2172/2998643'
 #endif
-#if !(defined(BOOST))
+#if (defined(BOOST) && !defined(OLD_STYLE_C_TO_FORTRAN_STRING))
+  type(C_PTR) :: CLI_ = C_NULL_PTR
+  type(tCLIArgs) :: cliArgs
+  integer(C_INT) :: stat
+#else
   character(len=:), allocatable :: &
     commandLine, &                                                                                  !< command line call as string
     flag, &                                                                                         !< individual flag
@@ -106,11 +110,6 @@ subroutine CLI_init()
 #ifdef PETSC_DOI
   character(len=*), parameter :: PETSc_DOI = PETSC_DOI
 #endif
-#if (defined(BOOST) && !defined(OLD_STYLE_C_TO_FORTRAN_STRING))
-  type(C_PTR) :: CLI_ = C_NULL_PTR
-  type(tCLIArgs) :: cliArgs
-  integer(C_INT) :: stat
-#endif
 
   print'(/,1x,a)', '<<<+-  CLI init  -+>>>'
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,4 +1,24 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
+function(fs_case_sensitive base_path out_var)
+  set(_test_dir "${base_path}/neveruse")
+  file(MAKE_DIRECTORY "${_test_dir}")
+  file(WRITE "${_test_dir}/never.use" "test\n")
+  file(WRITE "${_test_dir}/NEVER.USE" "test\n")
+
+  # Count distinct directory entries
+  file(GLOB _case_test_files "${_test_dir}/*")
+  list(LENGTH _case_test_files _case_test_count)
+
+  # If both names coexist as separate entries -> case-sensitive
+  set(_is_case_sensitive FALSE)
+  if(_case_test_count GREATER 1)
+    set(_is_case_sensitive TRUE)
+  endif()
+
+  file(REMOVE_RECURSE "${_test_dir}")
+  set(${out_var} ${_is_case_sensitive} PARENT_SCOPE)
+endfunction()
+
 foreach(VARIANT GRID MESH TEST)
   if(${VARIANT})
     string(TOLOWER "${VARIANT}" VARIANT_LOWER)
@@ -29,12 +49,32 @@ foreach(VARIANT GRID MESH TEST)
         add_compile_definitions(BOOST)
       endif()
       target_link_libraries(${executable_name} PRIVATE damask_c_${VARIANT_LOWER})
+      target_link_directories(${executable_name} PRIVATE ${PETSC_LIBRARY_DIRS})
+      target_link_libraries(${executable_name} PRIVATE
+        ${PETSC_LIBRARIES}
+        ${PETSC_EXTERNAL_LIB}
+      )
+
+      # Link with Fortran compiler requires to add C++ standard library
+      check_cxx_symbol_exists(__GLIBCXX__ "iostream" IS_GNU)
+      check_cxx_symbol_exists(_LIBCPP_VERSION "iostream" IS_LLVM)
+      if(${IS_GNU})
+        target_link_libraries(${executable_name} PRIVATE stdc++)
+      elseif(${IS_LLVM})
+        target_link_libraries(${executable_name} PRIVATE c++)
+      else()
+        message(FATAL_ERROR "Could not determine C++ standard library")
+      endif()
+
       install(TARGETS ${executable_name} RUNTIME DESTINATION bin)
-      INSTALL(CODE "execute_process( \
-        COMMAND ${CMAKE_COMMAND} -E create_symlink \
-        ${executable_name} \
-        ${CMAKE_INSTALL_PREFIX}/bin/damask_${VARIANT_LOWER} \
-        )")
+      fs_case_sensitive(${CMAKE_INSTALL_PREFIX}/bin fs_is_case_sensitive)
+      if(fs_is_case_sensitive)
+        INSTALL(CODE "execute_process( \
+          COMMAND ${CMAKE_COMMAND} -E create_symlink \
+          ${executable_name} \
+          ${CMAKE_INSTALL_PREFIX}/bin/damask_${VARIANT_LOWER} \
+          )")
+      endif()
     else()
       add_library(${executable_name} OBJECT ${damask_fortran} ${damask_c})
       exec_program(mktemp OUTPUT_VARIABLE nothing)
diff --git a/src/C_routines.c b/src/C_routines.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <pwd.h>
 #include <limits.h>
-#include "ISO_Fortran_binding.h"
+#include <ISO_Fortran_binding.h>
 #include <stdbool.h>
 
 #ifdef GRID
