From fa503ef0e24d5fdd561f32b04e2256415b7624e8 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Mon, 19 Jul 2021 05:01:05 -0500 Subject: strumpack@develop: update change in examples/data PATH (#24814) --- var/spack/repos/builtin/packages/strumpack/package.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/strumpack/package.py b/var/spack/repos/builtin/packages/strumpack/package.py index b8cf21116b..e949db7dad 100644 --- a/var/spack/repos/builtin/packages/strumpack/package.py +++ b/var/spack/repos/builtin/packages/strumpack/package.py @@ -147,11 +147,13 @@ class Strumpack(CMakePackage, CudaPackage, ROCmPackage): args.append('-DHIP_HIPCC_FLAGS=--amdgpu-target={0}'. format(",".join(rocm_archs))) + if self.spec.satisfies('@:5.1.1'): + self.test_data_dir = 'examples/data' + else: + self.test_data_dir = 'examples/sparse/data' + self.test_src_dir = 'test' return args - test_data_dir = 'examples/data' - test_src_dir = 'test' - @run_after('install') def cache_test_sources(self): """Copy the example source files after the package is installed to an @@ -185,7 +187,7 @@ class Strumpack(CMakePackage, CudaPackage, ROCmPackage): test_dir = join_path(self.install_test_root, self.test_src_dir) test_exe = 'test_sparse_seq' test_exe_mpi = 'test_sparse_mpi' - exe_arg = ['../../examples/data/pde900.mtx'] + exe_arg = [join_path('..', '..', self.test_data_dir, 'pde900.mtx')] if '+mpi' in self.spec: test_args = ['-n', '4', test_exe_mpi] test_args.extend(exe_arg) -- cgit v1.2.3-60-g2f50