Remove unused __ACC macro

cp2k · May 13, 2021 · 7aaf9f9 · 7aaf9f9
1 parent ec5a166
commit 7aaf9f9
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 10 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -179,7 +179,6 @@ the FFTW3 threading library libfftw3_threads (or libfftw3_omp) is required.
 
 - Specify NVCC (e.g. `NVCC = nvcc`) and
   NVFLAGS (e.g. `NVFLAGS = -O3 -g -w --std=c++11`) variables.
-- `-D__ACC` needed to enable accelerator support.
 - Use the `-D__DBCSR_ACC` to enable accelerator support for matrix multiplications.
 - Add `-lstdc++ -lcudart -lnvrtc -lcuda -lcublas` to LIBS.
 - Specify the GPU type (e.g. `GPUVER   = P100`),

diff --git a/arch/CRAY-XC50_gnu.psmp b/arch/CRAY-XC50_gnu.psmp
@@ -49,8 +49,7 @@ SPGLIB_LIB  = $(GNU_PATH)/spglib/1.16.0/lib
 CFLAGS      = -O3 -fopenmp -fopenmp-simd -ftree-vectorize -funroll-loops -g
 CXXFLAGS    = $(CFLAGS) -std=c++11 # -D__CUDA
 
-DFLAGS      = -D__ACC
-DFLAGS     += -D__DBCSR_ACC
+DFLAGS      = -D__DBCSR_ACC
 DFLAGS     += -D__ELPA
 DFLAGS     += -D__FFTW3
 #DFLAGS     += -D__GRID_CUDA

diff --git a/arch/Linux-x86-64-gfortran.warn b/arch/Linux-x86-64-gfortran.warn
@@ -43,7 +43,7 @@ WFLAGS     = -pedantic\
 #            -Wuse-without-only
 
 
-DFLAGS   = -D__LIBINT -D__FFTW3 -D__LIBXC2 -D__ACC -D__DBCSR_ACC -D__PW_CUDA -D__parallel -D__SCALAPACK -D__LIBPEXSI -D__MPI_VERSION=3
+DFLAGS   = -D__LIBINT -D__FFTW3 -D__LIBXC -D__DBCSR_ACC -D__PW_CUDA -D__parallel -D__SCALAPACK -D__LIBPEXSI -D__MPI_VERSION=3
 FCFLAGS  = -fopenmp -I$(CP2KINSTALLDIR)/include -std=f2008 -fimplicit-none -ffree-form -fno-omit-frame-pointer -g -O1 -O3 -march=native $(PROFOPT) $(DFLAGS) $(WFLAGS)
 LDFLAGS  = -L$(CP2KINSTALLDIR)/lib/ -L/usr/local/cuda/lib64 $(FCFLAGS)
 NVFLAGS  = $(DFLAGS) -g -O2 -arch sm_35 -arch sm_35 -Xcompiler='-fopenmp' --std=c++11

diff --git a/arch/Linux-x86-64-gfortran_opencl_nvidia.sopt b/arch/Linux-x86-64-gfortran_opencl_nvidia.sopt
@@ -32,7 +32,7 @@ AR       = ar -r
 
 # FLAG's ###############################################################
 DFLAGS   = -D__FFTW3 \
-           -D__ACC -D__DBCSR_ACC -D__OPENCL \
+           -D__DBCSR_ACC -D__OPENCL \
            -D__LIBXC2 \
            -D__LIBINT \
            -D__USE_CP2K_TRACE \

diff --git a/src/cp2k_info.F b/src/cp2k_info.F
@@ -131,9 +131,6 @@ FUNCTION cp2k_flags() RESULT(flags)
       flags = TRIM(flags)//" quip"
 #endif
 
-#if defined(__ACC)
-      flags = TRIM(flags)//" acc"
-#endif
 #if defined(__PW_CUDA)
       flags = TRIM(flags)//" pw_cuda"
 #endif

diff --git a/tools/autotools/configure.ac b/tools/autotools/configure.ac
@@ -117,7 +117,7 @@ SECTION_TITLE([GPU support])
 dnl check for cuda support
 CUDA_DFLAGS=""
 ACX_CUDA([options="$options cuda"
-          CUDA_DFLAGS="-D__ACC -D__DBCSR_ACC -D__PW_CUDA"], [])
+          CUDA_DFLAGS="-D__DBCSR_ACC -D__PW_CUDA"], [])
 AC_SUBST(GPUVER)
 AC_SUBST(CUDA_DFLAGS)
 

diff --git a/tools/toolchain/scripts/generate_arch_files.sh b/tools/toolchain/scripts/generate_arch_files.sh
@@ -107,7 +107,7 @@ LIBS="${CP_LIBS} -lstdc++"
 
 # CUDA handling
 CUDA_LIBS="-lcudart -lnvrtc -lcuda -lcufft -lcublas -lrt IF_DEBUG(-lnvToolsExt|)"
-CUDA_DFLAGS="-D__GRID_CUDA -D__ACC -D__DBCSR_ACC -D__PW_CUDA IF_DEBUG(-D__CUDA_PROFILING|)"
+CUDA_DFLAGS="-D__GRID_CUDA -D__DBCSR_ACC -D__PW_CUDA IF_DEBUG(-D__CUDA_PROFILING|)"
 if [ "${ENABLE_CUDA}" = __TRUE__ ] && [ "${GPUVER}" != no ]; then
   LIBS="${LIBS} IF_CUDA(${CUDA_LIBS}|)"
   DFLAGS="IF_CUDA(${CUDA_DFLAGS}|) ${DFLAGS}"