API refactoring

.github/workflows/static-analysis-pr.yml

@@ -24,7 +24,7 @@ jobs:
         id: review
         with:
           build_dir: build
-          apt_packages: mpich,libmpich*,mpi*,openmpi-bin,ninja-build,libomp-19-dev,valgrind
+          apt_packages: openmpi-bin,openmpi-common,libopenmpi-dev,ninja-build,libomp-19-dev,valgrind
           cmake_command: >
             cmake -S . -B build
             -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
@@ -57,7 +57,7 @@ jobs:
         id: review
         with:
           build_dir: build
-          apt_packages: mpich,libmpich*,mpi*,openmpi-bin,ninja-build,libomp-19-dev,valgrind
+          apt_packages: openmpi-bin,openmpi-common,libopenmpi-dev,ninja-build,libomp-19-dev,valgrind
           cmake_command: >
             cmake -S . -B build
             -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache

.gitmodules

@@ -7,3 +7,9 @@
 [submodule "3rdparty/stb"]
 	path = 3rdparty/stb
 	url = https://github.com/nothings/stb
+[submodule "3rdparty/json"]
+	path = 3rdparty/json
+	url = https://github.com/nlohmann/json
+[submodule "3rdparty/libenvpp"]
+	path = 3rdparty/libenvpp
+	url = https://github.com/ph3at/libenvpp

3rdparty/stb_image_wrapper.cpp

@@ -0,0 +1,4 @@
+#define STB_IMAGE_IMPLEMENTATION
+
+// NOLINTNEXTLINE(misc-include-cleaner)
+#include "stb_library.hpp"

3rdparty/stb_library.hpp

@@ -5,7 +5,6 @@
 #pragma clang diagnostic ignored "-Wcast-align"
 #endif
 
-#define STB_IMAGE_IMPLEMENTATION
 #include <stb/stb_image.h>
 
 #if defined(__clang__)

CMakeLists.txt

@@ -29,6 +29,8 @@ message( STATUS "PPC step: First configures" )
 include(cmake/configure.cmake)
 include(cmake/modes.cmake)
 include(cmake/sanitizers.cmake)
+include(cmake/json.cmake)
+include(cmake/libenvpp.cmake)
 
 ################# Parallel programming technologies #################
 

cmake/configure.cmake

@@ -10,6 +10,10 @@ if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif(NOT CMAKE_BUILD_TYPE)
 
+if (MSVC)
+    add_compile_options("/utf-8")
+endif()
+
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/arch" )
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/lib" )
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/bin" )
@@ -22,11 +26,9 @@ set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/arch" )
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" )
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" )
 
