Merge remote-tracking branch 'upstream/main' into IO_URING

.clang-format

@@ -0,0 +1,3 @@
+BasedOnStyle: LLVM
+IndentWidth: 4
+ColumnLimit: 120

.git-blame-ignore-revs

@@ -0,0 +1,12 @@
+# These commits are ignored by `git blame`.
+# https://git-scm.com/docs/git-blame
+# Run this command to configure git to use this file.
+# `$ git config blame.ignoreRevsFile .git-blame-ignore-revs`
+
+# clang-format src/
+cb999f20b6f2934ad7c94b10d2b02f6acf74aab4
+b8d91db545fba0f2e85070dc438d2447528b619e
+
+# clang-format test/
+9a1b93e4fea27e91d14c18821be2c940adf63bf4
+68f7925044ba8777f6a7f41bf5704915de13f608

.github/workflows/clang-format-check.yml

@@ -0,0 +1,20 @@
+name: check-clang-format
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - uses: DoozyX/[email protected]
+      with:
+        source: 'src test'
+        exclude: './third_party ./external'
+        extensions: 'h,cpp'
+        clangFormatVersion: 18.1.3

CMakeLists.txt

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.25.2)
 
 # Build release version by default (override with -DCMAKE_BUILD_TYPE=Debug in your initial cmake invocation)
 # This needs to be set *before* the project() command
@@ -32,6 +32,7 @@ set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
 set(CMAKE_CXX_STANDARD 20 CACHE STRING "C++ standard to conform to")
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_OPTIMIZE_DEPENDENCIES 1)
 
 set(CMAKE_CXX_FLAGS_DEBUG="${CMAKE_CXX_FLAGS_DEBUG} -g")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
@@ -112,12 +113,17 @@ if(USE_PAPI)
 endif()
 ##########
 
+find_package(fmt)
+add_definitions(-DSPDLOG_FMT_EXTERNAL)
+
 option(USE_CUDA "Whether to activate compilation of CUDA features" OFF)
 include(CheckLanguage)
 check_language(CUDA)
 if(USE_CUDA AND CMAKE_CUDA_COMPILER)
     enable_language(CUDA)
     find_package(CUDAToolkit REQUIRED)
+    set(CMAKE_CUDA_STANDARD 20)
+    set(CMAKE_CUDA_STANDARD_REQUIRED ON)
 
     if(${CMAKE_COMPILER_IS_GNUCXX})
         set(GCC_EXPECTED_VERSION 11.3.0)
@@ -137,7 +143,7 @@ if(USE_CUDA AND CMAKE_CUDA_COMPILER)
     add_definitions(-DUSE_CUDA)
     message(STATUS "Note: disabled CUSPARSE_DEPRECATED in main CMakeLists.txt")
     add_definitions(-DDISABLE_CUSPARSE_DEPRECATED)
-    set(CMAKE_CUDA_STANDARD 17)
+    set(CMAKE_CUDA_STANDARD 20)
     set(CMAKE_CUDA_STANDARD_REQUIRED ON)
     message(STATUS  "CUDA enabled (version ${CMAKE_CUDA_COMPILER_VERSION})")
     if(DEFINED ENV{CUDAHOSTCXX})

CONTRIBUTING.md

@@ -79,9 +79,13 @@ That is, please try your best to make a good-quality contribution and we will he
    Please choose an expressive title and provide a short description of your changes.
    Feel free to mark your pull request "WIP: " or "Draft: " in the title.
    Note that you can add more commits to your pull request after you created it.
-7. You **receive feedback** on your proposed contribution.
+   Ideally, the changes in the PR contain only the changes you made for that PR,
+   e.g, by rebasing your branch on top of the target branch. This makes it easier for others to
+   review your PR.
+7. [Resolve any open conflicts](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts) to the target branch of the PR.
+8. You **receive feedback** on your proposed contribution.
    You may be asked to apply certain changes, or we might apply straightforward adjustments ourselves before the integration.
-8. If it looks good (potentially after some help), **your contribution becomes a part of DAPHNE**.
+9. If it looks good (potentially after some help), **your contribution becomes a part of DAPHNE**.
 
 ### Experienced DAPHNE Contributors (Collaborators)
 
@@ -108,3 +112,18 @@ At the same time, this freedom comes with certain responsibilities, which are ro
    - actually merging a pull request in
 
    Balancing the handling of pull requests is important to *keep the development process scalable*.
+
+
+### Code Style
+
+Before contributing, please make sure to run `clang-format` on your C++ (.h and
+.cpp) files. The codebase is currently formatted with `clang-format` version
+`18.1.3`. This is the default `clang-format` version when installing via `apt`
+on Ubuntu 24.04, and can easily be installed via `python -mpip install clang-format==18.1.3`
+on other systems.
+We provide a `.clang-format` file at the root of the repository. Most text
+editors and IDEs will have some kind of integration for detecting that file
+and automatically applying `clang-format`. `git-clang-format` can be used to
+format staged files.
+For more information about `clang-format`, `git-clang-format` and text editor
+integration, please see [ClangFormat](https://clang.llvm.org/docs/ClangFormat.html).