scnc
/
quantum-espresso
mirror of https://gitlab.com/QEF/q-e.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace __OPENACC preprocessor flag with __CUF_AND_ACC

This commit is contained in:
Pietro Delugas 2022-01-12 22:18:40 +01:00 committed by Pietro Delugas
parent 6df6fd13f9
commit 30a6e6d77d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CPV/src/gram.f90
View File

@ -79,7 +79,7 @@ DEV_ACC end kernels
END IF
!
IF( nbgrp_im1 > 0 .AND. ngw > 0 ) THEN
#if defined (__OPENACC)
#if defined (__CUF_AND_ACC)
DEV_ACC host_data use_device(cp_bgrp, csc, ctmp)
CALL mydgemv( 'N', 2*ngw, nbgrp_im1, mone, cp_bgrp(1,iupdwn_bgrp(iss)), 2*ngwx, csc, 1, one, ctmp, 1 )
DEV_ACC end host_data
@ -175,7 +175,7 @@ CONTAINS
REAL(DP), EXTERNAL :: myddot
!
DEV_ACC data present(bec, cp, tvanp,ofsbeta, nh, ityp, qq_nt)
#if defined(__OPENACC)
#if defined(__CUF_AND_ACC)
DEV_ACC host_data use_device(cp)
rsum = 2.d0 * myddot(2*ngw,cp(1,i),1,cp(1,i),1)
DEV_ACC end host_data
@ -278,7 +278,7 @@ DEV_ACC end host_data
kmax_bgrp = kmax_bgrp - iupdwn_bgrp(iss) + 1
IF( kmax_bgrp > 0 .AND. ngw > 0 ) THEN
#if defined(__OPENACC)
#if defined(__CUF_AND_ACC)
DEV_ACC host_data use_device(cp_bgrp, cp_tmp, csc2)
CALL mydgemv( 'T', 2*ngw, kmax_bgrp, 1.0d0, cp_bgrp(1,iupdwn_bgrp(iss)), 2*ngwx, cp_tmp, 1, 0.0d0, csc2, 1 )
DEV_ACC end host_data
@ -419,7 +419,7 @@ DEV_ACC serial present(ibgrp_g2l, csc)
DEV_ACC end serial
IF( nk > 0 .AND. ngw > 0 ) THEN
#if defined (__OPENACC)
#if defined (__CUF_AND_ACC)
DEV_ACC data copyin(bec_bgrp, csc) copyout(bec_tmp)
DEV_ACC host_data use_device(bec_bgrp, csc, bec_tmp)
CALL mydgemv( 'N', nkbx, nk, -1.0d0, bec_bgrp(1,iupdwn_bgrp(iss)), nkbx, csc, 1, 0.0d0, bec_tmp, 1 )

2
CPV/src/vofrho.f90
View File

@ -66,7 +66,7 @@ SUBROUTINE vofrho_x( nfi, rhor, drhor, rhog, drhog, rhos, rhoc, tfirst, &
USE fft_helper_subroutines
USE plugin_variables, ONLY: plugin_etot
#if defined(__OPENACC)
#if defined(__CUF_AND_ACC)
USE cublas
#endif

8
include/cpv_device_macros.h
View File

@ -1,9 +1,9 @@
#if defined (_OPENACC)
#ifndef __OPENACC
#define __OPENACC
#if defined (_OPENACC) && defined (__CUDA)
#ifndef __CUF_AND_ACC
#define __CUF_AND_ACC
#endif
#endif
#if defined (__OPENACC)
#if defined (__CUF_AND_ACC)
#define DEV_ACC !$acc
#define DEV_OMP !!!
#define START_WSHARE DEV_ACC kernels