Merge branch 'main' into timer

FEniCS · Oct 24, 2024 · 83058e5 · 83058e5
2 parents 3978e02 + 17ac58b
commit 83058e5
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 67 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -98,7 +98,7 @@ jobs:
           (Get-Content __init__.py).Replace('# WINDOWSDLL', 'import os; os.add_dll_directory("D:/a/dolfinx/dolfinx-install/bin"); os.add_dll_directory("C:/Program Files (x86)/Intel/oneAPI/mpi/2021.12/opt/mpi/libfabric/bin")') | Set-Content __init__.py
           Get-Content __init__.py
 
-      - uses: mpi4py/setup-mpi@v1.2.2
+      - uses: mpi4py/setup-mpi@v1.2.6
         with:
           mpi: "intelmpi"
 

diff --git a/cpp/cmake/scripts/generate-cmakefiles.py b/cpp/cmake/scripts/generate-cmakefiles.py
@@ -11,16 +11,11 @@
 #
 # python cmake/scripts/generate-cmakefiles.py from dolfinx/cpp
 #
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 
 set(PROJECT_NAME {project_name})
 project(${{PROJECT_NAME}} LANGUAGES C CXX)
 
-# Set C++20 standard
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 if(NOT TARGET dolfinx)
   find_package(DOLFINX REQUIRED)
 endif()
@@ -30,6 +25,10 @@
 add_executable(${{PROJECT_NAME}} {src_files})
 target_link_libraries(${{PROJECT_NAME}} dolfinx)
 
+# Set C++20 standard
+set(CMAKE_CXX_EXTENSIONS OFF)
+target_compile_features(${{PROJECT_NAME}} PUBLIC cxx_std_20)
+
 # Do not throw error for 'multi-line comments' (these are typical in rst which
 # includes LaTeX)
 include(CheckCXXCompilerFlag)
@@ -54,16 +53,11 @@
 #
 # python cmake/scripts/generate-cmakefiles from dolfinx/cpp
 #
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 
 set(PROJECT_NAME {project_name})
 project(${{PROJECT_NAME}} LANGUAGES C CXX)
 
-# Set C++20 standard
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 if(NOT TARGET dolfinx)
   find_package(DOLFINX REQUIRED)
 endif()
@@ -95,6 +89,10 @@
   add_executable(${{PROJECT_NAME}} {src_files} ${{CMAKE_CURRENT_BINARY_DIR}}/{ufl_c_files})
   target_link_libraries(${{PROJECT_NAME}} dolfinx)
 
+  # Set C++20 standard
+  target_compile_features(${{PROJECT_NAME}} PUBLIC cxx_std_20)
+  set(CMAKE_CXX_EXTENSIONS OFF)
+
   # Do not throw error for 'multi-line comments' (these are typical in rst which
   # includes LaTeX)
   include(CheckCXXCompilerFlag)
@@ -119,16 +117,11 @@
 #
 # python cmake/scripts/generate-cmakefiles from dolfinx/cpp
 #
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 
 set(PROJECT_NAME {project_name})
 project(${{PROJECT_NAME}} LANGUAGES C CXX)
 
-# Set C++20 standard
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 if(NOT TARGET dolfinx)
   find_package(DOLFINX REQUIRED)
 endif()
@@ -165,6 +158,10 @@
 add_executable(${{PROJECT_NAME}} {src_files} ${{CMAKE_CURRENT_BINARY_DIR}}/{ufl_c_files})
 target_link_libraries(${{PROJECT_NAME}} dolfinx)
 
+# Set C++20 standard
+set(CMAKE_CXX_EXTENSIONS OFF)
+target_compile_features(${{PROJECT_NAME}} PUBLIC cxx_std_20)
+
 # Do not throw error for 'multi-line comments' (these are typical in rst which
 # includes LaTeX)
 include(CheckCXXCompilerFlag)

diff --git a/cpp/demo/biharmonic/CMakeLists.txt b/cpp/demo/biharmonic/CMakeLists.txt
@@ -2,16 +2,11 @@
 #
 # python cmake/scripts/generate-cmakefiles from dolfinx/cpp
 #
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 
 set(PROJECT_NAME demo_biharmonic)
 project(${PROJECT_NAME} LANGUAGES C CXX)
 
