Latest submodule versions

lanl · Sep 25, 2024 · 7781754 · 7781754
1 parent fdb05d9
commit 7781754
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,10 +53,10 @@ target_include_directories(singularity-opac::flags
                            INTERFACE
                            $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>)
 
-include (SetupDeps)
 include (SetupOptions)
-include (SetupCompilers)
 include (SetupFlags)
+include (SetupDeps)
+include (SetupCompilers)
 
 if (SINGULARITY_USE_HDF5)
   message(STATUS "HDF5 enabled. Requesting it in spiner")

diff --git a/cmake/SetupDeps.cmake b/cmake/SetupDeps.cmake
@@ -14,20 +14,20 @@ endif()
 # Setup ports of call
 # - provides PortsofCall::PortsofCall
 #=======================================
+get_target_property(defs ${PROJECT_NAME} INTERFACE_COMPILE_DEFINITIONS)
+message(STATUS "POC Compile Definitions for ${PROJECT_NAME}: ${defs}")
 find_package(PortsofCall REQUIRED)
 target_link_libraries(singularity-opac::flags INTERFACE PortsofCall::PortsofCall)
 
 #=======================================
 # Setup Kokkos
 # - provides Kokkos::kokkos
 #=======================================
-if (SINGULARITY_USE_KOKKOS)
-  if (NOT TARGET Kokkos::kokkos)
-    add_subdirectory(utils/kokkos)
-    find_package(Kokkos QUIET)
-  else()
-    message(status "Kokkos::kokkos provided by parent package")
-  endif()
+if (NOT TARGET Kokkos::kokkos)
+  add_subdirectory(utils/kokkos)
+  find_package(Kokkos QUIET)
+else()
+  message(status "Kokkos::kokkos provided by parent package")
 endif()
 
 #=======================================

diff --git a/cmake/SetupFlags.cmake b/cmake/SetupFlags.cmake
@@ -63,17 +63,22 @@ INTERFACE
     > # with_kokkos
 )
 
+get_target_property(defs ${PROJECT_NAME} INTERFACE_COMPILE_DEFINITIONS)
+message(STATUS "BEFORE compile Definitions for ${PROJECT_NAME}: ${defs}")
 target_compile_definitions(${PROJECT_NAME}
 INTERFACE
-  $<${with_kokkos}:
-    PORTABILITY_STRATEGY_KOKKOS
-  >
+  #$<${with_kokkos}:
+  #  PORTABILITY_STRATEGY_KOKKOS
+  #>
   $<${without_kokkos}:
     $<${with_fmath}:
       SINGULARITY_USE_FMATH
     >
+    PORTABILITY_STRATEGY_NONE
   >
 )
+get_target_property(defs ${PROJECT_NAME} INTERFACE_COMPILE_DEFINITIONS)
+message(STATUS "Compile Definitions for ${PROJECT_NAME}: ${defs}")
 
 # target_link_libraries brings in compile flags, compile defs, link flags.
 target_link_libraries(${PROJECT_NAME}

diff --git a/utils/kokkos b/utils/kokkos
diff --git a/utils/ports-of-call b/utils/ports-of-call
diff --git a/utils/spiner b/utils/spiner
diff --git a/utils/variant b/utils/variant
+1 −1		CMakeLists.txt
+9 −0		ports-of-call/portability.hpp
+6 −3		ports-of-call/portable_errors.hpp
+91 −82		.gitlab-ci.yml
+0 −3		.gitmodules
+1 −1		CMakeLists.txt
+2 −2		README.md
+91 −5		doc/sphinx/src/databox.rst
+1 −0		spack-repo/packages/ports-of-call/package.py
+5 −16		spack-repo/packages/spiner/package.py
+54 −0		spiner/databox.hpp
+31 −17		spiner/piecewise_grid_1d.hpp
+0 −15		spiner/regular_grid_1d.hpp
+1 −1		test/CMakeLists.txt
+124 −11		test/test.cpp