revive doc and build scripts

Author: fnrizzi

CMakeLists.txt

@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.13.0)
+cmake_minimum_required(VERSION 3.16.0)
 project(shaw CXX)
 
 # guard against in-source builds
@@ -19,45 +19,43 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 #==================================
+find_package(yaml-cpp REQUIRED)
+include_directories(${YAML_CPP_INCLUDE_DIR})
+target_link_libraries(${YAML_CPP_LIBRARIES})
+
 find_package(KokkosKernels REQUIRED)
-include_directories(${YAMLCPP_INCLUDE_DIR} ${KOKKOS_INCLUDE_DIR})
-link_directories(${YAMLCPP_LIB_DIR})
-link_libraries(dl yaml-cpp Kokkos::kokkoskernels) # Kokkos::BLAS Kokkos::LAPACK)
+link_libraries(dl yaml-cpp Kokkos::kokkoskernels)
+# Kokkos::BLAS Kokkos::LAPACK)
 
 set(exeName1 shawExe)
-add_executable(${exeName1} ${CMAKE_CURRENT_SOURCE_DIR}/src/kokkos/main_fom.cc)
+add_executable(${exeName1}
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/kokkos/main_fom.cc)
 
 set(exeName2 extractStateFromSnaps)
-add_executable(${exeName2} ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/main_extract_state_from_snaps.cc)
+add_executable(${exeName2}
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/main_extract_state_from_snaps.cc)
 
-# tell CMake to use CTest extension
 enable_testing()
-# add subdir where the unit tests are
 add_subdirectory(tests)
 
 
 
-
 #include_directories(${EIGEN_INCLUDE_DIR} ${YAMLCPP_INCLUDE_DIR} ${KOKKOS_INCLUDE_DIR})
 #link_directories   (${BLAS_LIB_DIR} ${YAMLCPP_LIB_DIR})
 #link_libraries	   (dl ${OMPLINK} yaml-cpp Kokkos::kokkoskernels ${BLASLIBNAME} gfortran)
 #link_directories   (${YAMLCPP_LIB_DIR})
 #link_libraries	   (dl yaml-cpp Kokkos::kokkoskernels) # Kokkos::BLAS Kokkos::LAPACK)
-
-
 # set(exeName compareSnaps)
 # add_executable(${exeName} ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/main_cmp_snaps.cc)
 # target_include_directories(${exeName} PRIVATE ${EIGEN_INCLUDE_DIR})
 # target_compile_definitions(${exeName} PRIVATE SHW_ENABLE_TPL_EIGEN)
-
 # target_compile_options	(${exeName} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-march=native>)
 # set(exeName	shwave_rom)
 # add_executable  (${exeName} ${CMAKE_CURRENT_SOURCE_DIR}/kokkos/main_rom.cc)
 # set(exeName reconstructFomState)
 # add_executable	(${exeName} ${CMAKE_CURRENT_SOURCE_DIR}/tools/main_reconstruct_fom_state.cc)
 # set(exeName reconstructSeismogram)
 # add_executable	(${exeName} ${CMAKE_CURRENT_SOURCE_DIR}/tools/main_reconstruct_seismo.cc)
-
 # set(exeName computeThinSVD)
 # add_executable		(${exeName} ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/main_eigen_svd.cc)
 # target_compile_options	(${exeName} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-march=native>)

README.md

