celeritas-project · sethrj · Jul 25, 2024 · Jul 15, 2024 · Jul 16, 2024 · Jul 18, 2024
diff --git a/.clang-format b/.clang-format
@@ -8,7 +8,7 @@ AlignEscapedNewlines: Left
 AlignOperands:   true
 AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: true
+AllowShortBlocksOnASingleLine: Always
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: Inline
 AllowShortIfStatementsOnASingleLine: false
@@ -71,44 +71,45 @@ IncludeCategories:
   - Regex:           '^<.+>$'
     Priority:        1
     SortPriority:    2
+# Special group for config/version headers as they might be needed before other headers
   - Regex:           '^"celeritas_[a-z_]+\.h"'
     Priority:        2
     SortPriority:    3
-  - Regex:           '^"corecel/device_runtime_api\.h"$'
+  - Regex:           '^"corecel/(Config|Version|DeviceRuntimeApi)\.hh"$'
     Priority:        2
     SortPriority:    3
   - Regex:           '^"corecel/'
-    Priority:        2
+    Priority:        3
     SortPriority:    5
     CaseSensitive:   true
   - Regex:           '^"geocel/'
-    Priority:        2
+    Priority:        3
     SortPriority:    6
     CaseSensitive:   true
   - Regex:           '^"orange/'
-    Priority:        2
+    Priority:        3
     SortPriority:    7
     CaseSensitive:   true
   - Regex:           '^"celeritas/'
-    Priority:        2
+    Priority:        3
     SortPriority:    8
     CaseSensitive:   true
   - Regex:           '^"accel/'
-    Priority:        2
+    Priority:        3
     SortPriority:    9
     CaseSensitive:   true
   - Regex:           '^"[^/]+"'
-    Priority:        5
+    Priority:        6
     SortPriority:    11
   - Regex:           '^"detail/'
-    Priority:        6
+    Priority:        7
     SortPriority:    13
   - Regex:           '"(^gtest/|TestBase|\.test\.hh|celeritas_test\.hh)'
-    Priority:        7
+    Priority:        8
     CaseSensitive:   true
     SortPriority:    14
   - Regex:           '.*'
-    Priority:        5
+    Priority:        6
     SortPriority:    12 # higher than detail, lower than no-slash
 IncludeIsMainRegex: '(\.[^.]+)?$'
 IncludeIsMainSourceRegex: '(\.cu|\.t\.hh)$' # Allow CU/template files as main
@@ -138,7 +139,7 @@ PenaltyReturnTypeOnItsOwnLine: 10
 PointerAlignment: Left
 QualifierAlignment: Right
 ReflowComments:  true
-SortIncludes:    true
+SortIncludes:    CaseSensitive
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: false
@@ -155,7 +156,7 @@ SpacesInContainerLiterals: false
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard:        Cpp11
+Standard:        c++17
 StatementMacros:
   - Q_UNUSED
   - QT_REQUIRE_VERSION

diff --git a/app/celer-export-geant.cc b/app/celer-export-geant.cc
@@ -15,7 +15,8 @@
 #include <vector>
 #include <nlohmann/json.hpp>
 
-#include "celeritas_config.h"
+#include "corecel/Config.hh"
+
 #include "corecel/Assert.hh"
 #include "corecel/io/Logger.hh"
 #include "corecel/sys/MpiCommunicator.hh"

diff --git a/app/celer-g4/RootIO.hh b/app/celer-g4/RootIO.hh
@@ -13,7 +13,8 @@
 #include <G4ThreadLocalSingleton.hh>
 #include <G4Types.hh>
 
-#include "celeritas_config.h"
+#include "corecel/Config.hh"
+
 #include "corecel/Assert.hh"
 #include "celeritas/io/EventData.hh"
 

diff --git a/app/celer-g4/RunAction.cc b/app/celer-g4/RunAction.cc
@@ -15,7 +15,8 @@
 #include <G4RunManager.hh>
 #include <G4StateManager.hh>
 
-#include "celeritas_config.h"
+#include "corecel/Config.hh"
+
 #include "corecel/Assert.hh"
 #include "corecel/Macros.hh"
 #include "corecel/io/Logger.hh"

diff --git a/app/celer-g4/celer-g4.cc b/app/celer-g4/celer-g4.cc
@@ -31,8 +31,9 @@
 
 #include <nlohmann/json.hpp>
 
