From 13aaeb47155d2d16cbc0a4c3850748f61c745dfe Mon Sep 17 00:00:00 2001 From: Ye Luo Date: Tue, 12 Mar 2019 18:43:48 -0500 Subject: [PATCH] Rename macro ENABLE_CUBLAS to ENABLE_CUDA. --- CMakeLists.txt | 8 ++++---- src/QMCApp/QMCMain.cpp | 4 ++-- src/QMCWaveFunctions/CMakeLists.txt | 10 +++++----- src/QMCWaveFunctions/Fermion/DiracDeterminant.cpp | 2 +- src/QMCWaveFunctions/Fermion/DiracDeterminant.h | 2 +- src/QMCWaveFunctions/Fermion/SlaterDetBuilder.cpp | 4 ++-- src/QMCWaveFunctions/tests/test_dirac_det.cpp | 2 +- src/config.h.cmake.in | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc0f960bd..18f09090d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,7 +140,7 @@ SET(QMC_OMP 1 CACHE BOOL "Enable/disable OpenMP") SET(QMC_COMPLEX 0 CACHE INTEGER "Build for complex binary") SET(PRINT_DEBUG 0 CACHE BOOL "Enable/disable debug printing") SET(QMC_CUDA 0 CACHE BOOL "Build with GPU support through CUDA") -SET(ENABLE_CUBLAS 0 CACHE BOOL "Build with the second generation of GPU support through CUDA") +SET(ENABLE_CUDA 0 CACHE BOOL "Build with the second generation of GPU support through CUDA") SET(ENABLE_SOA 0 CACHE BOOL "Enable/disable SoA optimization") ###################################################################### @@ -652,7 +652,7 @@ ELSE() ENDIF() SET(HAVE_CUDA 0) -IF(QMC_CUDA OR ENABLE_CUBLAS) +IF(QMC_CUDA OR ENABLE_CUDA) IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(CUDA_PROPAGATE_HOST_FLAGS ON) ELSE(CMAKE_CXX_COMPILER_ID MATCHES "Clang") @@ -683,9 +683,9 @@ IF(QMC_CUDA OR ENABLE_CUBLAS) INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS}) set(HAVE_CUDA 1) MESSAGE(" CUDA_NVCC_FLAGS=${CUDA_NVCC_FLAGS}") -ELSE(QMC_CUDA OR ENABLE_CUBLAS) +ELSE(QMC_CUDA OR ENABLE_CUDA) MESSAGE(STATUS "Disabling CUDA") -ENDIF(QMC_CUDA OR ENABLE_CUBLAS) +ENDIF(QMC_CUDA OR ENABLE_CUDA) SET(USE_NVTX_API 0 CACHE BOOL "Enable/disable NVTX regions in CUDA code.") IF(USE_NVTX_API) diff --git a/src/QMCApp/QMCMain.cpp b/src/QMCApp/QMCMain.cpp index b3cfdb75c..a70352eb8 100644 --- a/src/QMCApp/QMCMain.cpp +++ b/src/QMCApp/QMCMain.cpp @@ -38,7 +38,7 @@ #include "QMCDrivers/QMCDriver.h" #include "Message/Communicate.h" #include "Message/OpenMP.h" -#ifdef ENABLE_CUBLAS +#ifdef ENABLE_CUDA #include #endif #include @@ -121,7 +121,7 @@ QMCMain::QMCMain(Communicate* c) app_summary() << std::endl; app_summary().flush(); -#ifdef ENABLE_CUBLAS +#ifdef ENABLE_CUDA // force the initialization of CUDA // This is only a temporal solution and more rigorous intialization of accelerators will replace the current hack cudaFree(0); diff --git a/src/QMCWaveFunctions/CMakeLists.txt b/src/QMCWaveFunctions/CMakeLists.txt index 53fd8e2cd..b5abcbad1 100644 --- a/src/QMCWaveFunctions/CMakeLists.txt +++ b/src/QMCWaveFunctions/CMakeLists.txt @@ -200,9 +200,9 @@ SET(FERMION_SRCS ${FERMION_SRCS} WaveFunctionFactory.cpp ) -IF(ENABLE_CUBLAS) +IF(ENABLE_CUDA) SET(FERMION_SRCS ${FERMION_SRCS} Fermion/delayed_update_helper.cu) -ENDIF(ENABLE_CUBLAS) +ENDIF(ENABLE_CUDA) IF(NOT QMC_COMPLEX AND NOT ENABLE_SOA) SET(FERMION_SRCS ${FERMION_SRCS} @@ -213,11 +213,11 @@ ENDIF(NOT QMC_COMPLEX AND NOT ENABLE_SOA) #################################### # create libqmcwfs #################################### -IF(QMC_CUDA OR ENABLE_CUBLAS) +IF(QMC_CUDA OR ENABLE_CUDA) CUDA_ADD_LIBRARY(qmcwfs ${WFBASE_SRCS} ${JASTROW_SRCS} ${FERMION_SRCS}) -ELSE(QMC_CUDA OR ENABLE_CUBLAS) +ELSE(QMC_CUDA OR ENABLE_CUDA) ADD_LIBRARY(qmcwfs ${WFBASE_SRCS} ${JASTROW_SRCS} ${FERMION_SRCS}) -ENDIF(QMC_CUDA OR ENABLE_CUBLAS) +ENDIF(QMC_CUDA OR ENABLE_CUDA) IF(HAVE_CUDA) CUDA_ADD_CUBLAS_TO_TARGET(qmcwfs) diff --git a/src/QMCWaveFunctions/Fermion/DiracDeterminant.cpp b/src/QMCWaveFunctions/Fermion/DiracDeterminant.cpp index 5e001feba..fc392ff98 100644 --- a/src/QMCWaveFunctions/Fermion/DiracDeterminant.cpp +++ b/src/QMCWaveFunctions/Fermion/DiracDeterminant.cpp @@ -640,7 +640,7 @@ DiracDeterminant::makeCopy(SPOSetPtr spo) const typedef QMCTraits::ValueType ValueType; template class DiracDeterminant>; -#if defined(ENABLE_CUBLAS) +#if defined(ENABLE_CUDA) template class DiracDeterminant>; #endif diff --git a/src/QMCWaveFunctions/Fermion/DiracDeterminant.h b/src/QMCWaveFunctions/Fermion/DiracDeterminant.h index 086093296..72bf1b373 100644 --- a/src/QMCWaveFunctions/Fermion/DiracDeterminant.h +++ b/src/QMCWaveFunctions/Fermion/DiracDeterminant.h @@ -25,7 +25,7 @@ #include "QMCWaveFunctions/Fermion/DiracDeterminantBase.h" #include "QMCWaveFunctions/Fermion/DiracMatrix.h" #include "QMCWaveFunctions/Fermion/DelayedUpdate.h" -#if defined(ENABLE_CUBLAS) +#if defined(ENABLE_CUDA) #include "QMCWaveFunctions/Fermion/DelayedUpdateCUDA.h" #endif diff --git a/src/QMCWaveFunctions/Fermion/SlaterDetBuilder.cpp b/src/QMCWaveFunctions/Fermion/SlaterDetBuilder.cpp index addb32d12..e0f6450dd 100644 --- a/src/QMCWaveFunctions/Fermion/SlaterDetBuilder.cpp +++ b/src/QMCWaveFunctions/Fermion/SlaterDetBuilder.cpp @@ -424,7 +424,7 @@ bool SlaterDetBuilder::putDeterminant(xmlNodePtr cur, int spin_group) // whether to use an optimizable slater determinant std::string optimize("no"); -#if defined(ENABLE_CUBLAS) +#if defined(ENABLE_CUDA) std::string useGPU("yes"); #else std::string useGPU("no"); @@ -541,7 +541,7 @@ bool SlaterDetBuilder::putDeterminant(xmlNodePtr cur, int spin_group) #endif } #endif -#if defined(ENABLE_CUBLAS) +#if defined(ENABLE_CUDA) else if (useGPU == "yes") { app_log() << "Using DiracDeterminant with DelayedUpdateCUDA engine" << std::endl; diff --git a/src/QMCWaveFunctions/tests/test_dirac_det.cpp b/src/QMCWaveFunctions/tests/test_dirac_det.cpp index 77d086dd6..d219fb96d 100644 --- a/src/QMCWaveFunctions/tests/test_dirac_det.cpp +++ b/src/QMCWaveFunctions/tests/test_dirac_det.cpp @@ -30,7 +30,7 @@ namespace qmcplusplus { typedef QMCTraits::ValueType ValueType; -#ifdef ENABLE_CUBLAS +#ifdef ENABLE_CUDA typedef DiracDeterminant> DetType; #else typedef DiracDeterminant> DetType; diff --git a/src/config.h.cmake.in b/src/config.h.cmake.in index dce8e9228..674a3627c 100644 --- a/src/config.h.cmake.in +++ b/src/config.h.cmake.in @@ -166,7 +166,7 @@ #cmakedefine QMC_CUDA @QMC_CUDA@ /* Using CUDA for GPU execution, next generation */ -#cmakedefine ENABLE_CUBLAS @ENABLE_CUBLAS@ +#cmakedefine ENABLE_CUDA @ENABLE_CUDA@ /* Setting base precision for CUDA kernels */ #cmakedefine CUDA_PRECISION @CUDA_PRECISION@