Skip to content

1.4.0 Release Candidate #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
haykh wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

1.4.0 Release Candidate #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b42d55
version bump
haykh Dec 16, 2025
98669a2
dependency version bumps
haykh Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) ")
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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()

Expand Down
4 changes: 2 additions & 2 deletions cmake/dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
6 changes: 3 additions & 3 deletions dev/nix/adios2.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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; [
Expand Down
6 changes: 3 additions & 3 deletions dev/nix/kokkos.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

let
name = "kokkos";
pversion = "4.7.01";
pversion = "5.0.0";
compilerPkgs = {
"HIP" = with pkgs.rocmPackages; [
llvm.rocm-merged-llvm
Expand Down Expand Up @@ -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; [
Expand All @@ -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}} \
Expand Down
3 changes: 1 addition & 2 deletions dev/nix/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ pkgs.mkShell {
adios2Pkg
kokkosPkg

python312
python312Packages.jupyter
python314

cmake-format
cmake-lint
Expand Down
2 changes: 1 addition & 1 deletion extern/Kokkos
Open in desktop
Submodule Kokkos updated 1467 files
2 changes: 1 addition & 1 deletion extern/adios2
Open in desktop
Submodule adios2 updated 1117 files
2 changes: 1 addition & 1 deletion extern/plog
Open in desktop
Submodule plog updated 36 files
+4 −6 .cirrus.yml
+47 −0 .github/workflows/build.yml
+22 −49 .github/workflows/ci.yml
+6 −2 CMakeLists.txt
+254 −94 README.md
+76 −69 include/plog/Log.h
+40 −10 include/plog/Record.h
+25 −6 include/plog/Util.h
+2 −1 library.json
+7 −1 samples/CMakeLists.txt
+6 −2 samples/CXX11/CMakeLists.txt
+6 −2 samples/CXX17/CMakeLists.txt
+2 −1 samples/Demo/CMakeLists.txt
+37 −0 samples/FreeRTOS/CMakeLists.txt
+2 −0 samples/FreeRTOS/freertos_config/CMakeLists.txt
+665 −0 samples/FreeRTOS/freertos_config/FreeRTOSConfig.h
+44 −0 samples/FreeRTOS/main.cpp
+1 −1 samples/HexDump/Main.cpp
+3 −0 samples/MessagePrefix/CMakeLists.txt
+26 −0 samples/MessagePrefix/Main.cpp
+141 −8 test/CMakeLists.txt
+55 −0 test/CastToString.cpp
+16 −0 test/Common.h
+2 −4 test/Conditional.cpp
+1 −1 test/Main.cpp
+69 −0 test/MessagePrefix.cpp
+86 −0 test/NullCharPointer.cpp
+27 −0 test/Path.cpp
+15 −17 test/Printf.cpp
+1 −3 test/SimpleTypes.cpp
+42 −24 test/StdContainers.cpp
+11 −13 test/StdManipulators.cpp
+69 −0 test/StdStreamable.cpp
+53 −3 test/StringTypes.cpp
+0 −0 test/doctest/1.2.9/doctest.h
+7,106 −0 test/doctest/2.4.11/doctest.h
4 changes: 2 additions & 2 deletions minimal/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand All @@ -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})

Expand Down
2 changes: 1 addition & 1 deletion minimal/adios2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <Kokkos_Core.hpp>
#include <adios2.h>
#include <adios2/cxx11/KokkosView.h>
#include <adios2/cxx/KokkosView.h>

#if defined(MPI_ENABLED)
#include <mpi.h>
Expand Down
2 changes: 1 addition & 1 deletion src/engines/engine.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#if defined(OUTPUT_ENABLED)
#include <adios2.h>
#include <adios2/cxx11/KokkosView.h>
#include <adios2/cxx/KokkosView.h>
#endif // OUTPUT_ENABLED

#if defined(MPI_ENABLED)
Expand Down
2 changes: 1 addition & 1 deletion src/framework/domain/metadomain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include "output/writer.h"

#include <adios2.h>
#include <adios2/cxx11/KokkosView.h>
#include <adios2/cxx/KokkosView.h>
#endif // OUTPUT_ENABLED

#include <functional>
Expand Down
2 changes: 1 addition & 1 deletion src/global/utils/param_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "global.h"

#include <adios2.h>
#include <adios2/cxx11/KokkosView.h>
#include <adios2/cxx/KokkosView.h>

#include <any>
#include <functional>
Expand Down
2 changes: 1 addition & 1 deletion src/global/utils/param_container.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#if defined(OUTPUT_ENABLED)
#include <adios2.h>
#include <adios2/cxx11/KokkosView.h>
#include <adios2/cxx/KokkosView.h>
#endif

#include <any>
Expand Down
2 changes: 1 addition & 1 deletion src/output/tests/writer-mpi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <Kokkos_Core.hpp>
#include <adios2.h>
#include <adios2/cxx11/KokkosView.h>
#include <adios2/cxx/KokkosView.h>
#include <mpi.h>

#include <filesystem>
Expand Down
2 changes: 1 addition & 1 deletion src/output/tests/writer-nompi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <Kokkos_Core.hpp>
#include <adios2.h>
#include <adios2/cxx11/KokkosView.h>
#include <adios2/cxx/KokkosView.h>

#include <filesystem>
#include <iostream>
Expand Down
2 changes: 1 addition & 1 deletion src/output/utils/attr_writer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#define OUTPUT_UTILS_ATTR_WRITER_H

#include <adios2.h>
#include <adios2/cxx11/KokkosView.h>
#include <adios2/cxx/KokkosView.h>

#include <any>
#include <functional>
Expand Down
2 changes: 1 addition & 1 deletion src/output/writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include <Kokkos_Core.hpp>
#include <adios2.h>
#include <adios2/cxx11/KokkosView.h>
#include <adios2/cxx/KokkosView.h>

#if defined(MPI_ENABLED)
#include "arch/mpi_aliases.h"
Expand Down
2 changes: 1 addition & 1 deletion src/output/writer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "output/spectra.h"

#include <adios2.h>
#include <adios2/cxx11/KokkosView.h>
#include <adios2/cxx/KokkosView.h>

#if defined(MPI_ENABLED)
#include <mpi.h>
Expand Down