Unverified Commit 4791aea2 authored by Peter Doak's avatar Peter Doak Committed by GitHub
Browse files

Merge pull request #279 from PDoakORNL/summit_build_updates 

build from the current standard summit environment
parents 189d0d8d fac2b92e

CMakeLists.txt

+4 −2
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ 
#

# CMake build script for DCA++



cmake_minimum_required(VERSION 3.18)

cmake_minimum_required(VERSION 3.21)

project(DCA++ LANGUAGES C CXX)



cmake_policy(VERSION 3.18)

cmake_policy(VERSION 3.21)



################################################################################

# Always use <PackageName>_ROOT vars to search first
@@ -21,6 +21,8 @@ if(POLICY CMP0074) 
   cmake_policy(SET CMP0074 NEW)

endif()



cmake_policy(SET CMP0056 NEW)



################################################################################

# Disable in-source builds.

if (${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})

build-aux/summit_adios2_build.sh

+1 −2
Original line number Diff line number Diff line 
# run summit_load_modules.sh before running this script.



cmake -DDCA_HAVE_LAPACK=ON -DLAPACK_LIBRARIES="${OLCF_ESSL_ROOT}/lib64/libessl.so;${OLCF_NETLIB_LAPACK_ROOT}/lib64/liblapack.so;${OLCF_NETLIB_LAPACK_ROOT}/lib64/libblas.so" -DDCA_ESSL_INCLUDES=${OLCF_ESSL_ROOT}/include -DDCA_WITH_ADIOS2=1 -DTEST_RUNNER=jsrun -DMPIEXEC_NUMPROC_FLAG="-n" -DMPIEXEC_PREFLAGS="-a 1 -g 1 -c 4" -DSMPIARGS_FLAG_NOMPI="--smpiargs=none" -DDCA_WITH_CUDA=1 -DDCA_WITH_CUDA_AWARE_MPI=1 -DCMAKE_CUDA_ARCHITECTURS=70 -DMAGMA_DIR="/gpfs/alpine/world-shared/cph102/epd/magma_cuda11" -DDCA_WITH_TESTS_FAST=ON -DDCA_WITH_TESTS_EXTENSIVE=ON -DFFTW_INCLUDE_DIR=${OLCF_FFTW_ROOT}/include -DFFTW_LIBRARY=${OLCF_FFTW_ROOT}/lib/libfftw3.so -DCMAKE_PREFIX_PATH=${OLCF_ADIOS2_ROOT} -GNinja ..
 
cmake -DDCA_HAVE_LAPACK=ON -DLAPACK_LIBRARIES="${OLCF_ESSL_ROOT}/lib64/libessl.so;${OLCF_NETLIB_LAPACK_ROOT}/lib64/liblapack.so;${OLCF_NETLIB_LAPACK_ROOT}/lib64/libblas.so" -DDCA_ESSL_INCLUDES=${OLCF_ESSL_ROOT}/include -DDCA_WITH_ADIOS2=1 -DTEST_RUNNER=jsrun -DMPIEXEC_NUMPROC_FLAG="-n" -DMPIEXEC_PREFLAGS="-a 1 -g 1 -c 4" -DSMPIARGS_FLAG_NOMPI="--smpiargs=none" -DDCA_WITH_CUDA=1 -DDCA_WITH_CUDA_AWARE_MPI=1 -DCMAKE_CUDA_ARCHITECTURS=70 -DMAGMA_DIR="${OLCF_MAGMA_ROOT}" -DDCA_WITH_TESTS_FAST=ON -DDCA_WITH_TESTS_EXTENSIVE=ON -DFFTW_INCLUDE_DIR=${OLCF_FFTW_ROOT}/include -DFFTW_LIBRARY=${OLCF_FFTW_ROOT}/lib/libfftw3.so -DCMAKE_PREFIX_PATH=${OLCF_ADIOS2_ROOT} -GNinja ..

build-aux/summit_load_modules.sh

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 


module reset

module load gcc/10.2.0

module load cuda/11.1.1 # ldd shows magma is built with this cuda

module load magma/2.6.1

module load cuda/11.4.2 # ldd shows magma is built with this cuda

module load magma/2.6.2

module load hdf5

module load fftw

module load cmake/3.21.3

cmake/dca_mpi.cmake

+0 −2
Original line number Diff line number Diff line
@@ -28,7 +28,5 @@ else() 
  if (MPI_FOUND)

    set(DCA_HAVE_MPI TRUE CACHE INTERNAL "")

    dca_add_haves_define(DCA_HAVE_MPI)

    link_libraries(${MPI_CXX_LIBRARIES})

    include_directories(${MPI_C_INCLUDE_PATH})

  endif()

endif()