diff options
| author | G-Ragghianti <33492707+G-Ragghianti@users.noreply.github.com> | 2021-07-13 17:50:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-13 14:50:15 -0700 |
| commit | 819f288587e53c1e5a8e083d4c853cfcd3e35ec0 (patch) | |
| tree | 3545a0496a0ae5989b3df6fa2118b23fc3033489 /var | |
| parent | 8ccdcf2e843ec02a1af3d4cf72c5c68236f61e36 (diff) | |
| download | spack-819f288587e53c1e5a8e083d4c853cfcd3e35ec0.tar.gz spack-819f288587e53c1e5a8e083d4c853cfcd3e35ec0.tar.bz2 spack-819f288587e53c1e5a8e083d4c853cfcd3e35ec0.tar.xz spack-819f288587e53c1e5a8e083d4c853cfcd3e35ec0.zip | |
MAGMA package: fix smoke test method (#24848)
The Makefile for the MAGMA smoke tests uses pkg-config to find
the MAGMA compile flags, but the test() routine in the spack
package was not configured to provide the location of the
pkg-config file. This modification sets PKG_CONFIG_PATH correctly
to allow the smoketests to successfully compile. It also removes
the *_dir variables which were unused by the magma
examples/Makefile.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/magma/package.py | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/var/spack/repos/builtin/packages/magma/package.py b/var/spack/repos/builtin/packages/magma/package.py index 787e42714a..14f9c41d3d 100644 --- a/var/spack/repos/builtin/packages/magma/package.py +++ b/var/spack/repos/builtin/packages/magma/package.py @@ -150,20 +150,19 @@ class Magma(CMakePackage, CudaPackage, ROCmPackage): def test(self): test_dir = join_path(self.install_test_root, self.test_src_dir) with working_dir(test_dir, create=False): - magma_dir = 'MAGMADIR={0}'.format(self.prefix) - cuda_dir = 'CUDADIR={0}'.format(self.spec['cuda'].prefix) - blas_dir = 'OPENBLASDIR={0}'.format(self.spec['blas'].prefix) - make(magma_dir, cuda_dir, blas_dir, 'c') - self.run_test('./example_sparse', - purpose='MAGMA smoke test - sparse solver') - self.run_test('./example_sparse_operator', - purpose='MAGMA smoke test - sparse operator') - self.run_test('./example_v1', - purpose='MAGMA smoke test - legacy v1 interface') - self.run_test('./example_v2', - purpose='MAGMA smoke test - v2 interface') - if '+fortran' in self.spec: - make(magma_dir, cuda_dir, blas_dir, 'fortran') - self.run_test('./example_f', - purpose='MAGMA smoke test - Fortran interface') - make('clean') + pkg_config_path = '{0}/lib/pkgconfig'.format(self.prefix) + with spack.util.environment.set_env(PKG_CONFIG_PATH=pkg_config_path): + make('c') + self.run_test('./example_sparse', + purpose='MAGMA smoke test - sparse solver') + self.run_test('./example_sparse_operator', + purpose='MAGMA smoke test - sparse operator') + self.run_test('./example_v1', + purpose='MAGMA smoke test - legacy v1 interface') + self.run_test('./example_v2', + purpose='MAGMA smoke test - v2 interface') + if '+fortran' in self.spec: + make('fortran') + self.run_test('./example_f', + purpose='MAGMA smoke test - Fortran interface') + make('clean') |