Commit 847dc4a9 authored by gbalduzz's avatar gbalduzz
Browse files

Define magma initialization withouth cuda as a no-op.

parent 33f60d93

CMakeLists.txt

+1 −2
Original line number Diff line number Diff line
@@ -144,11 +144,10 @@ set(DCA_LIBS 
  ${DCA_CONCURRENCY_LIB}

  ${DCA_THREADING_LIBS}

  lapack

  cuda_utils

)



if (DCA_HAVE_CUDA)

  list(APPEND DCA_CUDA_LIBS

    cuda_utils)

  list(APPEND DCA_LIBS

    blas_kernels

    dnfft_kernels

include/dca/linalg/util/util_cublas.hpp

+0 −5
Original line number Diff line number Diff line
@@ -12,11 +12,6 @@ 
#ifndef DCA_LINALG_UTIL_UTIL_CUBLAS_HPP

#define DCA_LINALG_UTIL_UTIL_CUBLAS_HPP



#include <cublas_v2.h>

#include <stdexcept>

#include <string>

#include "dca/linalg/util/error_cuda.hpp"



namespace dca {

namespace linalg {

namespace util {

src/linalg/util/CMakeLists.txt

+3 −0
Original line number Diff line number Diff line
@@ -4,4 +4,7 @@ if(DCA_HAVE_CUDA) 
  add_library(cuda_utils STATIC util_cublas.cpp error_cublas.cpp info_cuda.cpp error_cuda.cpp)

  target_include_directories(cuda_utils PUBLIC ${MAGMA_INCLUDE_DIR};${CUDA_TOOLKIT_INCLUDE})

  target_compile_definitions(cuda_utils PUBLIC DCA_HAVE_CUDA)

else()

  add_library(cuda_utils STATIC util_cublas.cpp)

endif()

src/linalg/util/util_cublas.cpp

+13 −8
Original line number Diff line number Diff line
@@ -10,16 +10,21 @@ 
// This file implements cublas related utilities.



#include "dca/linalg/util/util_cublas.hpp"



#ifdef DCA_HAVE_CUDA

#include <mutex>

#include <cublas_v2.h>

#include <magma.h>

#include "dca/linalg/util/error_cublas.hpp"

#include "dca/linalg/util/handle_functions.hpp"

#endif  // DCA_HAVE_CUDA



namespace dca {

namespace linalg {

namespace util {

// dca::linalg::util::



#ifdef DCA_HAVE_CUDA

int getCublasVersion() {

  int version = 0;

  cublasStatus_t ret = cublasGetVersion(getHandle(0), &version);
@@ -28,13 +33,13 @@ int getCublasVersion() { 
}



void initializeMagma() {

  static bool initialized = false;

  if (!initialized) {

    magma_init();

    initialized = true;

  }

  static std::once_flag flag;

  std::call_once(flag, []() { magma_init(); });

}

#else

void initializeMagma() {}

#endif  // DCA_HAVE_CUDA



}  // util

}  // linalg

}  // dca
 
}  // namespace util

}  // namespace linalg

}  // namespace dca

test/unit/linalg/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -51,6 +51,6 @@ dca_add_gtest(matrixop_complex_gpu_test 


dca_add_gtest(reshapable_matrix_cpu_test GTEST_MAIN)



dca_add_gtest(reshapable_matrix_gpu_test CUDA GTEST_MAIN LIBS)

dca_add_gtest(reshapable_matrix_gpu_test CUDA GTEST_MAIN LIBS cuda_utils)



add_subdirectory(util)