From 2ca58e91d6c1e7629ae12268211a518b266a6433 Mon Sep 17 00:00:00 2001
From: Tiziano Müller <tiziano.mueller@chem.uzh.ch>
Date: Mon, 4 Oct 2021 14:41:49 +0200
Subject: cp2k: bugfix for intel oneapi (#26143)

---
 var/spack/repos/builtin/packages/cp2k/package.py | 41 +++++++++++++++++++++---
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py
index cc6a4881a4..a74ceb6858 100644
--- a/var/spack/repos/builtin/packages/cp2k/package.py
+++ b/var/spack/repos/builtin/packages/cp2k/package.py
@@ -194,6 +194,11 @@ class Cp2k(MakefilePackage, CudaPackage):
 
     conflicts('+cuda', when='cuda_arch=none', msg=cuda_msg)
 
+    # Fix 2- and 3-center integral calls to libint
+    patch("https://github.com/cp2k/cp2k/commit/5eaf864ed2bd21fb1b05a9173bb77a815ad4deda.patch",
+          sha256="18e58ba8fdde5c507bece48ec064f7f2b80e59d1b7cfe6b7a639e5f64f84d43f",
+          when="@8.2")
+
     @property
     def makefile_architecture(self):
         return '{0.architecture}-{0.compiler.name}'.format(self.spec)
@@ -228,6 +233,9 @@ class Cp2k(MakefilePackage, CudaPackage):
         elif '^intel-mkl' in spec:
             fftw = spec['intel-mkl']
             fftw_header_dir = fftw.headers.directories[0] + '/fftw'
+        elif '^intel-oneapi-mkl' in spec:
+            fftw = spec['intel-oneapi-mkl']
+            fftw_header_dir = fftw.headers.directories[0] + '/fftw'
         elif '^intel-parallel-studio+mkl' in spec:
             fftw = spec['intel-parallel-studio']
             fftw_header_dir = '<NOTFOUND>'
@@ -357,7 +365,9 @@ class Cp2k(MakefilePackage, CudaPackage):
         ldflags.append((lapack + blas).search_flags)
         libs.extend([str(x) for x in (fftw.libs, lapack, blas)])
 
-        if '^intel-mkl' in spec or '^intel-parallel-studio+mkl' in spec:
+        if any(p in spec for p in ('^intel-mkl',
+                                   '^intel-parallel-studio+mkl',
+                                   '^intel-oneapi-mkl')):
             cppflags += ['-D__MKL']
         elif '^accelerate' in spec:
             cppflags += ['-D__ACCELERATE']
@@ -375,11 +385,32 @@ class Cp2k(MakefilePackage, CudaPackage):
                 '-D__SCALAPACK'
             ])
 
-            scalapack = spec['scalapack'].libs
-            ldflags.append(scalapack.search_flags)
+            if '^intel-oneapi-mpi' in spec:
+                mpi = [join_path(
+                       spec['intel-oneapi-mpi'].libs.directories[0],
+                       'libmpi.so')]
+            else:
+                mpi = spec['mpi:cxx'].libs
+
+            # while intel-mkl has a mpi variant and adds the scalapack
+            # libs to its libs, intel-oneapi-mkl does not.
+            if '^intel-oneapi-mkl' in spec:
+                mpi_impl = 'openmpi' if '^openmpi' in spec else 'intelmpi'
+                scalapack = [
+                    join_path(
+                        spec['intel-oneapi-mkl'].libs.directories[0],
+                        'libmkl_scalapack_lp64.so'),
+                    join_path(
+                        spec['intel-oneapi-mkl'].libs.directories[0],
+                        'libmkl_blacs_{0}_lp64.so'.format(mpi_impl)
+                    )
+                ]
+            else:
+                scalapack = spec['scalapack'].libs
+                ldflags.append(scalapack.search_flags)
 
             libs.extend(scalapack)
-            libs.extend(spec['mpi:cxx'].libs)
+            libs.extend(mpi)
             libs.extend(self.compiler.stdcxx_libs)
 
             if 'wannier90' in spec:
@@ -606,7 +637,7 @@ class Cp2k(MakefilePackage, CudaPackage):
             mkf.write(fflags('LIBS', libs))
 
             if '%intel' in spec:
-                mkf.write(fflags('LDFLAGS_C', ldflags + ['-nofor_main']))
+                mkf.write(fflags('LDFLAGS_C', ldflags + ['-nofor-main']))
 
             mkf.write('# CP2K-specific flags\n\n')
             mkf.write('GPUVER = {0}\n'.format(gpuver))
-- 
cgit v1.2.3-70-g09d2