-#include "celeritas_config.h"
-#include "celeritas_version.h"
+#include "corecel/Config.hh"
+#include "corecel/Version.hh"
+
 #include "corecel/Assert.hh"
 #include "corecel/Macros.hh"
 #include "corecel/io/ExceptionOutput.hh"

diff --git a/app/celer-geo/Runner.cc b/app/celer-geo/Runner.cc
@@ -7,7 +7,8 @@
 //---------------------------------------------------------------------------//
 #include "Runner.hh"
 
-#include "celeritas_config.h"
+#include "corecel/Config.hh"
+
 #include "corecel/io/StringUtils.hh"
 #include "corecel/sys/Device.hh"
 #include "corecel/sys/Stopwatch.hh"

diff --git a/app/celer-geo/Types.hh b/app/celer-geo/Types.hh
@@ -7,7 +7,8 @@
 //---------------------------------------------------------------------------//
 #pragma once
 
-#include "celeritas_config.h"
+#include "corecel/Config.hh"
+
 #include "corecel/Types.hh"
 #include "geocel/g4/GeantGeoTraits.hh"
 #include "geocel/vg/VecgeomGeoTraits.hh"

diff --git a/app/celer-geo/celer-geo.cc b/app/celer-geo/celer-geo.cc
@@ -13,8 +13,9 @@
 #include <vector>
 #include <nlohmann/json.hpp>
 
-#include "celeritas_config.h"
-#include "celeritas_version.h"
+#include "corecel/Config.hh"
+#include "corecel/Version.hh"
+
 #include "corecel/io/ExceptionOutput.hh"
 #include "corecel/io/Logger.hh"
 #include "corecel/io/Repr.hh"

diff --git a/app/celer-sim/RootOutput.hh b/app/celer-sim/RootOutput.hh
@@ -7,7 +7,8 @@
 //---------------------------------------------------------------------------//
 #pragma once
 
-#include "celeritas_config.h"
+#include "corecel/Config.hh"
+
 #include "corecel/Assert.hh"
 
 namespace celeritas

diff --git a/app/celer-sim/RunnerInput.hh b/app/celer-sim/RunnerInput.hh
@@ -7,7 +7,8 @@
 //---------------------------------------------------------------------------//
 #pragma once
 
-#include "celeritas_config.h"
+#include "corecel/Config.hh"
+
 #include "corecel/Macros.hh"
 #include "corecel/Types.hh"
 #include "corecel/io/Label.hh"

diff --git a/app/celer-sim/RunnerInputIO.json.cc b/app/celer-sim/RunnerInputIO.json.cc
@@ -9,7 +9,8 @@
 
 #include <string>
 
-#include "celeritas_config.h"
+#include "corecel/Config.hh"
+
 #include "corecel/cont/ArrayIO.json.hh"
 #include "corecel/io/JsonUtils.json.hh"
 #include "corecel/io/LabelIO.json.hh"

diff --git a/app/celer-sim/RunnerOutput.cc b/app/celer-sim/RunnerOutput.cc
@@ -10,7 +10,8 @@
 #include <utility>
 #include <nlohmann/json.hpp>
 
-#include "celeritas_config.h"
+#include "corecel/Config.hh"
+
 #include "corecel/Assert.hh"
 #include "corecel/cont/Range.hh"
 #include "corecel/io/JsonPimpl.hh"

diff --git a/app/celer-sim/celer-sim.cc b/app/celer-sim/celer-sim.cc
@@ -22,9 +22,10 @@
 
 #include <nlohmann/json.hpp>
 
-#include "celeritas_config.h"
-#include "celeritas_version.h"
-#include "corecel/device_runtime_api.h"
+#include "corecel/Config.hh"
+#include "corecel/DeviceRuntimeApi.hh"
+#include "corecel/Version.hh"
+
 #include "corecel/io/BuildOutput.hh"
 #include "corecel/io/ExceptionOutput.hh"
 #include "corecel/io/Logger.hh"

diff --git a/app/demo-geo-check/GCheckKernel.hh b/app/demo-geo-check/GCheckKernel.hh
@@ -10,7 +10,8 @@
 #include <memory>
 #include <vector>
 
-#include "celeritas_config.h"
+#include "corecel/Config.hh"
+
 #include "corecel/Assert.hh"
 #include "corecel/Macros.hh"
 #include "corecel/Types.hh"