-if ( MSVC AND (CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
-    set( CMAKE_CXX_STANDARD 17 )
-else ()
-    set( CMAKE_CXX_STANDARD 23 )
-endif ()
+set( CMAKE_CXX_STANDARD 23 )
+
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_COMPILE_WARNING_AS_ERROR ON)
 

cmake/functions.cmake

@@ -0,0 +1,105 @@
+# ——— Helper function to add & register tests —————————————————————————
+function(ppc_add_test test_name test_src USE_FLAG)
+    if(${USE_FLAG})
+        add_executable(${test_name} "${PROJECT_SOURCE_DIR}/${test_src}")
+        enable_testing()
+        add_test(NAME ${test_name} COMMAND ${test_name})
+        install(TARGETS ${test_name} RUNTIME DESTINATION bin)
+    endif()
+endfunction()
+
+# Function to configure tests
+function(add_tests test_flag exec_target subdir)
+    if(${test_flag})
+        # Gather all source files under tests/<subdir>
+        file(GLOB_RECURSE src_files
+                "${TEST_DIR}/${subdir}/*.cpp"
+                "${TEST_DIR}/${subdir}/*.cxx"
+                "${TEST_DIR}/${subdir}/*.cc"
+        )
+        target_sources(${exec_target} PRIVATE ${src_files})
+        list(APPEND TEST_EXECUTABLES ${exec_target})
+        set(TEST_EXECUTABLES "${TEST_EXECUTABLES}" PARENT_SCOPE)
+    endif()
+endfunction()
+
+# ============================================================================
+# Function: setup_implementation
+#   - NAME:       implementation sub‐directory name (e.g. “mpi”)
+#   - PROJ_NAME:  project base name
+#   - BASE_DIR:   root source directory
+#   - TESTS:      list of test executables to link against
+# ============================================================================
+function(setup_implementation)
+    # parse named args: NAME, PROJ_NAME, BASE_DIR; multi‐value: TESTS
+    cmake_parse_arguments(
+            SETUP
+            ""                      # no plain options
+            "NAME;PROJ_NAME;BASE_DIR"
+            "TESTS"
+            ${ARGN}
+    )
+
+    # skip if impl dir doesn't exist
+    set(IMP_DIR "${SETUP_BASE_DIR}/${SETUP_NAME}")
+    if(NOT EXISTS "${IMP_DIR}")
+        return()
+    endif()
+    message(STATUS "  -- ${SETUP_NAME}")
+
+    # collect sources
+    file(GLOB_RECURSE CPP_SOURCES "${IMP_DIR}/src/*.cpp")
+    file(GLOB_RECURSE ALL_SOURCES
+            "${IMP_DIR}/include/*.h"
+            "${IMP_DIR}/include/*.hpp"
+            "${IMP_DIR}/src/*.cpp"
+    )
+
+    # create library (STATIC if .cpp exist, otherwise INTERFACE)
+    set(LIB_NAME "${SETUP_PROJ_NAME}_${SETUP_NAME}")
+    if(CPP_SOURCES)
+        add_library(${LIB_NAME} STATIC ${ALL_SOURCES})
+    else()
+        add_library(${LIB_NAME} INTERFACE ${ALL_SOURCES})
+    endif()
+
+    # link core module
+    target_link_libraries(${LIB_NAME} PUBLIC core_module_lib)
+
+    # and link into each enabled test executable
+    foreach(test_exec ${SETUP_TESTS})
+        target_link_libraries(${test_exec} PUBLIC ${LIB_NAME})
+    endforeach()
+endfunction()
+
+# Function to configure each subproject
+function(ppc_configure_subproject SUBDIR)
+    # Module-specific compile-time definitions
+    add_compile_definitions(
+            PPC_SETTINGS_${SUBDIR}="${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}/settings.json"
+            PPC_ID_${SUBDIR}="${SUBDIR}"
+    )
+
+    # Switch project context to the subproject
+    project(${SUBDIR})
+
+    # Directory with tests and list of test executables (populated by setup_implementation)
+    set(TEST_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}/tests")
+    set(TEST_EXECUTABLES "")
+
+    # Register functional and performance test runners
+    add_tests(USE_FUNC_TESTS ${FUNC_TEST_EXEC} functional)
+    add_tests(USE_PERF_TESTS ${PERF_TEST_EXEC} performance)
+
+    message(STATUS "${SUBDIR}")
+
+    # List of implementations to configure
+    foreach(IMPL IN LISTS IMPLEMENTATIONS)
+        setup_implementation(
+                NAME        ${IMPL}
+                PROJ_NAME   ${SUBDIR}
+                TESTS       "${TEST_EXECUTABLES}"
+                BASE_DIR    "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}"
+        )
+    endforeach()
+endfunction()

cmake/json.cmake

@@ -0,0 +1,12 @@
+include_directories(${CMAKE_SOURCE_DIR}/3rdparty/json/include)
+include(ExternalProject)
+ExternalProject_Add(ppc_json
+        SOURCE_DIR        "${CMAKE_SOURCE_DIR}/3rdparty/json"
+        PREFIX            "${CMAKE_CURRENT_BINARY_DIR}/ppc_json"
+        BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/build"
+        INSTALL_DIR       "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/install"
+        CONFIGURE_COMMAND "${CMAKE_COMMAND}" -S "${CMAKE_SOURCE_DIR}/3rdparty/json/" -B "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/build/"
+        -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -G${CMAKE_GENERATOR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -D CMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -D CMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
+        BUILD_COMMAND     "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/build" --config ${CMAKE_BUILD_TYPE} --parallel
+        INSTALL_COMMAND   "${CMAKE_COMMAND}" --install "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/build" --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/install")

cmake/libenvpp.cmake

@@ -0,0 +1,27 @@
+include_directories(${CMAKE_SOURCE_DIR}/3rdparty/libenvpp/include)
+include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/3rdparty/libenvpp/external/fmt/include)
+
+include(ExternalProject)
+ExternalProject_Add(ppc_libenvpp
+        SOURCE_DIR        "${CMAKE_SOURCE_DIR}/3rdparty/libenvpp"
+        PREFIX            "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp"
+        BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build"
+        INSTALL_DIR       "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/install"
+        CONFIGURE_COMMAND "${CMAKE_COMMAND}" -S "${CMAKE_SOURCE_DIR}/3rdparty/libenvpp/" -B "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build/"
+        -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -G${CMAKE_GENERATOR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -D CMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -D CMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
+        BUILD_COMMAND     "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build" --config ${CMAKE_BUILD_TYPE} --parallel
+        INSTALL_COMMAND   "${CMAKE_COMMAND}" --install "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build" --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/install")
+
+string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower)
+if(cmake_build_type_lower STREQUAL "debug")
+    set(PPC_FMT_LIB_NAME fmtd)
+else()
+    set(PPC_FMT_LIB_NAME fmt)
+endif()
+
+if(MSVC)
+    set(PPC_ENVPP_LIB_NAME libenvpp)
+else()
+    set(PPC_ENVPP_LIB_NAME envpp)
+endif ()

codecov.yml

@@ -1,12 +1,10 @@
 ignore:
-  - "**/perf_tests/**"
-  - "**/func_tests/**"
-  - "**/all/runner.cpp"
-  - "**/mpi/runner.cpp"
-  - "**/omp/runner.cpp"
-  - "**/seq/runner.cpp"
-  - "**/stl/runner.cpp"
-  - "**/tbb/runner.cpp"
+  - "tasks/**/tests/**"
+  - "modules/**/tests/**"
+  - "tasks/common/runners/**"
+  - "modules/core/util/include/perf_test_util.hpp"
+  - "modules/core/util/include/func_test_util.hpp"
+  - "modules/core/util/src/func_test_util.cpp"
 coverage:
   status:
     project:

modules/core/CMakeLists.txt

@@ -15,18 +15,54 @@ foreach(subd ${subdirs})
   file(GLOB_RECURSE TMP_LIB_SOURCE_FILES ${PATH_PREFIX}/include/* ${PATH_PREFIX}/src/*)
   list(APPEND LIB_SOURCE_FILES ${TMP_LIB_SOURCE_FILES})
 
-  file(GLOB_RECURSE TMP_FUNC_TESTS_SOURCE_FILES ${PATH_PREFIX}/func_tests/*)
+  file(GLOB_RECURSE TMP_FUNC_TESTS_SOURCE_FILES ${PATH_PREFIX}/tests/*)
   list(APPEND FUNC_TESTS_SOURCE_FILES ${TMP_FUNC_TESTS_SOURCE_FILES})
 endforeach()
 
 project(${exec_func_lib})
 add_library(${exec_func_lib} STATIC ${LIB_SOURCE_FILES})
 set_target_properties(${exec_func_lib} PROPERTIES LINKER_LANGUAGE CXX)
 
+add_dependencies(${exec_func_lib} ppc_libenvpp)
+target_link_directories(${exec_func_lib} PUBLIC "${CMAKE_BINARY_DIR}/ppc_libenvpp/install/lib")
+target_link_directories(${exec_func_lib} PUBLIC "${CMAKE_BINARY_DIR}/ppc_libenvpp/build")
+target_link_libraries(${exec_func_lib} PUBLIC ${PPC_ENVPP_LIB_NAME})
+target_link_libraries(${exec_func_lib} PUBLIC ${PPC_FMT_LIB_NAME})
+
+add_dependencies(${exec_func_lib} ppc_json)
+target_link_directories(${exec_func_lib} INTERFACE "${CMAKE_BINARY_DIR}/ppc_json/install/include")
+
+add_dependencies(${exec_func_lib} ppc_googletest)
+target_link_directories(${exec_func_lib} PUBLIC "${CMAKE_BINARY_DIR}/ppc_googletest/install/lib")
+target_link_libraries(${exec_func_lib} PUBLIC gtest gtest_main)
+
+target_link_libraries(${exec_func_lib} PUBLIC Threads::Threads)
+
+find_package(OpenMP REQUIRED)
+target_link_libraries(${exec_func_lib} PUBLIC ${OpenMP_libomp_LIBRARY} OpenMP::OpenMP_CXX)
+
+add_dependencies(${exec_func_lib} ppc_onetbb)
+target_link_directories(${exec_func_lib} PUBLIC ${CMAKE_BINARY_DIR}/ppc_onetbb/install/lib)
+if(NOT MSVC)
+    target_link_libraries(${exec_func_lib} PUBLIC ${PPC_TBB_LIB_NAME})
+endif()
+
+find_package(MPI REQUIRED)
+if( MPI_COMPILE_FLAGS )
+  set_target_properties(${exec_func_lib} PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}")
+endif( MPI_COMPILE_FLAGS )
+
+if( MPI_LINK_FLAGS )
+  set_target_properties(${exec_func_lib} PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}")
+endif( MPI_LINK_FLAGS )
+target_link_libraries(${exec_func_lib} PUBLIC ${MPI_LIBRARIES})
+
+
+add_library(stb_image STATIC ${CMAKE_SOURCE_DIR}/3rdparty/stb_image_wrapper.cpp)
+target_include_directories(stb_image PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/stb)
+target_link_libraries(${exec_func_lib} PUBLIC stb_image)
+
 add_executable(${exec_func_tests} ${FUNC_TESTS_SOURCE_FILES})
-add_dependencies(${exec_func_tests} ppc_googletest)
-target_link_directories(${exec_func_tests} PUBLIC ${CMAKE_BINARY_DIR}/ppc_googletest/install/lib)
-target_link_libraries(${exec_func_tests} PUBLIC gtest gtest_main)
 
 target_link_libraries(${exec_func_tests} PUBLIC ${exec_func_lib})