@@ -0,0 +1,158 @@
+#!/usr/bin/env bash
+
+set -e
+
+MYPWD=`pwd`
+
+# where we need to work
+TPLDIR=$1/tpls
+
+kokkosversion=3.5.00
+yamlcppversion=0.7.0
+
+kokkosbackend=$2
+arch=none
+
+
+# --- nothing to addapt below --- #
+
+function buildKokkos(){
+    local arch=$1
+    local backend=$2
+
+    if [[ ${backend} == openmp ]]; then
+	ompBool=On
+    fi
+
+    [[ ! -d ${KOKKOS_BUILD_DIR} ]] && mkdir -p ${KOKKOS_BUILD_DIR}
+    cd ${KOKKOS_BUILD_DIR}
+
+    if [[ ${arch} == none ]]; then
+	cmake -DCMAKE_CXX_COMPILER=${CXX} \
+	      -DCMAKE_BUILD_TYPE="Release" \
+	      -DCMAKE_INSTALL_PREFIX=${KOKKOSPFX} \
+	      -DKokkos_ENABLE_TESTS=Off \
+	      -DKokkos_ENABLE_SERIAL=On \
+	      -DKokkos_ENABLE_OPENMP=${ompBool} \
+	      -DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=Off \
+	      ${KOKKOS_SRC}
+    else
+	cmake -DCMAKE_CXX_COMPILER=${CXX} \
+	      -DCMAKE_BUILD_TYPE="Release" \
+	      -DCMAKE_INSTALL_PREFIX=${KOKKOSPFX} \
+	      -DKokkos_ARCH_${arch}=On \
+	      -DKokkos_ENABLE_TESTS=Off \
+	      -DKokkos_ENABLE_SERIAL=On \
+	      -DKokkos_ENABLE_OPENMP=${ompBool} \
+	      -DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=Off \
+	      ${KOKKOS_SRC}
+    fi
+    make -j4
+    make install
+    cd ..
+}
+
+function buildKokkosKernels(){
+    echo "Kernels using the KokkosPFX= ${KOKKOSPFX}"
+    local arch=$1
+
+    [[ ! -d ${KOKKOSKER_BUILD_DIR} ]] && mkdir -p ${KOKKOSKER_BUILD_DIR}
+    cd ${KOKKOSKER_BUILD_DIR} && rm -rf CMakeCache* src/*
+
+    cmake \
+	-DCMAKE_VERBOSE_MAKEFILE=On \
+	-DCMAKE_CXX_COMPILER=${CXX} \
+	-DCMAKE_BUILD_TYPE="Release" \
+	-DCMAKE_INSTALL_PREFIX=${KOKKOSKERPFX} \
+	\
+	-DKokkosKernels_ENABLE_TPL_LAPACK=On \
+	-DKokkosKernels_ENABLE_TPL_BLAS=On \
+	\
+	-DKokkosKernels_INST_DOUBLE=On \
+	-DKokkosKernels_INST_LAYOUTRIGHT=On \
+	-DKokkosKernels_INST_LAYOUTLEFT=On \
+	-DKokkosKernels_INST_ORDINAL_INT=Off \
+	-DKokkosKernels_INST_ORDINAL_INT64_T=On \
+	-DKokkosKernels_INST_OFFSET_INT=Off \
+	-DKokkosKernels_INST_OFFSET_SIZE_T=On \
+	\
+	-DKokkosKernels_ENABLE_TESTS=Off \
+	-DKokkos_ROOT=${KOKKOSPFX} \
+	${KOKKOS_KER_SRC}
+
+    make -j16
+    make install
+    cd ..
+}
+
+function doKokkos
+{
+    cd ${TPLDIR}
+
+    if [ ! -f kokkos-${kokkosversion}.tar.gz ]; then
+	wget https://github.com/kokkos/kokkos/archive/refs/tags/${kokkosversion}.tar.gz
+	mv ${kokkosversion}.tar.gz kokkos-${kokkosversion}.tar.gz
+    fi
+    if [ ! -d kokkos-${kokkosversion} ]; then
+	tar zxf kokkos-${kokkosversion}.tar.gz
+    fi
+
+    if [ ! -f kokkos-kernels-${kokkosversion}.tar.gz ]; then
+	wget https://github.com/kokkos/kokkos-kernels/archive/refs/tags/${kokkosversion}.tar.gz
+	mv ${kokkosversion}.tar.gz kokkos-kernels-${kokkosversion}.tar.gz
+    fi
+    if [ ! -d kokkos-kernels-${kokkosversion} ]; then
+	tar zxf kokkos-kernels-${kokkosversion}.tar.gz
+    fi
+
+    # sources for kokkos
+    KOKKOS_SRC=${TPLDIR}/kokkos-${kokkosversion}
+    KOKKOS_KER_SRC=${TPLDIR}/kokkos-kernels-${kokkosversion}
+    # build dirs
+    KOKKOS_BUILD_DIR=${TPLDIR}/kokkos-build
+    KOKKOSKER_BUILD_DIR=${TPLDIR}/kokkos-kernels-build
+    # prefixes
+    KOKKOSPFX=${TPLDIR}/kokkos-install
+    KOKKOSKERPFX=${TPLDIR}/kokkos-kernels-install
+
+    buildKokkos ${arch} ${kokkosbackend}
+    buildKokkosKernels ${arch} ${kokkosbackend}
+}
+
+function doYamlCpp()
+{
+    cd ${TPLDIR}
+
+    VNAME=yaml-cpp-${yamlcppversion}
+    TARNAME=${VNAME}.tar.gz
+    UNPACKNAME=yaml-cpp-yaml-cpp-${yamlcppversion}
+    LINK=https://github.com/jbeder/yaml-cpp/archive/${TARNAME}
+
+    if [ ! -f ${TARNAME} ]; then
+	wget ${LINK}
+    fi
+    if [ ! -d ${UNPACKNAME} ]; then
+	tar zxf ${TARNAME}
+    fi
+
+    YAMLCPPPFX=${TPLDIR}/yamlcpp-install
+    YAMLCPPBUILD=${TPLDIR}/yamlcpp-build
+
+    if [ ! -d ${YAMLCPPBUILD} ]; then
+	mkdir ${YAMLCPPBUILD} && cd ${YAMLCPPBUILD}
+	cmake -DCMAKE_INSTALL_PREFIX=${YAMLCPPPFX} \
+     	      -DYAML_CPP_BUILD_TESTS=OFF \
+	      -DCMAKE_CXX_COMPILER=${CXX} \
+	      ../${UNPACKNAME}
+	make -j4 install
+    fi
+}
+
+
+[[ ! -d ${TPLDIR} ]] && mkdir -p ${TPLDIR}
+cd ${TPLDIR}
+
+doKokkos
+doYamlCpp
+
+cd ${MYPWD}

bash_scripts/build_tpls.sh

@@ -55,12 +55,7 @@ function buildKokkosKernels(){
 	-DCMAKE_INSTALL_PREFIX=${KOKKOSKERPFX} \
 	\
 	-DKokkosKernels_ENABLE_TPL_LAPACK=On \
-	-DKokkosKernels_LAPACK_ROOT=${LAPACK_ROOT} \
-	-DKokkosKernels_LAPACK_LIBRARIES="${LAPACKLIBNAME}" \
-	\
 	-DKokkosKernels_ENABLE_TPL_BLAS=On \
-	-DKokkosKernels_BLAS_ROOT=${BLAS_ROOT} \
-	-DKokkosKernels_BLAS_LIBRARIES="${BLASLIBNAME}" \
 	\
 	-DKokkosKernels_INST_DOUBLE=On \
 	-DKokkosKernels_INST_LAYOUTRIGHT=On \
@@ -80,21 +75,23 @@ function buildKokkosKernels(){
 }
 
 MYPWD=`pwd`
-kokkosver=3.3.01
+kokkosver=3.5.00
 
 # create dir
 [[ ! -d kokkos ]] && mkdir kokkos
 cd kokkos
 
 if [ ! -f kokkos-${kokkosver}.tar.gz ]; then
-    cp ${ESWSRCDIR}/tpls/kokkos-${kokkosver}.tar.gz .
+    wget https://github.com/kokkos/kokkos/archive/refs/tags/${kokkosver}.tar.gz
+    mv ${kokkosver}.tar.gz kokkos-${kokkosver}.tar.gz
 fi
 if [ ! -d kokkos-${kokkosver} ]; then
     tar zxf kokkos-${kokkosver}.tar.gz
 fi
 
 if [ ! -f kokkos-kernels-${kokkosver}.tar.gz ]; then
-    cp ${ESWSRCDIR}/tpls/kokkos-kernels-${kokkosver}.tar.gz .
+    wget https://github.com/kokkos/kokkos-kernels/archive/refs/tags/${kokkosver}.tar.gz
+    mv ${kokkosver}.tar.gz kokkos-kernels-${kokkosver}.tar.gz
 fi
 if [ ! -d kokkos-kernels-${kokkosver} ]; then
     tar zxf kokkos-kernels-${kokkosver}.tar.gz
@@ -105,7 +102,17 @@ KOKKOS_KER_SRC=${MYPWD}/kokkos/kokkos-kernels-${kokkosver}
 KOKKOS_BUILD_DIR=${MYPWD}/kokkos/kokkos_build
 KOKKOSKER_BUILD_DIR=${MYPWD}/kokkos/kokkos_kernels_build
 
+KOKKOSPFX=${MYPWD}/kokkos/install-kokkos
+KOKKOSKERPFX=${MYPWD}/kokkos/install-kokkos-kernels
+
 buildKokkos none $1
 buildKokkosKernels none $1
 
 cd ${MYPWD}
+
+
+
+#-DKokkosKernels_LAPACK_ROOT=${LAPACK_ROOT} \
+#-DKokkosKernels_LAPACK_LIBRARIES="${LAPACKLIBNAME}" \
+#-DKokkosKernels_BLAS_ROOT=${BLAS_ROOT} \
+#-DKokkosKernels_BLAS_LIBRARIES="${BLASLIBNAME}" \

bash_scripts/build_kokkos_and_kernels.sh renamed to bash_scripts/deprecated/build_kokkos_and_kernels.sh

@@ -0,0 +1,4 @@
+# Sphinx build info version 1
+# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
+config: deb7f79a94a5c95ee37735dba4bcbf81
+tags: 645f666f9bcd5a90fca523b33c5a78b7