diff options
| author | Glenn Johnson <glenn-johnson@uiowa.edu> | 2021-04-12 04:05:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-12 11:05:53 +0200 |
| commit | 7c06b472f550e584d50b872e047afa8269f36b50 (patch) | |
| tree | ca62eea3d1dad24988d37eb1c31044e1b3175919 | |
| parent | e3b0d7ce0e6f74dd4e70064c1fa211441c7c20b4 (diff) | |
| download | spack-7c06b472f550e584d50b872e047afa8269f36b50.tar.gz spack-7c06b472f550e584d50b872e047afa8269f36b50.tar.bz2 spack-7c06b472f550e584d50b872e047afa8269f36b50.tar.xz spack-7c06b472f550e584d50b872e047afa8269f36b50.zip | |
bart: update package (#22926)
- add version 0.7.00
- make build work with intel-oneapi-mkl
- Add myself as maintainer
| -rw-r--r-- | var/spack/repos/builtin/packages/bart/Makefile-0.7.00.patch | 30 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/bart/package.py | 12 |
2 files changed, 38 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/bart/Makefile-0.7.00.patch b/var/spack/repos/builtin/packages/bart/Makefile-0.7.00.patch new file mode 100644 index 0000000000..f1fcf034fa --- /dev/null +++ b/var/spack/repos/builtin/packages/bart/Makefile-0.7.00.patch @@ -0,0 +1,30 @@ +--- a/Makefile 2021-03-01 08:17:01.000000000 -0600 ++++ b/Makefile 2021-04-11 15:20:15.240729080 -0500 +@@ -315,7 +315,7 @@ + ifeq ($(BUILDTYPE), MacOSX) + CUDA_L := -L$(CUDA_BASE)/lib -lcufft -lcudart -lcublas -m64 -lstdc++ + else +-CUDA_L := -L$(CUDA_BASE)/lib -lcufft -lcudart -lcublas -lstdc++ -Wl,-rpath $(CUDA_BASE)/lib ++CUDA_L := -L$(CUDA_BASE)/lib -lcufft -lcudart -lcublas -lstdc++ + endif + else + CUDA_H := +@@ -355,14 +355,13 @@ + CPPFLAGS += -DUSE_ACML + else + BLAS_H := -I$(BLAS_BASE)/include +-ifeq ($(BUILDTYPE), MacOSX) +-BLAS_L := -L$(BLAS_BASE)/lib -lopenblas ++ifeq ($(OPENBLAS),1) ++BLAS_L := -lopenblas + else + ifeq ($(NOLAPACKE),1) +-BLAS_L := -L$(BLAS_BASE)/lib -llapack -lblas +-CPPFLAGS += -Isrc/lapacke ++BLAS_L := -llapack -lcblas + else +-BLAS_L := -L$(BLAS_BASE)/lib -llapacke -lblas ++BLAS_L := -llapacke -lcblas + endif + endif + endif diff --git a/var/spack/repos/builtin/packages/bart/package.py b/var/spack/repos/builtin/packages/bart/package.py index 30ca01f3d9..897572e2c7 100644 --- a/var/spack/repos/builtin/packages/bart/package.py +++ b/var/spack/repos/builtin/packages/bart/package.py @@ -12,6 +12,9 @@ class Bart(MakefilePackage, CudaPackage): homepage = "https://mrirecon.github.io/bart/" url = "https://github.com/mrirecon/bart/archive/v0.5.00.tar.gz" + maintainers = ['glennpj'] + + version('0.7.00', sha256='a16afc4b632c703d95b5c34e47acd82fafc19f51f9aff442373eecfef08bfc41') version('0.6.00', sha256='dbbd33d1e3ed3324fe21f90a3b62cb51765fe369f21df100b46a32004928f18d') version('0.5.00', sha256='30eedcda0f0ef3808157542e0d67df5be49ee41e4f41487af5c850632788f643') @@ -21,11 +24,12 @@ class Bart(MakefilePackage, CudaPackage): when='@0.5.00') # patch to fix Makefile for openblas and cuda - patch('Makefile.patch') + patch('Makefile.patch', when='@:0.6.00') + patch('Makefile-0.7.00.patch', when='@0.7.00:') # patch to set path to bart patch('bart_path-0.5.00.patch', when='@0.5.00') - patch('bart_path-0.6.00.patch', when='@0.6.00') + patch('bart_path-0.6.00.patch', when='@0.6.00:') depends_on('libpng') depends_on('fftw') @@ -44,9 +48,9 @@ class Bart(MakefilePackage, CudaPackage): if spec['blas'].name == 'openblas': env['OPENBLAS'] = '1' - if spec['blas'].name in ['intel-mkl', 'intel-parallel-studio']: + if '^mkl' in spec: env['MKL'] = '1' - env['MKL_BASE'] = env['MKLROOT'] + env['MKL_BASE'] = spec['mkl'].prefix.mkl else: env['BLAS_BASE'] = spec['blas'].prefix |