Add collisions

CMakeLists.txt

@@ -4,6 +4,7 @@
 #------------------------------------------------------------------------------#
 
 cmake_minimum_required(VERSION 3.9)
+cmake_policy(SET CMP0074 NEW)
 
 #~----------------------------------------------------------------------------~#
 # VPIC project configuration
@@ -54,9 +55,6 @@ option(BUILD_INTERNAL_KOKKOS "Have VPIC build it's own Kokkos rather than look i
 
 option(VPIC_DUMP_ENERGIES "If the code should dump energies diagnostic" OFF)
 
-set(KOKKOS_ARCH "Power9;Volta70" CACHE STRING "Architecture to use with Kokkos")
-
-
 add_definitions(-DUSE_KOKKOS)
 set(VPIC_CPPFLAGS "${VPIC_CPPFLAGS} -DUSE_KOKKOS") # Set it here for ./deck/ files
 
@@ -74,6 +72,13 @@ if(MPI_CPPFLAGS)
   set(VPIC_CPPFLAGS "${string_cppflags}")
 endif(MPI_CPPFLAGS)
 
+# Append extra implicit includes
+string(REPLACE ";" " -I" string_cppflags "${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}")
+set(VPIC_CPPFLAGS "${VPIC_CPPFLAGS} -I${string_cppflags}")
+message(${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
+message(${VPIC_CPPFLAGS})
+
+
 string(REPLACE ";" " -I" string_includes "${MPI_C_INCLUDE_PATH}")
 if(NOT ${string_includes} STREQUAL "")
   set(VPIC_CXX_FLAGS "-I${string_includes} ${MPI_C_LINK_FLAGS}")
@@ -115,34 +120,33 @@ include_directories(${PROJECT_SOURCE_DIR})
 #------------------------------------------------------------------------------#
 # Kokkos
 #------------------------------------------------------------------------------#
-set(KOKKOS_ENABLE_DEBUG OFF)
+set(Kokkos_ENABLE_DEBUG OFF)
 
 option(VPIC_KOKKOS_DEBUG "Enable Debug In Kokkos" OFF)
 
 if (VPIC_KOKKOS_DEBUG)
-    set(KOKKOS_ENABLE_DEBUG ON)
+    set(Kokkos_ENABLE_DEBUG ON)
 endif(VPIC_KOKKOS_DEBUG)
 
-set(KOKKOS_ENABLE_EXPLICIT_INSTANTIATION OFF)
+set(Kokkos_ENABLE_EXPLICIT_INSTANTIATION OFF)
+
+set(Kokkos_ENABLE_SERIAL ON CACHE BOOL "Default allow serial execution")
 
 if(ENABLE_KOKKOS_OPENMP)
   if (OPENMP_FOUND)
-    set(KOKKOS_ENABLE_OPENMP ON CACHE BOOL "Use OpenMP if found")
+    set(Kokkos_ENABLE_OPENMP ON CACHE BOOL "Use OpenMP if found")
   endif()
+else()
+    set(Kokkos_ENABLE_OPENMP OFF)
 endif()
 
 if(ENABLE_KOKKOS_CUDA)
   find_package(CUDA)
   if (CUDA_FOUND)
     add_definitions(-DENABLE_KOKKOS_CUDA)
-    set(KOKKOS_ENABLE_CUDA ON CACHE BOOL "Use Cuda with Kokkos")
-    set(KOKKOS_ENABLE_CUDA_LAMBDA ON)
-    set(KOKKOS_ENABLE_CUDA_UVM OFF)
-
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --expt-extended-lambda")
-
-    #set(KOKKOS_ARCH "Power9;Volta70")
-    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch=sm_70")
+    set(Kokkos_ENABLE_CUDA ON CACHE BOOL "Use Cuda with Kokkos")
+    set(Kokkos_ENABLE_CUDA_LAMBDA ON CACHE BOOL "Enable cuda lambda support")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --expt-extended-lambda")
 
     # turn off -std=gnu++ to avoid error: identifier "__float128" is undefined issue
     # see https://github.com/UoB-HPC/BabelStream/issues/16
@@ -158,25 +162,57 @@ endif()
 
 # Disable platform specific options
 if (APPLE)
-  set(KOKKOS_ENABLE_LIBRT OFF CACHE BOOL "librt is not available on macOS")
+  set(Kokkos_ENABLE_LIBRT OFF CACHE BOOL "librt is not available on macOS")
 endif()
 
+
+
+# TODO: This is only need for non-linux platforms
+set(Kokkos_ENABLE_LIBDL OFF)
+set(Kokkos_ENABLE_PROFILING OFF) # NO libDL => no profiling
+
+
 if (BUILD_INTERNAL_KOKKOS)
   message("Building our own kokkos..")
   add_subdirectory(kokkos)
+  set(Kokkos_ENABLE_LIBDL OFF)
+  set(Kokkos_ENABLE_PROFILING OFF) # NO libDL => no profiling
   #include_directories(${Kokkos_INCLUDE_DIRS_RET})
-  set(KOKKOS_INCLUDE_DIRS ${Kokkos_INCLUDE_DIRS_RET})
+  #set(KOKKOS_INCLUDE_DIRS ${Kokkos_INCLUDE_DIRS_RET})
 else()
-  # CONSIDER ADDING --expt-extended-lambda 
-  find_package(KOKKOS REQUIRED)
-  # TODO: I doubt this is the cmakey way to add this to includes
-  get_target_property(KOKKOS_INCLUDE_DIRS Kokkos::kokkos INTERFACE_INCLUDE_DIRECTORIES)
+  # CONSIDER ADDING --expt-extended-lambda
+#  find_package(KOKKOS REQUIRED)
+  find_package(Kokkos REQUIRED)
+
+  #get_target_property(KOKKOS_INCLUDE_DIRS Kokkos::kokkos INTERFACE_INCLUDE_DIRECTORIES)
   #get_target_property(KOKKOS_LIB_DIR Kokkos::kokkos INTERFACE_LINK_LIBRARIES)
   #message(${KOKKOS_INCLUDE_DIRS})
-  link_directories(${KOKKOS_INCLUDE_DIRS}/../lib) # TODO: bad idea..
+  #link_directories(${KOKKOS_INCLUDE_DIRS}/../lib) # TODO: bad idea..
 endif(BUILD_INTERNAL_KOKKOS)
 
-include_directories(${KOKKOS_INCLUDE_DIRS})
+
+get_target_property(KOKKOS_INCLUDE_DIRS Kokkos::kokkoscore INTERFACE_INCLUDE_DIRECTORIES)
+get_target_property(KOKKOS_INCLUDE_CONTAINERS Kokkos::kokkoscontainers INTERFACE_INCLUDE_DIRECTORIES)
+
+# TODO: this gives the external include path
+#get_target_property(KOKKOS_LIB_DIRS Kokkos::kokkos INTERFACE_LINK_DEPENDS)
+
+#get_target_property(KOKKOS_LIB_DIRS Kokkos::kokkos INTERFACE_LINK_DEPENDS)
+#get_target_property(KOKKOS_LIB_CONTAINERS Kokkos::kokkoscontainers INTERFACE_LINK_DEPENDS)
+
+set(KOKKOS_CORE_INCLUDES_FILE ${PROJECT_BINARY_DIR}/kokkos_core_includes)
+set(KOKKOS_CONTAINER_INCLUDES_FILE ${PROJECT_BINARY_DIR}/kokkos_container_includes)
+#set(KOKKOS_CORE_LIB_FILE ${PROJECT_BINARY_DIR}/kokkos_core_lib)
+#set(KOKKOS_CONTAINER_LIB_FILE ${PROJECT_BINARY_DIR}/kokkos_container_lib)
+
+# For an "external" build these will be the same, but for an internal we need to gather both
+file(GENERATE OUTPUT ${KOKKOS_CORE_INCLUDES_FILE} CONTENT "${KOKKOS_INCLUDE_DIRS}")
+file(GENERATE OUTPUT ${KOKKOS_CONTAINER_INCLUDES_FILE} CONTENT "${KOKKOS_INCLUDE_CONTAINERS}")
+
+#file(GENERATE OUTPUT ${KOKKOS_CORE_LIB_FILE} CONTENT "${KOKKOS_LIB_DIRS}")
+#file(GENERATE OUTPUT ${KOKKOS_CONTAINER_LIB_FILE} CONTENT "${KOKKOS_LIB_CONTAINERS}")
+
+#include_directories(${KOKKOS_INCLUDE_DIRS})
 #string(REPLACE ";" " " KOKKOS_INCLUDE_DIRS "${KOKKOS_INCLUDE_DIRS}")
 #message(dirs: ${KOKKOS_INCLUDE_DIRS})
 
@@ -188,20 +224,19 @@ include_directories(${KOKKOS_INCLUDE_DIRS})
 
 # TODO: bad idea.. at best, this is just going to add it to the last one in the
 # array
-link_directories(${KOKKOS_INCLUDE_DIRS}/../lib)
-link_directories(${KOKKOS_INCLUDE_DIRS}/lib) 
+#link_directories(${KOKKOS_INCLUDE_DIRS}/../lib)
+#link_directories(${KOKKOS_INCLUDE_DIRS}/lib)
 
 # Libs
-message(${string_libraries})
 string(REPLACE ";" " " string_libraries "${KOKKOS_LIBS} ${KOKKOS_LDFLAGS}")
 set(VPIC_CXX_LIBRARIES "${VPIC_CXX_LIBRARIES} ${string_libraries}")
 
 # Includes (TODO: this is definitely abuse of the CXX variable..)
-string(REPLACE ";" " -I" string_libraries "-I${KOKKOS_INCLUDE_DIRS}")
-set(VPIC_CXX_LIBRARIES "${VPIC_CXX_LIBRARIES} ${string_libraries}")
+#string(REPLACE ";" " -I" string_libraries "-I${KOKKOS_INCLUDE_DIRS}")
+#set(VPIC_CXX_LIBRARIES "${VPIC_CXX_LIBRARIES} ${string_libraries}")
 
-string(REPLACE ";" " -L" string_libraries "-L${KOKKOS_INCLUDE_DIRS}")
-set(VPIC_CXX_LIBRARIES "${VPIC_CXX_LIBRARIES} ${string_libraries}")
+#string(REPLACE ";" " -L" string_libraries "-L${KOKKOS_INCLUDE_DIRS}")
+#set(VPIC_CXX_LIBRARIES "${VPIC_CXX_LIBRARIES} ${string_libraries}")
 
 
 #------------------------------------------------------------------------------#
@@ -246,6 +281,31 @@ if(ENABLE_OPENSSL)
   add_definitions(-DENABLE_OPENSSL)
 endif(ENABLE_OPENSSL)
 
+#------------------------------------------------------------------------------#
+# Output log variables
+#------------------------------------------------------------------------------#
+FIND_PACKAGE(Git)
+IF(GIT_FOUND AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/.git)
+    EXECUTE_PROCESS(
+        COMMAND           ${GIT_EXECUTABLE} log --pretty=format:%H -n 1
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        OUTPUT_VARIABLE   VPIC_GIT_COMMIT_HASH
+        )
+ELSE()
+    SET(VPIC_GIT_COMMIT_HASH "Not a git repository")
+ENDIF()
+string(TIMESTAMP _build_time_stamp)
+
+MESSAGE(STATUS "VPIC Revision = '${VPIC_GIT_COMMIT_HASH}'")
+#add_definitions("-DVPIC_GIT_HASH=${VPIC_GIT_COMMIT_HASH}")
+
+configure_file (
+    "${PROJECT_SOURCE_DIR}/cmake/git_version.h.in"
+    "${PROJECT_BINARY_DIR}/include/git_version.h"
+)
+
+include_directories(${PROJECT_BINARY_DIR}/include) # for generated git_version.h
+
 #------------------------------------------------------------------------------#
 # Handle vpic compile script last
 #------------------------------------------------------------------------------#
@@ -263,12 +323,18 @@ endif(ENABLE_COVERAGE_BUILD)
 
 # process Makefile.run.in to get a simple Makefile.run for a run. Points to
 # local built exe wrapper, and has example deck/platform.
-configure_file(${CMAKE_SOURCE_DIR}/sample/Makefile.run.in
-  ${CMAKE_BINARY_DIR}/bin/Makefile.run)
+configure_file(
+    ${CMAKE_SOURCE_DIR}/sample/Makefile.run.in
+    ${CMAKE_BINARY_DIR}/bin/Makefile.run
+)
 
 # install script
-configure_file(${CMAKE_SOURCE_DIR}/bin/vpic.in
-  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/vpic-install)
+configure_file(
+    ${CMAKE_SOURCE_DIR}/bin/vpic.in
+    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/vpic-install
+    @ONLY
+)
+
 install(FILES ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/vpic-install
   DESTINATION bin
   RENAME vpic
@@ -284,8 +350,11 @@ install(FILES ${CMAKE_SOURCE_DIR}/deck/wrapper.cc
   DESTINATION share/vpic)
 
 # local script
-configure_file(${CMAKE_SOURCE_DIR}/bin/vpic-local.in
-  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/vpic)
+configure_file(
+    ${CMAKE_SOURCE_DIR}/bin/vpic-local.in
+    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/vpic
+    @ONLY
+)
 
 file(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/vpic
   DESTINATION ${CMAKE_BINARY_DIR}/bin
@@ -315,15 +384,15 @@ else()
   install(TARGETS vpic LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
 endif()
 target_include_directories(vpic INTERFACE ${CMAKE_SOURCE_DIR}/src)
-target_link_libraries(vpic ${VPIC_EXPOSE} ${MPI_CXX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS} kokkos)
+target_link_libraries(vpic ${VPIC_EXPOSE} ${MPI_CXX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS} Kokkos::kokkos)
 target_compile_options(vpic ${VPIC_EXPOSE} ${MPI_C_COMPILE_FLAGS})
 
 macro(build_a_vpic name deck)
   if(NOT EXISTS ${deck})
     message(FATAL_ERROR "Could not find deck '${deck}'")
   endif()
   add_executable(${name} ${CMAKE_SOURCE_DIR}/deck/main.cc ${CMAKE_SOURCE_DIR}/deck/wrapper.cc ${VPIC_SRC})
-  target_link_libraries(${name} vpic)
+  target_link_libraries(${name} vpic Kokkos::kokkos)
   target_compile_definitions(${name} PRIVATE INPUT_DECK=${deck})
 endmacro(build_a_vpic)
 
@@ -365,9 +434,8 @@ if(ENABLE_UNIT_TESTS)
 
   # RNG tests
   add_executable(rng src/util/rng/test/rng.cc)
-  target_link_libraries(rng vpic)
+  target_link_libraries(rng vpic Kokkos::kokkos)
   get_target_property(OUT rng LINK_LIBRARIES)
-  message(STATUS OUT ${OUT})
 
   add_test(NAME rng COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 1 ${MPIEXEC_PREFLAGS} ./rng)
 

bin/vpic-local.in

@@ -2,6 +2,43 @@
 
 deck=`echo $1 | sed 's,\.cxx,,g;s,\.cc,,g;s,\.cpp,,g;s,.*\/,,g'`
 
-echo "${CMAKE_CXX_COMPILER} ${VPIC_CPPFLAGS} ${CMAKE_CXX_FLAGS} -I. -I${CMAKE_SOURCE_DIR}/src ${VPIC_CXX_FLAGS} -DINPUT_DECK=$1 ${CMAKE_SOURCE_DIR}/deck/main.cc ${CMAKE_SOURCE_DIR}/deck/wrapper.cc -o $deck.${CMAKE_SYSTEM_NAME} -Wl,-rpath,${CMAKE_BINARY_DIR} -L${CMAKE_BINARY_DIR} -lvpic ${VPIC_CXX_LIBRARIES} -lpthread -ldl"
+clean_kokkos_path()
+{
+    # $1 = path
+    # $2 = swap ; for $2
+    if grep -q ";" <<< "$1"; then
+      echo $(echo $1 | sed "s/;/ $2/g")
+    else
+      echo ${2}${1}
+    fi
+}
 
-${CMAKE_CXX_COMPILER} ${VPIC_CPPFLAGS} ${CMAKE_CXX_FLAGS} -I. -I${CMAKE_SOURCE_DIR}/src ${VPIC_CXX_FLAGS} -DINPUT_DECK=$1 ${CMAKE_SOURCE_DIR}/deck/main.cc ${CMAKE_SOURCE_DIR}/deck/wrapper.cc -o $deck.${CMAKE_SYSTEM_NAME} -Wl,-rpath,${CMAKE_BINARY_DIR} -L${CMAKE_BINARY_DIR} -lvpic ${VPIC_CXX_LIBRARIES} -lpthread -ldl
+
+KOKKOS_CORE_INCLUDES=$( cat @KOKKOS_CORE_INCLUDES_FILE@ )
+KOKKOS_CONTAINER_INCLUDES=$( cat @KOKKOS_CONTAINER_INCLUDES_FILE@ )
+
+KOKKOS_CORE_LIBS=$KOKKOS_CORE_INCLUDES
+KOKKOS_CONTAINER_LIBS=$KOKKOS_CONTAINER_INCLUDES
+
+echo $KOKKOS_CORE_LIBS
+
+# Add hack to include ../lib and ../lib64, only required for "external" builds
+# If only a single path was passed append the paths
+if ! grep -q ";" <<< "$KOKKOS_CORE_LIBS"; then
+    # We pre append ";" to make the above subsition work when cleaning the path
+    KOKKOS_CORE_LIBS=";${KOKKOS_CORE_LIBS};${KOKKOS_CORE_LIBS}/../lib/"
+    KOKKOS_CORE_LIBS=";${KOKKOS_CORE_LIBS};${KOKKOS_CORE_LIBS}/../lib64/"
+fi
+
+KOKKOS_CORE_INCLUDES=$(clean_kokkos_path $KOKKOS_CORE_INCLUDES -I)
+KOKKOS_CONTAINER_INCLUDES=$(clean_kokkos_path $KOKKOS_CONTAINER_INCLUDES -I)
+
+KOKKOS_CORE_LIBS=$(clean_kokkos_path $KOKKOS_CORE_LIBS -L)
+KOKKOS_CONTAINER_LIBS=$(clean_kokkos_path $KOKKOS_CONTAINER_LIBS -L)
+
+#KOKKOS_LIBS="-l:libkokkoscore.a -l:libkokkoscontainers.a"
+KOKKOS_LIBS="-lkokkoscore -lkokkoscontainers"
+
+echo @CMAKE_CXX_COMPILER@ @VPIC_CPPFLAGS@ @CMAKE_CXX_FLAGS@ -I. -I@CMAKE_SOURCE_DIR@/src @VPIC_CXX_FLAGS@ -DINPUT_DECK=$1 @CMAKE_SOURCE_DIR@/deck/main.cc @CMAKE_SOURCE_DIR@/deck/wrapper.cc -o $deck.@CMAKE_SYSTEM_NAME@ -Wl,-rpath,@CMAKE_BINARY_DIR@ -L@CMAKE_BINARY_DIR@ -lvpic @VPIC_CXX_LIBRARIES@ -lpthread -ldl $KOKKOS_CORE_LIBS $KOKKOS_CONTAINER_LIBS $KOKKOS_CORE_INCLUDES $KOKKOS_CONTAINER_INCLUDES $KOKKOS_LIBS
+
+@CMAKE_CXX_COMPILER@ @VPIC_CPPFLAGS@ @CMAKE_CXX_FLAGS@ -I. -I@CMAKE_SOURCE_DIR@/src @VPIC_CXX_FLAGS@ -DINPUT_DECK=$1 @CMAKE_SOURCE_DIR@/deck/main.cc @CMAKE_SOURCE_DIR@/deck/wrapper.cc -o $deck.@CMAKE_SYSTEM_NAME@ -Wl,-rpath,@CMAKE_BINARY_DIR@ -L@CMAKE_BINARY_DIR@ -lvpic @VPIC_CXX_LIBRARIES@ -lpthread -ldl $KOKKOS_CORE_LIBS $KOKKOS_CONTAINER_LIBS $KOKKOS_CORE_INCLUDES $KOKKOS_CONTAINER_INCLUDES $KOKKOS_LIBS

bin/vpic.in

@@ -2,6 +2,48 @@
 
 deck=`echo $1 | sed 's,\.cxx,,g;s,\.cc,,g;s,\.cpp,,g;s,.*\/,,g'`
 
-echo "${CMAKE_CXX_COMPILER} ${VPIC_CPPFLAGS} ${CMAKE_CXX_FLAGS} -I. -I${CMAKE_INSTALL_PREFIX}/include/vpic ${VPIC_CXX_FLAGS} -DINPUT_DECK=$1 ${CMAKE_INSTALL_PREFIX}/share/vpic/main.cc ${CMAKE_INSTALL_PREFIX}/share/vpic/wrapper.cc -o $deck.${CMAKE_SYSTEM_NAME} -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/lib -L${CMAKE_INSTALL_PREFIX}/lib -lvpic ${VPIC_CXX_LIBRARIES} -lpthread -ldl"
+# Old code
+#echo "${CMAKE_CXX_COMPILER} ${VPIC_CPPFLAGS} ${CMAKE_CXX_FLAGS} -I. -I${CMAKE_INSTALL_PREFIX}/include/vpic ${VPIC_CXX_FLAGS} -DINPUT_DECK=$1 ${CMAKE_INSTALL_PREFIX}/share/vpic/main.cc ${CMAKE_INSTALL_PREFIX}/share/vpic/wrapper.cc -o $deck.${CMAKE_SYSTEM_NAME} -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/lib -L${CMAKE_INSTALL_PREFIX}/lib -lvpic ${VPIC_CXX_LIBRARIES} -lpthread -ldl"
 
-${CMAKE_CXX_COMPILER} ${VPIC_CPPFLAGS} ${CMAKE_CXX_FLAGS} -I. -I${CMAKE_INSTALL_PREFIX}/include/vpic ${VPIC_CXX_FLAGS} -DINPUT_DECK=$1 ${CMAKE_INSTALL_PREFIX}/share/vpic/main.cc ${CMAKE_INSTALL_PREFIX}/share/vpic/wrapper.cc -o $deck.${CMAKE_SYSTEM_NAME} -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/lib -L${CMAKE_INSTALL_PREFIX}/lib -lvpic ${VPIC_CXX_LIBRARIES} -lpthread -ldl
+#${CMAKE_CXX_COMPILER} ${VPIC_CPPFLAGS} ${CMAKE_CXX_FLAGS} -I. -I${CMAKE_INSTALL_PREFIX}/include/vpic ${VPIC_CXX_FLAGS} -DINPUT_DECK=$1 ${CMAKE_INSTALL_PREFIX}/share/vpic/main.cc ${CMAKE_INSTALL_PREFIX}/share/vpic/wrapper.cc -o $deck.${CMAKE_SYSTEM_NAME} -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/lib -L${CMAKE_INSTALL_PREFIX}/lib -lvpic ${VPIC_CXX_LIBRARIES} -lpthread -ldl
+
+clean_kokkos_path()
+{
+    # $1 = path
+    # $2 = swap ; for $2
+    if grep -q ";" <<< "$1"; then
+      echo $(echo $1 | sed "s/;/ $2/g")
+    else
+      echo ${2}${1}
+    fi
+}
+
+
+KOKKOS_CORE_INCLUDES=$( cat @KOKKOS_CORE_INCLUDES_FILE@ )
+KOKKOS_CONTAINER_INCLUDES=$( cat @KOKKOS_CONTAINER_INCLUDES_FILE@ )
+
+KOKKOS_CORE_LIBS=$KOKKOS_CORE_INCLUDES
+KOKKOS_CONTAINER_LIBS=$KOKKOS_CONTAINER_INCLUDES
+
+echo $KOKKOS_CORE_LIBS
+
+# Add hack to include ../lib and ../lib64, only required for "external" builds
+# If only a single path was passed append the paths
+if ! grep -q ";" <<< "$KOKKOS_CORE_LIBS"; then
+    # We pre append ";" to make the above subsition work when cleaning the path
+    KOKKOS_CORE_LIBS=";${KOKKOS_CORE_LIBS};${KOKKOS_CORE_LIBS}/../lib/"
+    KOKKOS_CORE_LIBS=";${KOKKOS_CORE_LIBS};${KOKKOS_CORE_LIBS}/../lib64/"
+fi
+
+KOKKOS_CORE_INCLUDES=$(clean_kokkos_path $KOKKOS_CORE_INCLUDES -I)
+KOKKOS_CONTAINER_INCLUDES=$(clean_kokkos_path $KOKKOS_CONTAINER_INCLUDES -I)
+
+KOKKOS_CORE_LIBS=$(clean_kokkos_path $KOKKOS_CORE_LIBS -L)
+KOKKOS_CONTAINER_LIBS=$(clean_kokkos_path $KOKKOS_CONTAINER_LIBS -L)
+
+#KOKKOS_LIBS="-l:libkokkoscore.a -l:libkokkoscontainers.a"
+KOKKOS_LIBS="-lkokkoscore -lkokkoscontainers"
+
+echo @CMAKE_CXX_COMPILER@ @VPIC_CPPFLAGS@ @CMAKE_CXX_FLAGS@ -I. -I@CMAKE_SOURCE_DIR@/src @VPIC_CXX_FLAGS@ -DINPUT_DECK=$1 @CMAKE_SOURCE_DIR@/deck/main.cc @CMAKE_SOURCE_DIR@/deck/wrapper.cc -o $deck.@CMAKE_SYSTEM_NAME@ -Wl,-rpath,@CMAKE_BINARY_DIR@ -L@CMAKE_BINARY_DIR@ -lvpic @VPIC_CXX_LIBRARIES@ -lpthread -ldl $KOKKOS_CORE_LIBS $KOKKOS_CONTAINER_LIBS $KOKKOS_CORE_INCLUDES $KOKKOS_CONTAINER_INCLUDES $KOKKOS_LIBS
+
+@CMAKE_CXX_COMPILER@ @VPIC_CPPFLAGS@ @CMAKE_CXX_FLAGS@ -I. -I@CMAKE_INSTALL_PREFIX@/src @VPIC_CXX_FLAGS@ -DINPUT_DECK=$1 @CMAKE_INSTALL_PREFIX@/deck/main.cc @CMAKE_INSTALL_PREFIX@/deck/wrapper.cc -o $deck.@CMAKE_SYSTEM_NAME@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@ -L@CMAKE_INSTALL_PREFIX@ -lvpic @VPIC_CXX_LIBRARIES@ -lpthread -ldl $KOKKOS_CORE_LIBS $KOKKOS_CONTAINER_LIBS $KOKKOS_CORE_INCLUDES $KOKKOS_CONTAINER_INCLUDES $KOKKOS_LIBS

cmake/git_version.h.in

@@ -0,0 +1,8 @@
+#pragma once
+#ifndef VPIC_GIT_VERSION
+#define VPIC_GIT_VERSION
+
+#define GIT_REVISION "@VPIC_GIT_COMMIT_HASH@"
+#define BUILD_TIMESTAMP "@_build_time_stamp@"
+
+#endif