From 2aed82c2c294df1fb7df1130537365db7d33699a Mon Sep 17 00:00:00 2001 From: Pramod S Kumbhar Date: Fri, 1 Sep 2017 20:14:54 +0200 Subject: Fix osu-micro-benchmarks build (#5255) * Fix osu-micro-benchmarks build Changed hardcoded mpi wrapper names Changed Package to AutotoolsPackage * remove extra prefix --- .../builtin/packages/osu-micro-benchmarks/package.py | 15 ++++++--------- 1 file 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 -- cgit v1.2.3-70-g09d2