Unverified Commit 15b30a2c authored by Peter Doak's avatar Peter Doak Committed by GitHub
Browse files

Merge pull request #220 from gbalduzz/fix_daint_build 

Fix daint build
parents 8c956625 3b3fdd25

build-aux/daint_gpu.cmake

+5 −1
Original line number Diff line number Diff line
@@ -17,5 +17,9 @@ option(DCA_WITH_CUDA "Enable GPU support." ON) 


# For the GPU support we also need MAGMA.

# MAGMA has been installed with EasyBuild.

set(MAGMA_DIR $ENV{EBROOTMAGMA} CACHE PATH

set(MAGMA_DIR $ENV{MAGMAROOT} CACHE PATH

  "Path to the MAGMA installation directory. Hint for CMake to find MAGMA.")





# Intel MKL flags

set(CMAKE_EXE_LINKER_FLAGS '-L${MKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl' CACHE INTERNAL "" FORCE)

build-aux/daint_gpu_load_modules.sh

0 → 100644
+17 −0
Original line number Diff line number Diff line 
#echo "Clearing modules and loading DCA++ modules"

#module purge



module load daint-gpu

module swich PrgEnv-cray PrgEnv-gnu



module load cudatoolkit

module load cray-mpich

module load cray-hdf5

module load cray-fftw



# Use intel linear algebra libraries

module unload cray-libsci/*

module load intel



export MAGMAROOT=/project/s299/easybuild/daint/haswell/software/magma/2.5.3-gcc-8.3-cuda-10.2

export PATH=/project/s299/easybuild/daint/haswell/software/cmake/cmake-3.18.2/bin/:${PATH}

src/profiling/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
add_library(profiling STATIC events/time.cpp)



find_library(PAPI_LIB papi)

if(PAPI_LIB)

if(PAPI_LIB AND DCA_PROFILER EQUAL "PAPI")

    add_library(papi_profiling STATIC events/papi_and_time_event.cpp)

    target_link_libraries(papi_profiling PUBLIC papi)

    target_link_libraries(profiling PUBLIC papi_profiling)

test/integration/cluster_solver/ss_ct_hyb/CMakeLists.txt

+1 −2
Original line number Diff line number Diff line 
set(TEST_INCLUDES )

set(TEST_LIBRARIES ${DCA_LIBS} ${DCA_CUDA_LIBS} statistical_testing)

set(TEST_LIBRARIES ${DCA_LIBS} ${DCA_CUDA_LIBS})



dca_add_gtest(NiO_no_change_test

    GTEST_MAIN

    EXTENSIVE

    MPI MPI_NUMPROC 2

    INCLUDE_DIRS ${DCA_INCLUDE_DIRS};${PROJECT_SOURCE_DIR}