bart: update package (#22926)

- add version 0.7.00
- make build work with intel-oneapi-mkl
- Add myself as maintainer
This commit is contained in:
Glenn Johnson 2021-04-12 04:05:53 -05:00 committed by GitHub
parent e3b0d7ce0e
commit 7c06b472f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 4 deletions

View File

@ -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

View File

@ -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 @@ def edit(self, spec, prefix):
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