diff --git a/app/demo-geo-check/demo-geo-check.cc b/app/demo-geo-check/demo-geo-check.cc
@@ -17,7 +17,8 @@
 #include <vector>
 #include <nlohmann/json.hpp>
 
-#include "celeritas_cmake_strings.h"
+#include "corecel/Config.hh"
+
 #include "corecel/Assert.hh"
 #include "corecel/Types.hh"
 #include "corecel/cont/ArrayIO.json.hh"

diff --git a/app/demo-interactor/KNDemoKernel.thrust.cu b/app/demo-interactor/KNDemoKernel.thrust.cu
@@ -10,7 +10,7 @@
 #include <thrust/device_ptr.h>
 #include <thrust/reduce.h>
 
-#include "corecel/device_runtime_api.h"
+#include "corecel/DeviceRuntimeApi.hh"
 
 namespace celeritas
 {

diff --git a/app/demo-interactor/demo-interactor.cc b/app/demo-interactor/demo-interactor.cc
@@ -14,7 +14,8 @@
 #include <vector>
 #include <nlohmann/json.hpp>
 
-#include "celeritas_version.h"
+#include "corecel/Version.hh"
+
 #include "corecel/io/Logger.hh"
 #include "corecel/sys/Device.hh"
 #include "corecel/sys/DeviceIO.json.hh"

diff --git a/app/demo-interactor/host-demo-interactor.cc b/app/demo-interactor/host-demo-interactor.cc
@@ -15,7 +15,8 @@
 #include <vector>
 #include <nlohmann/json.hpp>
 
-#include "celeritas_version.h"
+#include "corecel/Version.hh"
+
 #include "corecel/Assert.hh"
 #include "corecel/io/Logger.hh"
 #include "corecel/sys/Device.hh"

diff --git a/app/orange-update.cc b/app/orange-update.cc
@@ -13,7 +13,8 @@
 #include <vector>
 #include <nlohmann/json.hpp>
 
-#include "celeritas_config.h"
+#include "corecel/Config.hh"
+
 #include "corecel/Assert.hh"
 #include "corecel/io/Logger.hh"
 #include "corecel/sys/MpiCommunicator.hh"

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -34,6 +34,8 @@ set(_DOXYGEN_EXTRA_SOURCE
   "${PROJECT_BINARY_DIR}/include/celeritas_config.h"
   "${PROJECT_BINARY_DIR}/include/celeritas_cmake_strings.h"
   "${PROJECT_BINARY_DIR}/include/celeritas_version.h"
+  "${PROJECT_BINARY_DIR}/include/corecel/Version.hh"
+  "${PROJECT_BINARY_DIR}/include/corecel/Config.hh"
 )
 if((CELERITAS_DEBUG AND CELERITAS_BUILD_TESTS)
   OR CELERITAS_DOXYGEN_BUILD_TESTS)

diff --git a/doc/appendix/development.rst b/doc/appendix/development.rst
@@ -276,7 +276,7 @@ such as
 ``cudaMalloc`` does *not* have to be compiled with NVCC. Instead, it only has to
 be linked against the CUDA runtime library and include ``cuda_runtime_api.h``.
 The platform-agnostic Celeritas include file to use is
-``corecel/device_runtime_api.h``.
+``corecel/DeviceRuntimeApi.hh``.
 Note that VecGeom compiles differently when run
 through NVCC (macro magic puts much of the code in a different namespace) so
 its inclusion must be very carefully managed.

diff --git a/doc/main/api/corecel.rst b/doc/main/api/corecel.rst
@@ -13,12 +13,15 @@ primarily pertaining to GPU abstractions.
 Configuration
 -------------
 
-The ``celeritas_config.h`` configure file contains all-caps definitions of the
+The ``corecel/Config.hh`` configure file contains all-caps definitions of the
 CMake configuration options as 0/1 defines so they can be used with ``if
-constexpr`` and other C++ expressions. The ``celeritas_cmake_strings.h``
-defines static C strings with configuration options such as key dependent
-library versions. Finally, ``celeritas_version.h`` defines version numbers as
-a preprocessor definition, a set of integers, and a descriptive string.
+constexpr`` and other C++ expressions. In addition, it defines static C strings
+with configuration options such as key dependent library versions.
+Finally, ``corecel/Version.hh`` defines version numbers as  preprocessor definition,
+a set of integers, and a descriptive string. ``celeritas_version.h``,
+``celeritas_cmake_strings.h``, ``celeritas_sys_config.h``, ``celeritas_config.h``
+and ``corecel/device_runtime_api.h`` are deprecated and kept as aliases for
+backward-compatibility. They may be removed in an upcoming major version.
 
 .. doxygendefine:: CELERITAS_VERSION
 .. doxygenvariable:: celeritas_version

diff --git a/interface/celeritas.i b/interface/celeritas.i
@@ -19,14 +19,12 @@
 // CONFIG FILE
 //---------------------------------------------------------------------------//
 %{
-#include "celeritas_version.h"
-#include "celeritas_config.h"
-#include "celeritas_cmake_strings.h"
+#include "corecel/Config.hh"
+#include "corecel/Version.hh"
 %}
 
-%include "celeritas_version.h"
-%include "celeritas_config.h"
-%include "celeritas_cmake_strings.h"
+%include "corecel/Config.hh"
+%include "corecel/Version.hh"
 
 //---------------------------------------------------------------------------//
 // ASSERTIONS

diff --git a/scripts/dev/celeritas-gen.py b/scripts/dev/celeritas-gen.py
@@ -110,8 +110,8 @@ class {name}Test : public ::celeritas::test::Test
 TEST_HEADER_FILE = '''
 #pragma once
 
-#include "celeritas_config.h"
 #include "corecel/Assert.hh"
+#include "corecel/Config.hh"
 #include "corecel/Macros.hh"
 #include "corecel/Types.hh"
 
@@ -240,8 +240,8 @@ class {name}Test : public ::celeritas::test::Test
 TEST_CODE_FILE = '''\
 #include "{name}.test.hh"
 
-#include "corecel/device_runtime_api.h"
-#include "corecel/Types.h"
+#include "corecel/DeviceRuntimeApi.hh"
+#include "corecel/Types.hh"
 #include "corecel/sys/KernelParamCalculator.device.hh"
 #include "corecel/sys/Device.hh"
 

diff --git a/scripts/dev/run-iwyu.sh b/scripts/dev/run-iwyu.sh
@@ -25,7 +25,7 @@ fi
 OUTFILE=$(mktemp)
 iwyu_tool.py -p $1 -- \
   -Xiwyu --no_fwd_decls \
-  -Xiwyu --keep="*device_runtime_api*" \
+  -Xiwyu --keep="*DeviceRuntimeApi*" \
   -Xiwyu --keep="*.json.hh*" \
   -Xiwyu --transitive_includes_only \
   -Xiwyu --mapping_file="${SCRIPT_DIR}/iwyu-apple-clang.imp" \

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -53,7 +53,7 @@ foreach(_var BUILD_TYPE HOSTNAME REAL_TYPE UNITS OPENMP CORE_GEO CORE_RNG)
   set(_var "CELERITAS_${_var}")
   string(TOLOWER "${_var}" _lower)
   string(APPEND CELERITAS_CMAKE_STRINGS
-    "static const char ${_lower}[] = \"${${_var}}\";\n"
+    "inline constexpr char ${_lower}[] = \"${${_var}}\";\n"
   )
 endforeach()
 
@@ -64,7 +64,7 @@ foreach(_var CLHEP_VERSION Geant4_VERSION VecGeom_VERSION)
   endif()
   set(_value "${${_var}}")
   string(APPEND CELERITAS_CMAKE_STRINGS
-    "static const char celeritas_${_lower}[] = \"${_value}\";\n"
+    "inline constexpr char celeritas_${_lower}[] = \"${_value}\";\n"
   )
 endforeach()
 celeritas_configure_file("celeritas_cmake_strings.h.in" "celeritas_cmake_strings.h" @ONLY)

diff --git a/src/accel/ExceptionConverter.cc b/src/accel/ExceptionConverter.cc
@@ -13,7 +13,8 @@
 #include <string>
 #include <G4Exception.hh>
 
-#include "celeritas_config.h"
+#include "corecel/Config.hh"
+
 #include "corecel/Assert.hh"
 #include "corecel/Macros.hh"
 #include "corecel/OpaqueIdIO.hh"

diff --git a/src/accel/GeantSimpleCalo.cc b/src/accel/GeantSimpleCalo.cc
@@ -9,7 +9,8 @@
 
 #include <nlohmann/json.hpp>
 
-#include "celeritas_config.h"
+#include "corecel/Config.hh"
+
 #include "corecel/cont/Range.hh"
 #include "corecel/io/JsonPimpl.hh"
 #include "corecel/io/LabelIO.json.hh"