Commit cedc1177 authored by gbalduzz's avatar gbalduzz
Browse files

Merge branch 'silence_essl' into gpu_trunk2

parents ab8083e4 461ae3ef

CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ set(DCA_LIBS 
  coarsegraining

  ${DCA_CONCURRENCY_LIB}

  ${DCA_THREADING_LIBS}

  lapack

)



if (DCA_HAVE_CUDA)

build-aux/summit.cmake

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,10 @@ set(DCA_HAVE_LAPACK TRUE CACHE INTERNAL "If set to TRUE, prevents CMake from sea 
# To give ESSL precedence it needs to be specified before NETLIB.

set(LAPACK_LIBRARIES $ENV{OLCF_ESSL_ROOT}/lib64/libessl.so;$ENV{OLCF_NETLIB_LAPACK_ROOT}/lib64/liblapack.so;$ENV{OLCF_NETLIB_LAPACK_ROOT}/lib64/libblas.so CACHE FILEPATH "Libraries to link against to use LAPACK.")



# Set the include directory for the ESSL library.

set(DCA_ESSL_INCLUDES $ENV{OLCF_ESSL_ROOT}/include CACHE PATH "Path to ESSL include directory.")

mark_as_advanced(DCA_ESSL_INCLUDES)



# Use jsrun for executing the tests.

set(TEST_RUNNER "jsrun" CACHE STRING "Command for executing (MPI) programs.")

set(MPIEXEC_NUMPROC_FLAG "-a" CACHE STRING

include/dca/linalg/lapack/silence_lapack.hpp

0 → 100644
+26 −0
Original line number Diff line number Diff line 
// Copyright (C) 2018 ETH Zurich

// Copyright (C) 2018 UT-Battelle, LLC

// All rights reserved.

//

// See LICENSE for terms of usage.

// See CITATION.md for citation guidelines, if DCA++ is used for scientific publications.

//

// Author: Giovanni Balduzzi (gbalduzz@itp.phys.ethz.ch)

//

// This file provides an utility to silence the lapack library warnings.



#ifndef DCA_LINALG_LAPACK_SILENCE_LAPACK_HPP

#define DCA_LINALG_LAPACK_SILENCE_LAPACK_HPP



namespace dca {

namespace linalg {

namespace lapack {

// dca::linalg::lapack::



void silenceLapack();



}  // lapack

}  // linalg

}  // dca



#endif  // DCA_LINALG_LAPACK_SILENCE_LAPACK_HPP

include/dca/linalg/linalg.hpp

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "dca/linalg/lapack/bennet_update.hpp"

#include "dca/linalg/lapack/inverse.hpp"

#include "dca/linalg/lapack/lapack.hpp"

#include "dca/linalg/lapack/silence_lapack.hpp"

#include "dca/linalg/lapack/solve.hpp"



#ifdef DCA_HAVE_CUDA

include/dca/linalg/util/allocators/allocators.hpp

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ struct DefaultAllocator<T, GPU> { 
    T* allocate(std::size_t) {

      throw(std::logic_error("GPU not available."));

    }

    void deallocate(T*& ptr, std::size_t /*n*/ = 0) {}

    void deallocate(T*& /*ptr*/, std::size_t /*n*/ = 0) {}

  };

  using type = UnusedAllocator;

};