Merge pull request #62 from awslabs/sjg/release-0.11.2

Release v0.11.2

Author: sebastiangrimberg

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.11.2] - 2023-07-14
 
   - Changed layout and names of `palace/` source directory for better organization.
   - Fixed a regression bug affecting meshes which have domain elements which are not
@@ -20,9 +20,10 @@ The format of this changelog is based on
     dependencies relying instead directly on CMake's ExternalProject, patch GSLIB dependency
     for shared library builds, add CI tests with ARPACK-NG instead of SLEPc, update all
     dependency versions including MFEM to incorporate bug fixes and improvements. This
-    affects the Spack package recipe, so a new recipe is distributed as part of the Palace
-    repository which will keep compatibility with `main` while changes are upstreamed to
+    affects the Spack package recipe, so a new recipe is distributed as part of Palace in
+    in `spack/` which will keep compatibility with `main` while changes are upstreamed to
     the built-in Spack repository.
+  - Add a basic Makefile with some useful targets for development.
 
 ## [0.11.1] - 2023-05-03
 

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.1)
+project(palace-superbuild LANGUAGES CXX C VERSION 0.11.2)
 
 # Define build settings and defaults
 set(PALACE_WITH_64BIT_INT OFF CACHE BOOL "Use 64 bit integers")

Makefile

@@ -0,0 +1,27 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+CLANG_FORMAT ?= clang-format
+JULIA ?= julia
+
+.PHONY: format format-cpp format-jl docs tests
+
+# Style/format
+format: format-cpp format-jl
+
+format-cpp:
+	./scripts/format-source -cpp --clang-format $(CLANG_FORMAT)
+
+format-jl:
+	./scripts/format-source -jl --julia $(JULIA)
+
+# Documentation
+docs:
+	$(RM) -r docs/build
+	$(JULIA) --project=docs -e 'using Pkg; Pkg.instantiate()'
+	$(JULIA) --project=docs --color=yes docs/make.jl
+
+# Tests
+tests:
+	$(JULIA) --project=test -e 'using Pkg; Pkg.instantiate()'
+	$(JULIA) --project=test --color=yes test/runtests.jl

palace/CMakeLists.txt

@@ -19,7 +19,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 # Initialize the project
-project(palace LANGUAGES CXX VERSION 0.11.1)
+project(palace LANGUAGES CXX VERSION 0.11.2)
 
 # Define build settings and defaults
 set(PALACE_WITH_OPENMP OFF CACHE BOOL "Use OpenMP")

palace/cmake/PkgConfigHelpers.cmake

@@ -41,7 +41,7 @@ int main()
   TS ts;
   int argc = 0;
   char **argv = NULL;
-  PetscCall(PetscInitialize(&argc, &argv, PETSC_NULL, PETSC_NULL));
+  PetscCall(PetscInitialize(&argc, &argv, PETSC_NULLPTR, PETSC_NULLPTR));
   PetscCall(TSCreate(PETSC_COMM_WORLD, &ts));
   PetscCall(TSSetFromOptions(ts));
   PetscCall(TSDestroy(&ts));
@@ -80,7 +80,7 @@ int main()
   EPS eps;
   int argc = 0;
   char **argv = NULL;
-  PetscCall(SlepcInitialize(&argc, &argv, PETSC_NULL, PETSC_NULL));
+  PetscCall(SlepcInitialize(&argc, &argv, PETSC_NULLPTR, PETSC_NULLPTR));
   PetscCall(EPSCreate(PETSC_COMM_SELF, &eps));
   PetscCall(EPSDestroy(&eps));
   PetscCall(SlepcFinalize());

scripts/format-source

@@ -13,16 +13,16 @@ JuliaFormatter.jl
 Options:
   -h, --help                       Show this help message and exit
   -dry-run, --dry-run              Only show changes without making them
-  -no-cpp, --no-cpp                Skip formatting of C++ files
-  -no-jl, --no-jl                  Skip formatting of Julia files
+  -cpp, --cpp                      Only format C++ files
+  -jl, --jl                        Only format Julia files
   --clang-format COMMAND           Executable command for clang-format
   --julia COMMAND                  Executable command for julia
 "
 }
 
 # Parse arguments
-FORMAT_CPP="true"
-FORMAT_JL="true"
+FORMAT_CPP="false"
+FORMAT_JL="false"
 CLANG_FORMAT="clang-format"
 JULIA="julia"
 POSITIONAL=()
@@ -37,12 +37,12 @@ while [[ $# -gt 0 ]]; do
         DRY_RUN="--dry-run"
         shift
         ;;
-        -no-cpp|--no-cpp)
-        FORMAT_CPP="false"
+        -cpp|--cpp)
+        FORMAT_CPP="true"
         shift
         ;;
-        -no-jl|--no-jl)
-        FORMAT_JL="false"
+        -jl|--jl)
+        FORMAT_JL="true"
         shift
         ;;
         --clang-format)
@@ -72,6 +72,10 @@ if [[ ! -z "$@" ]]; then
     help
     exit 1
 fi
+if ! $FORMAT_CPP && ! $FORMAT_JL; then
+    FORMAT_CPP="true"
+    FORMAT_JL="true"
+fi
 
 SOURCE_DIR=$(dirname $(cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P ))