1.4.0 Release Candidate

.github/workflows/cpuarch.yml

@@ -2,6 +2,8 @@ name: CPU Compilation/Unit Tests
 
 on:
   push:
+  pull_request:
+    types: [ready_for_review] 
 
 jobs:
   check-commit:
@@ -14,6 +16,10 @@ jobs:
       - name: Check commit message
         id: check_message
         run: |
+          if [[ "${{ github.event_name }}" == "pull_request" && "${{ github.event.action }}" == "ready_for_review" ]]; then
+            echo "run_tests=true" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
           if git log -1 --pretty=%B | grep -q "CPUTEST"; then
             echo "run_tests=true" >> "$GITHUB_OUTPUT"
           else

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "extern/plog"]
-	path = extern/plog
-	url = https://github.com/SergiusTheBest/plog.git
 [submodule "extern/adios2"]
 	path = extern/adios2
 	url = https://github.com/ornladios/ADIOS2.git

CMakeLists.txt

@@ -7,7 +7,7 @@ set(PROJECT_NAME entity)
 
 project(
   ${PROJECT_NAME}
-  VERSION 1.3.3
+  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) ")
@@ -47,9 +47,6 @@ set(pgen
     ${default_pgen}
     CACHE STRING "Problem generator")
 
-set(gui
-    ${default_gui}
-    CACHE BOOL "Use GUI [nttiny]")
 set(output
     ${default_output}
     CACHE BOOL "Enable output")
@@ -62,15 +59,15 @@ 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)
 
 if(${DEBUG} STREQUAL "OFF")
   set(CMAKE_BUILD_TYPE
       Release
       CACHE STRING "CMake build type")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG -O3")
 else()
   set(CMAKE_BUILD_TYPE
       Debug
@@ -109,9 +106,8 @@ set(BUILD_TESTING
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/dependencies.cmake)
 
 find_or_fetch_dependency(Kokkos FALSE QUIET)
-find_or_fetch_dependency(plog TRUE QUIET)
 set(DEPENDENCIES Kokkos::kokkos)
-include_directories(${plog_SRC}/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 # -------------------------------- Main code ------------------------------- #
 set_precision(${precision})
@@ -162,29 +158,37 @@ 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()
 
 link_libraries(${DEPENDENCIES})
 
+set(SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/)
+add_subdirectory(${SRC_DIR}/global ${CMAKE_CURRENT_BINARY_DIR}/global)
+add_subdirectory(${SRC_DIR}/metrics ${CMAKE_CURRENT_BINARY_DIR}/metrics)
+add_subdirectory(${SRC_DIR}/kernels ${CMAKE_CURRENT_BINARY_DIR}/kernels)
+add_subdirectory(${SRC_DIR}/archetypes ${CMAKE_CURRENT_BINARY_DIR}/archetypes)
+add_subdirectory(${SRC_DIR}/framework ${CMAKE_CURRENT_BINARY_DIR}/framework)
+add_subdirectory(${SRC_DIR}/output ${CMAKE_CURRENT_BINARY_DIR}/output)
+
+# ------------------------------- Main source ------------------------------ #
+if(NOT ${pgen} STREQUAL ${default_pgen})
+  set_problem_generator(${pgen})
+  add_subdirectory(${SRC_DIR}/engines ${CMAKE_CURRENT_BINARY_DIR}/engines)
+  add_subdirectory(${SRC_DIR} ${CMAKE_CURRENT_BINARY_DIR}/src)
+endif()
+
 if(TESTS)
   # ---------------------------------- Tests --------------------------------- #
   include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/tests.cmake)
-elseif(BENCHMARK)
+endif()
+
+if(BENCHMARK)
   # ------------------------------ Benchmark --------------------------------- #
   include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/benchmark.cmake)
-else()
-  # ----------------------------------- GUI ---------------------------------- #
-  if(${gui})
-    find_or_fetch_dependency(nttiny FALSE QUIET)
-  endif()
-
-  # ------------------------------- Main source ------------------------------ #
-  set_problem_generator(${pgen})
-  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src src)
 endif()
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/report.cmake)

README.md

