Merge pull request #159 from awslabs/sjg/release-0.12

Release v0.12
awslabs · Dec 21, 2023 · 8c19207 · 8c19207
2 parents 5aa3e4c + 7013c26
commit 8c19207
Show file tree

Hide file tree

Showing 13 changed files with 151 additions and 170 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,7 @@ The format of this changelog is based on
 [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
 [Semantic Versioning](https://semver.org/).
 
-## In progress
+## [0.12.0] - 2023-12-21
 
   - Added support for operator partial assembly for high-order finite element spaces based
     on libCEED for mixed and non-tensor product element meshes. This option is disabled by

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
 endif()
 
 # Initialize the project
-project(palace-superbuild LANGUAGES CXX C VERSION 0.11.2)
+project(palace-superbuild LANGUAGES CXX C VERSION 0.12.0)
 
 # Define build settings and defaults
 set(PALACE_WITH_64BIT_INT OFF CACHE BOOL "Use 64 bit integers")

diff --git a/cmake/ExternalBLASLAPACK.cmake b/cmake/ExternalBLASLAPACK.cmake
@@ -41,28 +41,29 @@ if(DEFINED ENV{ARMPL_DIR} OR DEFINED ENV{ARMPLROOT} OR DEFINED ENV{ARMPL_ROOT})
     endif()
   else()
     if(PALACE_WITH_OPENMP)
-      set(ARMPL_LIB_SUFFIX "_lp64_mp")
+      set(ARMPL_LIB_SUFFIX "_mp")
     else()
-      set(ARMPL_LIB_SUFFIX "_lp64")
+      set(ARMPL_LIB_SUFFIX "")
     endif()
   endif()
-  find_library(_BLAS_LAPACK_LIBRARIES
-    NAMES armpl${ARMPL_LIB_SUFFIX} armpl
-    PATHS ${ARMPL_DIR}
-    PATH_SUFFIXES lib lib64
-    NO_DEFAULT_PATH
-    REQUIRED
-  )
+  list(APPEND CMAKE_PREFIX_PATH ${ARMPL_DIR})
+  set(BLA_VENDOR "Arm${ARMPL_LIB_SUFFIX}")
+  find_package(BLAS REQUIRED)
+  find_package(LAPACK REQUIRED)
+  set(LAPACK_LIBRARIES "${LAPACK_LIBRARIES};-lm")
+
+  # Locate include directory
   find_path(_BLAS_LAPACK_INCLUDE_DIRS
-    NAMES cblas.h
+    NAMES armpl.h
     PATHS ${ARMPL_DIR}
-    PATH_SUFFIXES include${ARMPL_LIB_SUFFIX} include
+    PATH_SUFFIXES include
     NO_DEFAULT_PATH
     REQUIRED
   )
   message(STATUS "Using BLAS/LAPACK from Arm Performance Libraries (Arm PL)")
 elseif(DEFINED ENV{AOCL_DIR} OR DEFINED ENV{AOCLROOT} OR DEFINED ENV{AOCL_ROOT})
-  # AOCL for x86_64 builds when available
+  # AOCL for x86_64 builds when available (part of CMake's FindBLAS/FindLAPACK as of v3.27
+  # but unnecessarily adds -fopenmp flag)
   if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm")
     message(WARNING "AOCL math libraries are not intended for arm64 architecture builds")
   endif()
@@ -85,21 +86,22 @@ elseif(DEFINED ENV{AOCL_DIR} OR DEFINED ENV{AOCLROOT} OR DEFINED ENV{AOCL_ROOT})
   else()
     set(AOCL_LIB_SUFFIX "")
   endif()
-  find_library(BLIS_LIBRARY
+  find_library(BLAS_LIBRARIES
     NAMES blis${AOCL_LIB_SUFFIX} blis
     PATHS ${AOCL_DIR}
     PATH_SUFFIXES lib${AOCL_DIR_SUFFIX} lib lib64
     NO_DEFAULT_PATH
     REQUIRED
   )
-  find_library(FLAME_LIBRARY
+  find_library(LAPACK_LIBRARIES
     NAMES flame FLAME
     PATHS ${AOCL_DIR}
     PATH_SUFFIXES lib${AOCL_DIR_SUFFIX} lib lib64
     NO_DEFAULT_PATH
     REQUIRED
   )
-  set(_BLAS_LAPACK_LIBRARIES "${FLAME_LIBRARY}$<SEMICOLON>${BLIS_LIBRARY}")
+
+  # Locate include directory
   find_path(_BLAS_LAPACK_INCLUDE_DIRS
     NAMES cblas.h
     PATHS ${AOCL_DIR}
@@ -139,9 +141,8 @@ elseif(DEFINED ENV{MKL_DIR} OR DEFINED ENV{MKLROOT} OR DEFINED ENV{MKL_ROOT})
   set(BLA_VENDOR "Intel10${MKL_LIB_SUFFIX}")
   find_package(BLAS REQUIRED)
   find_package(LAPACK REQUIRED)
-  set(_BLAS_LAPACK_LIBRARIES ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-  list(REMOVE_DUPLICATES _BLAS_LAPACK_LIBRARIES)
-  string(REPLACE ";" "$<SEMICOLON>" _BLAS_LAPACK_LIBRARIES "${_BLAS_LAPACK_LIBRARIES}")
+
+  # Locate include directories
   find_path(_BLAS_LAPACK_INCLUDE_DIRS
     NAMES mkl_cblas.h
     PATHS ${MKL_DIR}
@@ -165,11 +166,10 @@ else()
   list(APPEND CMAKE_PREFIX_PATH ${OPENBLAS_DIR})
   find_package(BLAS REQUIRED)
   find_package(LAPACK REQUIRED)
-  set(_BLAS_LAPACK_LIBRARIES ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-  list(REMOVE_DUPLICATES _BLAS_LAPACK_LIBRARIES)
-  string(REPLACE ";" "$<SEMICOLON>" _BLAS_LAPACK_LIBRARIES "${_BLAS_LAPACK_LIBRARIES}")
+
+  # Locate include directory
   set(_BLAS_LAPACK_DIRS)
-  foreach(LIB IN LISTS _BLAS_LAPACK_LIBRARIES)
+  foreach(LIB IN LISTS LAPACK_LIBRARIES BLAS_LIBRARIES)
     get_filename_component(LIB_DIR ${LIB} DIRECTORY)
     list(APPEND _BLAS_LAPACK_DIRS ${LIB_DIR})
   endforeach()
@@ -184,6 +184,9 @@ else()
 endif()
 
 # Save variables to cache
+set(_BLAS_LAPACK_LIBRARIES ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+list(REMOVE_DUPLICATES _BLAS_LAPACK_LIBRARIES)
+string(REPLACE ";" "$<SEMICOLON>" _BLAS_LAPACK_LIBRARIES "${_BLAS_LAPACK_LIBRARIES}")
 set(BLAS_LAPACK_LIBRARIES ${_BLAS_LAPACK_LIBRARIES} CACHE STRING
   "List of library files for BLAS/LAPACK"
 )

diff --git a/cmake/ExternalGitTags.cmake b/cmake/ExternalGitTags.cmake
@@ -34,7 +34,7 @@ set(EXTERN_BUTTERFLYPACK_GIT_BRANCH
   "Git branch for external ButterflyPACK build"
 )
 set(EXTERN_BUTTERFLYPACK_GIT_TAG
-  "893a5875e2e3a8f4abd5c7374397c773eb0c9724" CACHE STRING  # 12/20/2023
+  "37fc1a8d09e2a1eed9a6ec6cf9494ac14bc6c700" CACHE STRING  # 12/20/2023
   "Git tag for external ButterflyPACK build"
 )
 
@@ -146,7 +146,7 @@ set(EXTERN_MFEM_GIT_BRANCH
   "Git branch for external MFEM build"
 )
 set(EXTERN_MFEM_GIT_TAG
-  "8a4affef5af84d74c9691f76b49624bdd7199d60" CACHE STRING  # master @ 12/17/2023
+  "c1871afea4dba50b5c4944adc20cfcb17520bd77" CACHE STRING  # master @ 12/21/2023
   "Git tag for external MFEM build"
 )
 
@@ -160,7 +160,7 @@ set(EXTERN_MUMPS_GIT_BRANCH
   "Git branch for external MUMPS build"
 )
 set(EXTERN_MUMPS_GIT_TAG
-  "44fb7e74b5780a3ea1c26a76a55298a2c34279fe" CACHE STRING  # 12/08/2023
+  "88148442304bf9fb82d04d9e8bf3c3dccef3c919" CACHE STRING  # 12/20/2023
   "Git tag for external MUMPS build"
 )
 
@@ -188,7 +188,7 @@ set(EXTERN_PETSC_GIT_BRANCH
   "Git branch for external PETSc build"
 )
 set(EXTERN_PETSC_GIT_TAG
-  "9617a9bff32dac3e651f1a88b0773cde31a476b6" CACHE STRING  # 12/19/2023
+  "cec8e1ee48d2b6b0308890436f9bfafab17cd824" CACHE STRING  # 12/21/2023
   "Git tag for external PETSc build"
 )
 
@@ -216,7 +216,7 @@ set(EXTERN_SLATE_GIT_BRANCH
   "Git branch for external SLATE build"
 )
 set(EXTERN_SLATE_GIT_TAG
-  "f9ac8c71f7dcc918cf3fb4c3955e2dab924ee654" CACHE STRING  # 12/14/2022
+  "aaf28f7410a4832d04d9d6b115eea1e254adf1b0" CACHE STRING  # 12/20/2022
   "Git tag for external SLATE build"
 )
 

diff --git a/cmake/ExternalMFEM.cmake b/cmake/ExternalMFEM.cmake
@@ -359,10 +359,9 @@ message(STATUS "MFEM_OPTIONS: ${MFEM_OPTIONS_PRINT}")
 set(MFEM_PATCH_FILES
   "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_mfem_device_fixes.diff"
   "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_mesh_vis_dev.diff"
-  "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_par_tet_mesh_fix.diff"
   "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_mesh_partitioner_dev.diff"
+  "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_par_tet_mesh_fix.diff"
   "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_ncmesh_interior_boundary_dev.diff"
-  "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_gslib_leak_fix.diff"
   "${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_mesh_const_fix.diff"
 )
 

diff --git a/extern/patch/mfem/patch_gslib_leak_fix.diff b/extern/patch/mfem/patch_gslib_leak_fix.diff