-# Set C++20 standard
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 if(NOT TARGET dolfinx)
   find_package(DOLFINX REQUIRED)
 endif()
@@ -48,6 +43,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 add_executable(${PROJECT_NAME} main.cpp ${CMAKE_CURRENT_BINARY_DIR}/biharmonic.c)
 target_link_libraries(${PROJECT_NAME} dolfinx)
 
+# Set C++20 standard
+set(CMAKE_CXX_EXTENSIONS OFF)
+target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20)
+
 # Do not throw error for 'multi-line comments' (these are typical in rst which
 # includes LaTeX)
 include(CheckCXXCompilerFlag)

diff --git a/cpp/demo/codim_0_assembly/CMakeLists.txt b/cpp/demo/codim_0_assembly/CMakeLists.txt
@@ -2,16 +2,11 @@
 #
 # python cmake/scripts/generate-cmakefiles from dolfinx/cpp
 #
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 
 set(PROJECT_NAME demo_codim_0_assembly)
 project(${PROJECT_NAME} LANGUAGES C CXX)
 
-# Set C++20 standard
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 if(NOT TARGET dolfinx)
   find_package(DOLFINX REQUIRED)
 endif()
@@ -48,6 +43,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 add_executable(${PROJECT_NAME} main.cpp ${CMAKE_CURRENT_BINARY_DIR}/mixed_codim0.c)
 target_link_libraries(${PROJECT_NAME} dolfinx)
 
+# Set C++20 standard
+set(CMAKE_CXX_EXTENSIONS OFF)
+target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20)
+
 # Do not throw error for 'multi-line comments' (these are typical in rst which
 # includes LaTeX)
 include(CheckCXXCompilerFlag)

diff --git a/cpp/demo/custom_kernel/CMakeLists.txt b/cpp/demo/custom_kernel/CMakeLists.txt
@@ -2,16 +2,11 @@
 #
 # python cmake/scripts/generate-cmakefiles.py from dolfinx/cpp
 #
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 
 set(PROJECT_NAME demo_custom_kernel)
 project(${PROJECT_NAME} LANGUAGES C CXX)
 
-# Set C++20 standard
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 if(NOT TARGET dolfinx)
   find_package(DOLFINX REQUIRED)
 endif()
@@ -21,6 +16,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 add_executable(${PROJECT_NAME} main.cpp)
 target_link_libraries(${PROJECT_NAME} dolfinx)
 
+# Set C++20 standard
+set(CMAKE_CXX_EXTENSIONS OFF)
+target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20)
+
 # Do not throw error for 'multi-line comments' (these are typical in rst which
 # includes LaTeX)
 include(CheckCXXCompilerFlag)

diff --git a/cpp/demo/hyperelasticity/CMakeLists.txt b/cpp/demo/hyperelasticity/CMakeLists.txt
@@ -2,16 +2,11 @@
 #
 # python cmake/scripts/generate-cmakefiles from dolfinx/cpp
 #
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 
 set(PROJECT_NAME demo_hyperelasticity)
 project(${PROJECT_NAME} LANGUAGES C CXX)
 
-# Set C++20 standard
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 if(NOT TARGET dolfinx)
   find_package(DOLFINX REQUIRED)
 endif()
@@ -43,6 +38,10 @@ else()
   add_executable(${PROJECT_NAME} main.cpp ${CMAKE_CURRENT_BINARY_DIR}/hyperelasticity.c)
   target_link_libraries(${PROJECT_NAME} dolfinx)
 
+  # Set C++20 standard
+  target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20)
+  set(CMAKE_CXX_EXTENSIONS OFF)
+
   # Do not throw error for 'multi-line comments' (these are typical in rst which
   # includes LaTeX)
   include(CheckCXXCompilerFlag)

diff --git a/cpp/demo/interpolation-io/CMakeLists.txt b/cpp/demo/interpolation-io/CMakeLists.txt
@@ -2,16 +2,11 @@
 #
 # python cmake/scripts/generate-cmakefiles.py from dolfinx/cpp
 #
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 
 set(PROJECT_NAME demo_interpolation-io)
 project(${PROJECT_NAME} LANGUAGES C CXX)
 
-# Set C++20 standard
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 if(NOT TARGET dolfinx)
   find_package(DOLFINX REQUIRED)
 endif()
