summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPramod S Kumbhar <pramod.r.s.kumbhar@gmail.com>2017-09-01 20:14:54 +0200
committerAdam J. Stewart <ajstewart426@gmail.com>2017-09-01 13:14:54 -0500
commit2aed82c2c294df1fb7df1130537365db7d33699a (patch)
tree30591bcaae1e8fb79fd1b09da6e73fcc550d1d73
parent5342ecf364e633960e84ca021ef44f1274e9938c (diff)
downloadspack-2aed82c2c294df1fb7df1130537365db7d33699a.tar.gz
spack-2aed82c2c294df1fb7df1130537365db7d33699a.tar.bz2
spack-2aed82c2c294df1fb7df1130537365db7d33699a.tar.xz
spack-2aed82c2c294df1fb7df1130537365db7d33699a.zip
Fix osu-micro-benchmarks build (#5255)
* Fix osu-micro-benchmarks build Changed hardcoded mpi wrapper names Changed Package to AutotoolsPackage * remove extra prefix
-rw-r--r--var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py15
1 files changed, 6 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py b/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py
index f6d49d74e7..f32262f240 100644
--- a/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py
+++ b/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py
@@ -26,7 +26,7 @@ from spack import *
import sys
-class OsuMicroBenchmarks(Package):
+class OsuMicroBenchmarks(AutotoolsPackage):
"""The Ohio MicroBenchmark suite is a collection of independent MPI
message passing performance microbenchmarks developed and written at
The Ohio State University. It includes traditional benchmarks and
@@ -43,11 +43,11 @@ class OsuMicroBenchmarks(Package):
depends_on('mpi')
depends_on('cuda', when='+cuda')
- def install(self, spec, prefix):
+ def configure_args(self):
+ spec = self.spec
config_args = [
- 'CC=%s' % spec['mpi'].prefix.bin + '/mpicc',
- 'CXX=%s' % spec['mpi'].prefix.bin + '/mpicxx',
- '--prefix=%s' % prefix
+ 'CC=%s' % spec['mpi'].mpicc,
+ 'CXX=%s' % spec['mpi'].mpicxx
]
if '+cuda' in spec:
@@ -60,7 +60,4 @@ class OsuMicroBenchmarks(Package):
if not sys.platform == 'darwin':
config_args.append('LDFLAGS=-lrt')
- configure(*config_args)
-
- make()
- make('install')
+ return config_args