@@ -37,8 +37,8 @@ Maintainers indicated with an arrow.
 * :tipping_hand_person: Alexander Chernoglazov {[@SChernoglazov](https://github.com/SChernoglazov)}
 * :tea: Benjamin Crinquand {[@bcrinquand](https://github.com/bcrinquand)}
 * :bubble_tea: Alisa Galishnikova {[@alisagk](https://github.com/alisagk)}
-* :steam_locomotive: Evgeny Gorbunov {[@Alcauchy](https://github.com/Alcauchy)} [-> [haykh.astro [at] gmail](mailto:haykh.astro@gmail.com)]
-* :coffee: Hayk Hakobyan {[@haykh](https://github.com/haykh)} [-> [genegorbs [at] gmail](mailto:genegorbs@gmail.com)]
+* :steam_locomotive: Evgeny Gorbunov {[@Alcauchy](https://github.com/Alcauchy)} [-> [genegorbs [at] gmail](mailto:genegorbs@gmail.com)]
+* :coffee: Hayk Hakobyan {[@haykh](https://github.com/haykh)} [-> [haykh.astro [at] gmail](mailto:haykh.astro@gmail.com)]
 * :potato: Jens Mahlmann {[@jmahlmann](https://github.com/jmahlmann)}
 * :dolphin: Sasha Philippov {[@sashaph](https://github.com/sashaph)}
 * :radio: Siddhant Solanki {[@sidruns30](https://github.com/sidruns30)}

cmake/benchmark.cmake

@@ -2,17 +2,6 @@
 
 set(SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
-add_subdirectory(${SRC_DIR}/global ${CMAKE_CURRENT_BINARY_DIR}/global)
-add_subdirectory(${SRC_DIR}/metrics ${CMAKE_CURRENT_BINARY_DIR}/metrics)
-add_subdirectory(${SRC_DIR}/kernels ${CMAKE_CURRENT_BINARY_DIR}/kernels)
-add_subdirectory(${SRC_DIR}/archetypes ${CMAKE_CURRENT_BINARY_DIR}/archetypes)
-add_subdirectory(${SRC_DIR}/framework ${CMAKE_CURRENT_BINARY_DIR}/framework)
-
-if(${output})
-  add_subdirectory(${SRC_DIR}/output ${CMAKE_CURRENT_BINARY_DIR}/output)
-  add_subdirectory(${SRC_DIR}/checkpoint ${CMAKE_CURRENT_BINARY_DIR}/checkpoint)
-endif()
-
 set(exec benchmark.xc)
 set(src ${CMAKE_CURRENT_SOURCE_DIR}/benchmark/benchmark.cpp)
 
@@ -23,4 +12,7 @@ if(${output})
   list(APPEND libs ntt_output)
 endif()
 add_dependencies(${exec} ${libs})
-target_link_libraries(${exec} PRIVATE ${libs} stdc++fs)
+if (NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang")
+  list(APPEND libs stdc++fs)
+endif()
+target_link_libraries(${exec} PRIVATE ${libs})

cmake/dependencies.cmake

@@ -3,14 +3,24 @@
 set(Kokkos_REPOSITORY
     https://github.com/kokkos/kokkos.git
     CACHE STRING "Kokkos repository")
-set(plog_REPOSITORY
-    https://github.com/SergiusTheBest/plog.git
-    CACHE STRING "plog repository")
+set(Kokkos_TAG
+    5.0.1
+    CACHE STRING "Kokkos tag")
 set(adios2_REPOSITORY
     https://github.com/ornladios/ADIOS2.git
     CACHE STRING "ADIOS2 repository")
+set(adios2_TAG
+    v2.11.0
+    CACHE STRING "ADIOS2 tag")
+
+set(CONNECTION_CHECKED
+    FALSE
+    CACHE BOOL "Whether internet connection has been checked")
 
 function(check_internet_connection)
+  if(CONNECTION_CHECKED)
+    return()
+  endif()
   if(OFFLINE STREQUAL "ON")
     set(FETCHCONTENT_FULLY_DISCONNECTED
         ON
@@ -35,6 +45,9 @@ function(check_internet_connection)
       message(STATUS "${Green}Internet connection established.${ColorReset}")
     endif()
   endif()
+  set(CONNECTION_CHECKED
+      TRUE
+      CACHE BOOL "Whether internet connection has been checked")
 endfunction()
 
 function(find_or_fetch_dependency package_name header_only mode)
@@ -43,6 +56,8 @@ function(find_or_fetch_dependency package_name header_only mode)
   endif()
 
   if(NOT ${package_name}_FOUND)
+    check_internet_connection()
+
     if(${package_name} STREQUAL "Kokkos")
       include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/kokkosConfig.cmake)
     elseif(${package_name} STREQUAL "adios2")
@@ -54,16 +69,11 @@ function(find_or_fetch_dependency package_name header_only mode)
       message(STATUS "${Blue}${package_name} not found. "
                      "Fetching from ${${package_name}_REPOSITORY}${ColorReset}")
       include(FetchContent)
-      if(${package_name} STREQUAL "Kokkos")
+      if(${package_name} STREQUAL "Kokkos" OR ${package_name} STREQUAL "adios2")
         FetchContent_Declare(
           ${package_name}
           GIT_REPOSITORY ${${package_name}_REPOSITORY}
-          GIT_TAG 4.7.01)
-      elseif(${package_name} STREQUAL "adios2")
-        FetchContent_Declare(
-          ${package_name}
-          GIT_REPOSITORY ${${package_name}_REPOSITORY}
-          GIT_TAG v2.10.2)
+          GIT_TAG ${${package_name}_TAG})
       else()
         FetchContent_Declare(${package_name}
                              GIT_REPOSITORY ${${package_name}_REPOSITORY})
@@ -171,5 +181,3 @@ function(find_or_fetch_dependency package_name header_only mode)
       ${${package_name}_BUILD_DIR}
       PARENT_SCOPE)
 endfunction()
-
-check_internet_connection()

cmake/report.cmake

@@ -8,7 +8,9 @@ if(${PGEN_FOUND})
     "${Blue}"
     PGEN_REPORT
     0)
-elseif(${TESTS})
+endif()
+
+if(${TESTS})
   set(TEST_NAMES "")
   foreach(test_dir IN LISTS TEST_DIRECTORIES)
     get_property(
@@ -18,14 +20,38 @@ elseif(${TESTS})
     list(APPEND TEST_NAMES ${LOCAL_TEST_NAMES})
   endforeach()
   printchoices(
-    "Test cases"
+    "Tests"
+    "TESTS"
+    "${ON_OFF_VALUES}"
+    "ON"
+    "OFF"
+    "${Green}"
+    TESTS_REPORT_1
+    46)
+  printchoices(
+    ""
     ""
     "${TEST_NAMES}"
     ""
     "${ColorReset}"
     ""
-    TESTS_REPORT
+    TESTS_REPORT_2
     0)
+  # remove only first line of TESTS_REPORT_2
+  string(REPLACE "\n" ";" TESTS_REPORT_2_LIST "${TESTS_REPORT_2}")
+  list(REMOVE_AT TESTS_REPORT_2_LIST 0)
+  string(REPLACE ";" "\n" TESTS_REPORT_2 "${TESTS_REPORT_2_LIST}")
+  set(TESTS_REPORT "${TESTS_REPORT_1}\n${TESTS_REPORT_2}")
+else()
+  printchoices(
+    "Tests"
+    "TESTS"
+    "${ON_OFF_VALUES}"
+    "OFF"
+    "OFF"
+    "${Green}"
+    TESTS_REPORT
+    46)
 endif()
 
 printchoices(
@@ -120,9 +146,8 @@ string(APPEND REPORT_TEXT ${DASHED_LINE_SYMBOL} "\n" "Configurations" "\n")
 
 if(${PGEN_FOUND})
   string(APPEND REPORT_TEXT "  " ${PGEN_REPORT} "\n")
-elseif(${TESTS})
-  string(APPEND REPORT_TEXT "  " ${TESTS_REPORT} "\n")
 endif()
+string(APPEND REPORT_TEXT "  " ${TESTS_REPORT} "\n")
 
 string(
   APPEND

cmake/tests.cmake

@@ -3,13 +3,6 @@ enable_testing()
 
 set(SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
-add_subdirectory(${SRC_DIR}/global ${CMAKE_CURRENT_BINARY_DIR}/global)
-add_subdirectory(${SRC_DIR}/metrics ${CMAKE_CURRENT_BINARY_DIR}/metrics)
-add_subdirectory(${SRC_DIR}/kernels ${CMAKE_CURRENT_BINARY_DIR}/kernels)
-add_subdirectory(${SRC_DIR}/archetypes ${CMAKE_CURRENT_BINARY_DIR}/archetypes)
-add_subdirectory(${SRC_DIR}/framework ${CMAKE_CURRENT_BINARY_DIR}/framework)
-add_subdirectory(${SRC_DIR}/output ${CMAKE_CURRENT_BINARY_DIR}/output)
-
 set(TEST_DIRECTORIES "")
 
 if(NOT ${mpi})