From ce714b564166d58eed73e93cc356a39d3a6913ee Mon Sep 17 00:00:00 2001
From: Denis Davydov <davydden@gmail.com>
Date: Tue, 18 Apr 2017 18:50:10 +0200
Subject: ocotpus and arpack-ng: fix arpack bug and add libs to arpack-ng
 (#3875)

* ocotpus and arpack-ng: fix arpack bug and add libs to arpack-ng

also rename the variant to be consistent with other packages

* fix a bug

* flake8
---
 .../repos/builtin/packages/arpack-ng/package.py    | 15 +++++++++++++-
 .../repos/builtin/packages/octopus/package.py      | 23 ++++++++++++----------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/var/spack/repos/builtin/packages/arpack-ng/package.py b/var/spack/repos/builtin/packages/arpack-ng/package.py
index 1168d4623c..ebaeb1da1d 100644
--- a/var/spack/repos/builtin/packages/arpack-ng/package.py
+++ b/var/spack/repos/builtin/packages/arpack-ng/package.py
@@ -80,6 +80,19 @@ class ArpackNg(Package):
 
     depends_on('mpi', when='+mpi')
 
+    @property
+    def libs(self):
+        # TODO: do we need spec['arpack-ng:parallel'].libs ?
+        # query_parameters = self.spec.last_query.extra_parameters
+        libraries = ['libarpack']
+
+        if '+mpi' in self.spec:
+            libraries = ['libparpack'] + libraries
+
+        return find_libraries(
+            libraries, root=self.prefix, shared=True, recurse=True
+        )
+
     @when('@3.4.0:')
     def install(self, spec, prefix):
 
@@ -114,7 +127,7 @@ class ArpackNg(Package):
             make('test')
         make('install')
 
-    @when('@3.3.0')
+    @when('@3.3.0')  # noqa
     def install(self, spec, prefix):
         # Apparently autotools are not bootstrapped
         which('libtoolize')()
diff --git a/var/spack/repos/builtin/packages/octopus/package.py b/var/spack/repos/builtin/packages/octopus/package.py
index 8999b081e3..14255a0b19 100644
--- a/var/spack/repos/builtin/packages/octopus/package.py
+++ b/var/spack/repos/builtin/packages/octopus/package.py
@@ -43,8 +43,8 @@ class Octopus(Package):
             description='Compile with ParMETIS')
     variant('netcdf', default=False,
             description='Compile with Netcdf')
-    variant('arpack-ng', default=False,
-            description='Compile with ARPACK-ng')
+    variant('arpack', default=False,
+            description='Compile with ARPACK')
 
     depends_on('blas')
     depends_on('gsl')
@@ -56,15 +56,13 @@ class Octopus(Package):
     depends_on('parmetis', when='+parmetis')
     depends_on('scalapack', when='+scalapack')
     depends_on('netcdf-fortran', when='+netcdf')
-    depends_on('arpack-ng', when='+arpack-ng')
+    depends_on('arpack-ng', when='+arpack')
 
     # optional dependencies:
     # TODO: parmetis, etsf-io, sparskit,
     # feast, libfm, pfft, isf, pnfft
 
     def install(self, spec, prefix):
-        arpack = find_libraries('libarpack', root=spec[
-                                'arpack-ng'].prefix.lib, shared=True)
         lapack = spec['lapack'].libs
         blas = spec['blas'].libs
         args = []
@@ -93,20 +91,25 @@ class Octopus(Package):
                 '--with-netcdf-include=%s' %
                 spec['netcdf-fortran'].prefix.include,
             ])
-        if '+arpack-ng' in spec:
+        if '+arpack' in spec:
+            arpack_libs = spec['arpack-ng'].libs.joined()
             args.extend([
-                '--with-arpack={0}'.format(arpack.joined()),
+                '--with-arpack={0}'.format(arpack_libs),
             ])
+            if '+mpi' in spec['arpack-ng']:
+                args.extend([
+                    '--with-parpack={0}'.format(arpack_libs),
+                ])
+
         if '+scalapack' in spec:
             args.extend([
                 '--with-blacs=%s' % spec['scalapack'].libs,
-                '--with-scalapack=%s' % spec['scalapack'].libs,
+                '--with-scalapack=%s' % spec['scalapack'].libs
             ])
+
             # --with-etsf-io-prefix=
             # --with-sparskit=${prefix}/lib/libskit.a
             # --with-pfft-prefix=${prefix} --with-mpifftw-prefix=${prefix}
-            # --with-parpack=${prefix}/lib/libparpack.dylib
-            # --with-parmetis-prefix=${prefix}
             # --with-berkeleygw-prefix=${prefix}
 
         # When preprocessor expands macros (i.e. CFLAGS) defined as quoted
-- 
cgit v1.2.3-70-g09d2