From 8b42d55e139faa6c93c96ba23fb71ce619866f8a Mon Sep 17 00:00:00 2001 From: haykh Date: Tue, 16 Dec 2025 09:50:33 -0500 Subject: [PATCH 1/2] version bump --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 260c3e87..890b90cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ set(PROJECT_NAME entity) project( ${PROJECT_NAME} - VERSION 1.3.0 + VERSION 1.4.0 LANGUAGES CXX C) add_compile_options("-D ENTITY_VERSION=\"${PROJECT_VERSION}\"") set(hash_cmd "git diff --quiet src/ && echo $(git rev-parse HEAD) ") From 98669a2e9fba44f3b8ab66f2376df76a55e141fd Mon Sep 17 00:00:00 2001 From: haykh Date: Fri, 19 Dec 2025 11:45:14 -0500 Subject: [PATCH 2/2] dependency version bumps --- CMakeLists.txt | 6 +++--- cmake/dependencies.cmake | 4 ++-- dev/nix/adios2.nix | 6 +++--- dev/nix/kokkos.nix | 6 +++--- dev/nix/shell.nix | 3 +-- extern/Kokkos | 2 +- extern/adios2 | 2 +- extern/plog | 2 +- minimal/CMakeLists.txt | 4 ++-- minimal/adios2.cpp | 2 +- src/engines/engine.hpp | 2 +- src/framework/domain/metadomain.h | 2 +- src/global/utils/param_container.cpp | 2 +- src/global/utils/param_container.h | 2 +- src/output/tests/writer-mpi.cpp | 2 +- src/output/tests/writer-nompi.cpp | 2 +- src/output/utils/attr_writer.h | 2 +- src/output/writer.cpp | 2 +- src/output/writer.h | 2 +- 19 files changed, 27 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 890b90cf..109a1f2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,7 @@ set(gpu_aware_mpi CACHE BOOL "Enable GPU-aware MPI") # -------------------------- Compilation settings -------------------------- # -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) @@ -162,9 +162,9 @@ if(${output}) find_or_fetch_dependency(adios2 FALSE QUIET) add_compile_options("-D OUTPUT_ENABLED") if(${mpi}) - set(DEPENDENCIES ${DEPENDENCIES} adios2::cxx11_mpi) + set(DEPENDENCIES ${DEPENDENCIES} adios2::cxx_mpi) else() - set(DEPENDENCIES ${DEPENDENCIES} adios2::cxx11) + set(DEPENDENCIES ${DEPENDENCIES} adios2::cxx) endif() endif() diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 1f3ed3c6..6561c304 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -58,12 +58,12 @@ function(find_or_fetch_dependency package_name header_only mode) FetchContent_Declare( ${package_name} GIT_REPOSITORY ${${package_name}_REPOSITORY} - GIT_TAG 4.7.01) + GIT_TAG 5.0.0) elseif(${package_name} STREQUAL "adios2") FetchContent_Declare( ${package_name} GIT_REPOSITORY ${${package_name}_REPOSITORY} - GIT_TAG v2.10.2) + GIT_TAG v2.11.0) else() FetchContent_Declare(${package_name} GIT_REPOSITORY ${${package_name}_REPOSITORY}) diff --git a/dev/nix/adios2.nix b/dev/nix/adios2.nix index a3890b78..810c228d 100644 --- a/dev/nix/adios2.nix +++ b/dev/nix/adios2.nix @@ -6,9 +6,9 @@ let name = "adios2"; - version = "2.10.2"; + version = "2.11.0"; cmakeFlags = { - CMAKE_CXX_STANDARD = "17"; + CMAKE_CXX_STANDARD = "20"; CMAKE_CXX_EXTENSIONS = "OFF"; CMAKE_POSITION_INDEPENDENT_CODE = "TRUE"; BUILD_SHARED_LIBS = "ON"; @@ -30,7 +30,7 @@ stdenv.mkDerivation { src = pkgs.fetchgit { url = "https://github.com/ornladios/ADIOS2/"; rev = "v${version}"; - sha256 = "sha256-NVyw7xoPutXeUS87jjVv1YxJnwNGZAT4QfkBLzvQbwg="; + sha256 = "sha256-yHPI///17poiCEb7Luu5qfqxTWm9Nh+o9r57mZT26U0="; }; nativeBuildInputs = with pkgs; [ diff --git a/dev/nix/kokkos.nix b/dev/nix/kokkos.nix index 7d86e665..455ced21 100644 --- a/dev/nix/kokkos.nix +++ b/dev/nix/kokkos.nix @@ -7,7 +7,7 @@ let name = "kokkos"; - pversion = "4.7.01"; + pversion = "5.0.0"; compilerPkgs = { "HIP" = with pkgs.rocmPackages; [ llvm.rocm-merged-llvm @@ -56,7 +56,7 @@ pkgs.stdenv.mkDerivation rec { src = pkgs.fetchgit { url = "https://github.com/kokkos/kokkos/"; rev = "${pversion}"; - sha256 = "sha256-MgphOsKE8umgYxVQZzex+elgvDDC09JaMCoU5YXaLco="; + sha256 = "sha256-C4DarqnEcdF3+19TPqcM0A9bcQSkKTJkB8b7OkzC7T8="; }; nativeBuildInputs = with pkgs; [ @@ -78,7 +78,7 @@ pkgs.stdenv.mkDerivation rec { configurePhase = '' cmake -B build -D CMAKE_BUILD_TYPE=Release \ - -D CMAKE_CXX_STANDARD=17 \ + -D CMAKE_CXX_STANDARD=20 \ -D CMAKE_CXX_EXTENSIONS=OFF \ -D CMAKE_POSITION_INDEPENDENT_CODE=TRUE \ ${pkgs.lib.concatStringsSep " " cmakeExtraFlags.${gpu}} \ diff --git a/dev/nix/shell.nix b/dev/nix/shell.nix index 0d4cc911..5ff7a389 100644 --- a/dev/nix/shell.nix +++ b/dev/nix/shell.nix @@ -45,8 +45,7 @@ pkgs.mkShell { adios2Pkg kokkosPkg - python312 - python312Packages.jupyter + python314 cmake-format cmake-lint diff --git a/extern/Kokkos b/extern/Kokkos index 1b1383c6..37f70304 160000 --- a/extern/Kokkos +++ b/extern/Kokkos @@ -1 +1 @@ -Subproject commit 1b1383c6001f3bfe9fe309ca923c2d786600cc79 +Subproject commit 37f70304dc3676691af88d3ac3ba50cddbfa337f diff --git a/extern/adios2 b/extern/adios2 index a19dad6c..1ef0b579 160000 --- a/extern/adios2 +++ b/extern/adios2 @@ -1 +1 @@ -Subproject commit a19dad6cecb00319825f20fd9f455ebbab903d34 +Subproject commit 1ef0b5797aeb8a1cc1bb36ec4089eaec19a2eea0 diff --git a/extern/plog b/extern/plog index e21baecd..7881eeac 160000 --- a/extern/plog +++ b/extern/plog @@ -1 +1 @@ -Subproject commit e21baecd4753f14da64ede979c5a19302618b752 +Subproject commit 7881eeacf0f31b7862f90b88e62be7ecf0dd0a45 diff --git a/minimal/CMakeLists.txt b/minimal/CMakeLists.txt index b21dd0fe..72e30026 100644 --- a/minimal/CMakeLists.txt +++ b/minimal/CMakeLists.txt @@ -89,7 +89,7 @@ if("ADIOS2_NOMPI" IN_LIST MODES) find_kokkos() find_adios2() - list(APPEND libs Kokkos::kokkos adios2::cxx11) + list(APPEND libs Kokkos::kokkos adios2::cxx) add_executable(${exec} ${src}) @@ -104,7 +104,7 @@ if("ADIOS2_MPI" IN_LIST MODES) find_package(MPI REQUIRED) find_kokkos() find_adios2() - list(APPEND libs MPI::MPI_CXX Kokkos::kokkos adios2::cxx11_mpi) + list(APPEND libs MPI::MPI_CXX Kokkos::kokkos adios2::cxx_mpi) add_executable(${exec} ${src}) diff --git a/minimal/adios2.cpp b/minimal/adios2.cpp index cd4ca3d6..c89bf383 100644 --- a/minimal/adios2.cpp +++ b/minimal/adios2.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #if defined(MPI_ENABLED) #include diff --git a/src/engines/engine.hpp b/src/engines/engine.hpp index 17103f1d..07ac82e6 100644 --- a/src/engines/engine.hpp +++ b/src/engines/engine.hpp @@ -36,7 +36,7 @@ #if defined(OUTPUT_ENABLED) #include - #include + #include #endif // OUTPUT_ENABLED #if defined(MPI_ENABLED) diff --git a/src/framework/domain/metadomain.h b/src/framework/domain/metadomain.h index a456879b..b1afcf52 100644 --- a/src/framework/domain/metadomain.h +++ b/src/framework/domain/metadomain.h @@ -35,7 +35,7 @@ #include "output/writer.h" #include - #include + #include #endif // OUTPUT_ENABLED #include diff --git a/src/global/utils/param_container.cpp b/src/global/utils/param_container.cpp index 126a64e4..895eec18 100644 --- a/src/global/utils/param_container.cpp +++ b/src/global/utils/param_container.cpp @@ -5,7 +5,7 @@ #include "global.h" #include - #include + #include #include #include diff --git a/src/global/utils/param_container.h b/src/global/utils/param_container.h index 679b8055..2346de2b 100644 --- a/src/global/utils/param_container.h +++ b/src/global/utils/param_container.h @@ -18,7 +18,7 @@ #if defined(OUTPUT_ENABLED) #include - #include + #include #endif #include diff --git a/src/output/tests/writer-mpi.cpp b/src/output/tests/writer-mpi.cpp index dad981a4..382f880c 100644 --- a/src/output/tests/writer-mpi.cpp +++ b/src/output/tests/writer-mpi.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/src/output/tests/writer-nompi.cpp b/src/output/tests/writer-nompi.cpp index a185b177..b32b1058 100644 --- a/src/output/tests/writer-nompi.cpp +++ b/src/output/tests/writer-nompi.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/src/output/utils/attr_writer.h b/src/output/utils/attr_writer.h index 41b64fb7..4e0c0c87 100644 --- a/src/output/utils/attr_writer.h +++ b/src/output/utils/attr_writer.h @@ -12,7 +12,7 @@ #define OUTPUT_UTILS_ATTR_WRITER_H #include -#include +#include #include #include diff --git a/src/output/writer.cpp b/src/output/writer.cpp index 64d0f081..59c560f9 100644 --- a/src/output/writer.cpp +++ b/src/output/writer.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #if defined(MPI_ENABLED) #include "arch/mpi_aliases.h" diff --git a/src/output/writer.h b/src/output/writer.h index 4fe0c194..190cbb8e 100644 --- a/src/output/writer.h +++ b/src/output/writer.h @@ -17,7 +17,7 @@ #include "output/spectra.h" #include -#include +#include #if defined(MPI_ENABLED) #include