@@ -21,6 +16,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 add_executable(${PROJECT_NAME} main.cpp)
 target_link_libraries(${PROJECT_NAME} dolfinx)
 
+# Set C++20 standard
+set(CMAKE_CXX_EXTENSIONS OFF)
+target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20)
+
 # Do not throw error for 'multi-line comments' (these are typical in rst which
 # includes LaTeX)
 include(CheckCXXCompilerFlag)

diff --git a/cpp/demo/interpolation_different_meshes/CMakeLists.txt b/cpp/demo/interpolation_different_meshes/CMakeLists.txt
@@ -2,16 +2,11 @@
 #
 # python cmake/scripts/generate-cmakefiles.py from dolfinx/cpp
 #
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 
 set(PROJECT_NAME demo_interpolation_different_meshes)
 project(${PROJECT_NAME} LANGUAGES C CXX)
 
-# Set C++20 standard
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 if(NOT TARGET dolfinx)
   find_package(DOLFINX REQUIRED)
 endif()
@@ -21,6 +16,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 add_executable(${PROJECT_NAME} main.cpp)
 target_link_libraries(${PROJECT_NAME} dolfinx)
 
+# Set C++20 standard
+set(CMAKE_CXX_EXTENSIONS OFF)
+target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20)
+
 # Do not throw error for 'multi-line comments' (these are typical in rst which
 # includes LaTeX)
 include(CheckCXXCompilerFlag)

diff --git a/cpp/demo/poisson/CMakeLists.txt b/cpp/demo/poisson/CMakeLists.txt
@@ -2,16 +2,11 @@
 #
 # python cmake/scripts/generate-cmakefiles from dolfinx/cpp
 #
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 
 set(PROJECT_NAME demo_poisson)
 project(${PROJECT_NAME} LANGUAGES C CXX)
 
-# Set C++20 standard
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 if(NOT TARGET dolfinx)
   find_package(DOLFINX REQUIRED)
 endif()
@@ -48,6 +43,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 add_executable(${PROJECT_NAME} main.cpp ${CMAKE_CURRENT_BINARY_DIR}/poisson.c)
 target_link_libraries(${PROJECT_NAME} dolfinx)
 
+# Set C++20 standard
+set(CMAKE_CXX_EXTENSIONS OFF)
+target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20)
+
 # Do not throw error for 'multi-line comments' (these are typical in rst which
 # includes LaTeX)
 include(CheckCXXCompilerFlag)

diff --git a/cpp/demo/poisson_matrix_free/CMakeLists.txt b/cpp/demo/poisson_matrix_free/CMakeLists.txt
@@ -2,16 +2,11 @@
 #
 # python cmake/scripts/generate-cmakefiles from dolfinx/cpp
 #
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 
 set(PROJECT_NAME demo_poisson_matrix_free)
 project(${PROJECT_NAME} LANGUAGES C CXX)
 
-# Set C++20 standard
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 if(NOT TARGET dolfinx)
   find_package(DOLFINX REQUIRED)
 endif()
@@ -48,6 +43,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 add_executable(${PROJECT_NAME} main.cpp ${CMAKE_CURRENT_BINARY_DIR}/poisson.c)
 target_link_libraries(${PROJECT_NAME} dolfinx)
 
+# Set C++20 standard
+set(CMAKE_CXX_EXTENSIONS OFF)
+target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20)
+
 # Do not throw error for 'multi-line comments' (these are typical in rst which
 # includes LaTeX)
 include(CheckCXXCompilerFlag)

diff --git a/cpp/dolfinx/CMakeLists.txt b/cpp/dolfinx/CMakeLists.txt
@@ -4,6 +4,7 @@ include(GNUInstallDirs)
 # ------------------------------------------------------------------------------
 # Declare the library (target) and set C++ standard
 add_library(dolfinx)
+set(CMAKE_CXX_EXTENSIONS OFF)
 target_compile_features(dolfinx PUBLIC cxx_std_20)
 
 # ------------------------------------------------------------------------------

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -47,6 +47,8 @@ nanobind_add_module(
   dolfinx/wrappers/petsc.cpp
   dolfinx/wrappers/refinement.cpp
 )
+
+set(CMAKE_CXX_EXTENSIONS OFF)
 target_compile_definitions(cpp PRIVATE cxx_std_20)
 
 # Add DOLFINx libraries