From 4919eac5d1316abf31bd588f07e35ed3d8df8858 Mon Sep 17 00:00:00 2001 From: Scott McMillan Date: Fri, 16 Apr 2021 17:43:10 -0500 Subject: Update VASP package for NVIDIA compilers (#23020) Co-authored-by: Scott McMillan --- var/spack/repos/builtin/packages/vasp/package.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/var/spack/repos/builtin/packages/vasp/package.py b/var/spack/repos/builtin/packages/vasp/package.py index 8c30ab71f9..065cd09415 100644 --- a/var/spack/repos/builtin/packages/vasp/package.py +++ b/var/spack/repos/builtin/packages/vasp/package.py @@ -58,6 +58,7 @@ class Vasp(MakefilePackage): make_include = join_path('arch', 'makefile.include.linux_gnu') elif '%nvhpc' in spec: make_include = join_path('arch', 'makefile.include.linux_pgi') + filter_file('-pgc++libs', '-c++libs', make_include, string=True) filter_file('pgcc', spack_cc, make_include) filter_file('pgc++', spack_cxx, make_include, string=True) filter_file('pgfortran', spack_fc, make_include) @@ -125,12 +126,17 @@ class Vasp(MakefilePackage): fflags = [] if '%gcc' in spec or '%intel' in spec: fflags.append('-w') + elif '%nvhpc' in spec: + fflags.extend(['-Mnoupcase', '-Mbackslash', '-Mlarge_arrays']) spack_env.set('BLAS', spec['blas'].libs.ld_flags) spack_env.set('LAPACK', spec['lapack'].libs.ld_flags) spack_env.set('FFTW', spec['fftw'].prefix) spack_env.set('MPI_INC', spec['mpi'].prefix.include) + if '%nvhpc' in spec: + spack_env.set('QD', spec['qd'].prefix) + if '+scalapack' in spec: cpp_options.append('-DscaLAPACK') spack_env.set('SCALAPACK', spec['netlib-scalapack'].libs.ld_flags) -- cgit v1.2.3-70-g09d2