Martin Uecker pushed to branch master at Debian Med / bart
Commits: 723129bd by Martin Uecker at 2026-05-09T14:37:09+02:00 add rpath patch - - - - - 535a71eb by Martin Uecker at 2026-05-09T14:53:27+02:00 add patch to remove duplicate entries for commands - - - - - 3 changed files: - + debian/patches/0004-remove-rpath.patch - + debian/patches/0005-remove-commands-listed-twice.patch - debian/patches/series Changes: ===================================== debian/patches/0004-remove-rpath.patch ===================================== @@ -0,0 +1,66 @@ +From: Martin Uecker <[email protected]> +Date: Sat, 9 May 2026 14:36:42 +0200 +Subject: remove rpath + +--- + Makefile | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 23faaf5..59d5e09 100644 +--- a/Makefile ++++ b/Makefile +@@ -423,12 +423,12 @@ endif + + ifeq ($(TENSORFLOW),1) + CPPFLAGS += -DTENSORFLOW -I$(TENSORFLOW_BASE)/include +-LIBS += -L$(TENSORFLOW_BASE)/lib -Wl,-rpath $(TENSORFLOW_BASE)/lib -ltensorflow_framework -ltensorflow ++LIBS += -L$(TENSORFLOW_BASE)/lib -ltensorflow_framework -ltensorflow + endif + + ifeq ($(PYTORCH),1) + CPPFLAGS += -DPYTORCH -I$(PYTORCH_BASE)/include/torch/csrc/api/include/ -I$(PYTORCH_BASE)/include/ +-LIBS += -L$(PYTORCH_BASE)/lib -Wl,--no-as-needed,-rpath $(PYTORCH_BASE)/lib -ltorch -ltorch_cpu -lc10 ++LIBS += -L$(PYTORCH_BASE)/lib -Wl,--no-as-needed -ltorch -ltorch_cpu -lc10 + ifeq ($(CUDA),1) + LIBS += -ltorch_cuda -lc10_cuda + endif +@@ -502,9 +502,9 @@ ifeq ($(BUILDTYPE), MacOSX) + CUDA_L := -L$(CUDA_BASE)/$(CUDA_LIB) -lcufft -lcudart -lcublas -m64 -lstdc++ + else + ifeq ($(CUDNN),1) +-CUDA_L := -L$(CUDA_BASE)/$(CUDA_LIB) -L$(CUDNN_BASE)/$(CUDNN_LIB) -lcudnn -lcufft -lcudart -lcublas -lstdc++ -Wl,-rpath $(CUDA_BASE)/$(CUDA_LIB) -Wl,-rpath $(CUDNN_BASE)/$(CUDNN_LIB) ++CUDA_L := -L$(CUDA_BASE)/$(CUDA_LIB) -L$(CUDNN_BASE)/$(CUDNN_LIB) -lcudnn -lcufft -lcudart -lcublas -lstdc++ + else +-CUDA_L := -L$(CUDA_BASE)/$(CUDA_LIB) -lcufft -lcudart -lcublas -lstdc++ -Wl,-rpath $(CUDA_BASE)/$(CUDA_LIB) ++CUDA_L := -L$(CUDA_BASE)/$(CUDA_LIB) -lcufft -lcudart -lcublas -lstdc++ + endif + endif + else +@@ -560,7 +560,7 @@ CFLAGS += -DUSE_OPENBLAS + else + ifeq ($(ACML),1) + BLAS_H := -I$(ACML_BASE)/include +-BLAS_L := -L$(ACML_BASE)/lib -lgfortran -lacml_mp -Wl,-rpath $(ACML_BASE)/lib ++BLAS_L := -L$(ACML_BASE)/lib -lgfortran -lacml_mp + CPPFLAGS += -DUSE_ACML + else + ifeq ($(BUILDTYPE), MSYS) +@@ -577,7 +577,7 @@ else + ifeq ($(BUILDTYPE), WASM) + BLAS_L := -L$(BLAS_BASE)/lib + else +-BLAS_L := -Wl,-rpath $(BLAS_BASE)/lib -L$(BLAS_BASE)/lib ++BLAS_L := -L$(BLAS_BASE)/lib + + ifeq ($(NOLAPACKE),1) + BLAS_L += -llapack -lblas +@@ -657,7 +657,7 @@ FFTW_H := -I$(FFTW_BASE)/include/ + ifeq ($(BUILDTYPE), WASM) + FFTW_L := -L$(FFTW_BASE)/lib -lfftw3f + else +-FFTW_L := -Wl,-rpath $(FFTW_BASE)/lib -L$(FFTW_BASE)/lib -lfftw3f ++FFTW_L := -L$(FFTW_BASE)/lib -lfftw3f + endif + + ifeq ($(FFTWTHREADS),1) ===================================== debian/patches/0005-remove-commands-listed-twice.patch ===================================== @@ -0,0 +1,21 @@ +From: Martin Uecker <[email protected]> +Date: Sat, 9 May 2026 14:52:57 +0200 +Subject: remove commands listed twice + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 59d5e09..7ebee7b 100644 +--- a/Makefile ++++ b/Makefile +@@ -276,7 +276,7 @@ ISMRM_BASE ?= /usr/local/ismrmrd/ + + # Main build targets + # +-TBASE+=show slice crop resize join transpose squeeze flatten zeros ones flip circshift extract repmat bitmask reshape version delta copy casorati vec poly index multicfl tee compress ++TBASE+=show slice crop resize join transpose squeeze flatten zeros ones flip circshift extract repmat bitmask reshape version delta copy casorati vec poly index compress + TFLP+=scale invert conj fmac saxpy sdot spow cpyphs creal carg normalize cdf97 pattern nrmse mip avg cabs zexp calc unwrap + TNUM+=fft fftmod fftshift noise bench threshold conv rss filter nlmeans mandelbrot wavelet window var std fftrot roistat pol2mask conway morphop hist gmm + TRECO+=pics pocsense sqpics itsense nlinv moba nufft nufftbase rof tgv ictv sake wave lrmatrix estdims estshift estdelay wavepsf wshfl rtnlinv mobafit mobasig grog denoise estscaling ===================================== debian/patches/series ===================================== @@ -1,3 +1,5 @@ 0001-remove-empty-directory.patch 0005-do-not-update-doc-commands.txt-automatically.patch 0003-cleanup-more-thoroughly.patch +0004-remove-rpath.patch +0005-remove-commands-listed-twice.patch View it on GitLab: https://salsa.debian.org/med-team/bart/-/compare/2987da4f9ad0ef1c090462c5f1c5c56e23314464...535a71eb34618ca5541c054e933d11533238e282 -- View it on GitLab: https://salsa.debian.org/med-team/bart/-/compare/2987da4f9ad0ef1c090462c5f1c5c56e23314464...535a71eb34618ca5541c054e933d11533238e282 You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
