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

Configure for NVHPC v19.10 still works after small fixes

This commit is contained in:
Paolo Giannozzi 2022-02-01 14:10:40 +01:00
parent 050c06d057
commit 5d37543a20
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
install/configure vendored
View File

@ -4327,8 +4327,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
runtime_major_version=`echo $with_cuda_runtime | cut -d. -f1`
runtime_minor_version=`echo $with_cuda_runtime | cut -d. -f2`
if test "$runtime_major_version" -lt 10 ||
( test "$runtime_major_version" -eq 10 &&
test "$runtime_minor_version" -lt 1 ) ; then
(test "$runtime_major_version" -eq 10 && test "$runtime_minor_version" -lt 1 )
then
# CUDA toolkit v < 10.1: new solver not available
cuda_fflags="$cuda_fflags \$(MOD_FLAG)\$(TOPDIR)/EIGENSOLVER_GPU/lib_eigsolve"
cuda_extlibs="$cuda_extlibs eigensolver"
@ -4338,10 +4338,14 @@ $as_echo "$as_me: WARNING: Using legacy custom solver." >&2;}
else
try_dflags="$try_dflags -D__USE_CUSOLVER"
fi
# BEEF code no longer works with v.19.10 and earlier
if test "$f90_major_version" -lt 20; then
try_dflags="$try_dflags -D__NOBEEF"
fi
# -----------------------------------------
# C flags - not sure whether they are suitable for old version as well
# C flags
# -----------------------------------------
cuda_cflags=" -I$with_cuda/include -gpu=cc$with_cuda_cc,cuda$with_cuda_runtime"
cuda_cflags=" -I$with_cuda/include $mMcuda=cc$with_cuda_cc,cuda$with_cuda_runtime"
ldflags="$ldflags $mMcuda=cc$with_cuda_cc,cuda$with_cuda_runtime"
gpu_arch="$with_cuda_cc"
cuda_runtime="$with_cuda_runtime"

10
install/m4/x_ac_qe_cuda.m4
View File

@ -93,7 +93,7 @@ then
runtime_major_version=`echo $with_cuda_runtime | cut -d. -f1`
runtime_minor_version=`echo $with_cuda_runtime | cut -d. -f2`
if test "$runtime_major_version" -lt 10 ||
( "$runtime_major_version" -eq 10 && "$runtime_minor_version" -lt 1 )
(test "$runtime_major_version" -eq 10 && test "$runtime_minor_version" -lt 1 )
then
# CUDA toolkit v < 10.1: new solver not available
cuda_fflags="$cuda_fflags \$(MOD_FLAG)\$(TOPDIR)/EIGENSOLVER_GPU/lib_eigsolve"
@ -103,10 +103,14 @@ then
else
try_dflags="$try_dflags -D__USE_CUSOLVER"
fi
# BEEF code no longer works with v.19.10 and earlier
if test "$f90_major_version" -lt 20; then
try_dflags="$try_dflags -D__NOBEEF"
fi
# -----------------------------------------
# C flags - not sure whether they are suitable for old version as well
# C flags
# -----------------------------------------
cuda_cflags=" -I$with_cuda/include -gpu=cc$with_cuda_cc,cuda$with_cuda_runtime"
cuda_cflags=" -I$with_cuda/include $mMcuda=cc$with_cuda_cc,cuda$with_cuda_runtime"
ldflags="$ldflags $mMcuda=cc$with_cuda_cc,cuda$with_cuda_runtime"
gpu_arch="$with_cuda_cc"
cuda_runtime="$with_cuda_runtime"