Commit 7603179b authored by gbalduzz's avatar gbalduzz
Browse files

Use intel library on Daint and compile papi test only if papi is used.

parent f0a4a47f

build-aux/daint_gpu.cmake

+5 −0
Original line number Diff line number Diff line
@@ -19,3 +19,8 @@ option(DCA_WITH_CUDA "Enable GPU support." ON) 
# MAGMA has been installed with EasyBuild.

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')

build-aux/daint_gpu_load_modules.sh

+4 −1
Original line number Diff line number Diff line
@@ -8,7 +8,10 @@ module load cudatoolkit 
module load cray-mpich

module load cray-hdf5

module load cray-fftw

module load papi-wrap



# 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/unit/profiling/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line 


find_library(PAPI_LIB papi)

if(PAPI_LIB)

if(PAPI_LIB AND DCA_PROFILER EQUAL "PAPI")

    dca_add_gtest(papi_profiler_test GTEST_MAIN LIBS json profiling)

endif()