[med-svn] [Git][med-team/bart][master] 6 commits: turn off all workarounds for now
Martin Uecker (@uecker-guest)
gitlab at salsa.debian.org
Sun May 10 10:32:13 BST 2026
Martin Uecker pushed to branch master at Debian Med / bart
Commits:
93d2d4f2 by Martin Uecker at 2026-05-10T11:31:38+02:00
turn off all workarounds for now
- - - - -
a30d1645 by Martin Uecker at 2026-05-10T11:31:38+02:00
remove feature for local use
- - - - -
87e74ac3 by Martin Uecker at 2026-05-10T11:31:38+02:00
add fix required for Debian autopkgtest tests
- - - - -
4aaed5f7 by Martin Uecker at 2026-05-10T11:31:38+02:00
fix debian tests
- - - - -
c16ede96 by Martin Uecker at 2026-05-10T11:31:38+02:00
do not delete command.txt
- - - - -
46fb7173 by Martin Uecker at 2026-05-10T11:31:38+02:00
deterministic archives
- - - - -
7 changed files:
- + debian/patches/0006-remove-exec-command-mechanism.patch
- + debian/patches/0007-fix-initialization-for-direct-call-of-tools.patch
- + debian/patches/0008-do-not-delete-command.txt.patch
- + debian/patches/0009-deterministic-archives.patch
- debian/patches/series
- debian/rules
- debian/tests/suite
Changes:
=====================================
debian/patches/0006-remove-exec-command-mechanism.patch
=====================================
@@ -0,0 +1,50 @@
+From: Martin Uecker <uecker at tugraz.at>
+Date: Sat, 9 May 2026 15:26:33 +0200
+Subject: remove exec command mechanism
+
+---
+ src/bart.c | 23 -----------------------
+ 1 file changed, 23 deletions(-)
+
+diff --git a/src/bart.c b/src/bart.c
+index 5f820d0..dbcc65f 100644
+--- a/src/bart.c
++++ b/src/bart.c
+@@ -61,9 +61,6 @@
+
+ #include "main.h"
+
+-// also check in commands/ subdir at the bart exe location
+-#define CHECK_EXE_COMMANDS
+-
+ #ifndef DIMS
+ #define DIMS 16
+ #endif
+@@ -642,27 +639,7 @@ int main_bart(int argc, char* argv[argc])
+
+ debug_printf(DP_DEBUG3, "No builtin found: %s\n", argv[0]);
+
+-#ifdef CHECK_EXE_COMMANDS
+- // also check dirname(PATH_TO_BART)/commands/:
+- char exe_loc[1024] = { };
+- ssize_t exe_loc_size = ARRAY_SIZE(exe_loc);
+- ssize_t rl = readlink("/proc/self/exe", exe_loc, (size_t)exe_loc_size);
+-
+- char* exe_dir = NULL;
+-
+- if ((-1 != rl) && (exe_loc_size != rl)) {
+-
+- // readlink returned without error and did not truncate
+- exe_dir = dirname(exe_loc);
+- // no need to check for NULL, as in that case, we skip it in the loop below
+- }
+-#endif
+-
+ const char* tpath[] = {
+-#ifdef CHECK_EXE_COMMANDS
+- exe_dir,
+-#endif
+- getenv("BART_TOOLBOX_PATH"),
+ "/usr/local/lib/bart/",
+ "/usr/lib/bart/",
+ };
=====================================
debian/patches/0007-fix-initialization-for-direct-call-of-tools.patch
=====================================
@@ -0,0 +1,61 @@
+From: Martin Uecker <uecker at tugraz.at>
+Date: Sat, 9 May 2026 19:38:24 +0200
+Subject: fix initialization for direct call of tools
+
+---
+ src/bart.c | 6 +++++-
+ src/misc/mmio.c | 2 +-
+ tests/bart.mk | 13 +++++++++++++
+ 3 files changed, 19 insertions(+), 2 deletions(-)
+ create mode 100644 tests/bart.mk
+
+diff --git a/src/bart.c b/src/bart.c
+index dbcc65f..0639298 100644
+--- a/src/bart.c
++++ b/src/bart.c
+@@ -537,8 +537,12 @@ int main_bart(int argc, char* argv[argc])
+ parse_bart_opts(&argc, &argv, order, &ref_stream);
+
+ bn = basename(argv[0]);
+- }
+
++ } else {
++
++ for (int i = 0; i < DIMS; i++)
++ order[i] = i;
++ }
+
+ main_fun_t* dispatch_func = NULL;
+
+diff --git a/src/misc/mmio.c b/src/misc/mmio.c
+index be0995f..eb2a235 100644
+--- a/src/misc/mmio.c
++++ b/src/misc/mmio.c
+@@ -150,7 +150,7 @@ struct cfl_loop_desc_s {
+
+ static struct cfl_loop_desc_s cfl_loop_desc = {
+
+- .D = 0,
++ .D = DIMS,
+ .omp_threads = 1,
+ .flags = 0UL,
+ .loop_dims = { [0 ... DIMS - 1] = 1 },
+diff --git a/tests/bart.mk b/tests/bart.mk
+new file mode 100644
+index 0000000..e7db22f
+--- /dev/null
++++ b/tests/bart.mk
+@@ -0,0 +1,13 @@
++
++
++tests/test-bart: bart
++ set -e; mkdir $(TESTS_TMP) ; cd $(TESTS_TMP) ;\
++ $(ROOTDIR)/bart ones 2 1 1 o1.ra ;\
++ cp $(ROOTDIR)/bart ./ones ;\
++ ./ones 2 1 1 o2.ra ;\
++ $(ROOTDIR)/bart nrmse -t 0. o1.ra o2.ra ;\
++ rm ones *.ra ; cd .. ; rmdir $(TESTS_TMP)
++ touch $@
++
++TESTS += tests/test-bart
++
=====================================
debian/patches/0008-do-not-delete-command.txt.patch
=====================================
@@ -0,0 +1,21 @@
+From: Martin Uecker <uecker at tugraz.at>
+Date: Sat, 9 May 2026 23:14:53 +0200
+Subject: do not delete command.txt
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 7ebee7b..77d7a70 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1190,7 +1190,7 @@ allclean: clean
+ rm -f $(root)/tests/test-*
+ rm -rf $(root)/stests/tmp/*/
+ rm -rf $(root)/doc/dx
+- rm -f $(root)/doc/commands.txt
++# rm -f $(root)/doc/commands.txt
+ rm -f $(root)/save/fftw/*.fftw
+ rm -f $(root)/save/nsv/*.dat
+ touch isclean
=====================================
debian/patches/0009-deterministic-archives.patch
=====================================
@@ -0,0 +1,28 @@
+From: Martin Uecker <uecker at tugraz.at>
+Date: Sun, 10 May 2026 08:43:28 +0200
+Subject: deterministic archives
+
+---
+ Makefile | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 77d7a70..f5afd7d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -122,13 +122,8 @@ else
+ endif
+
+
+-ifeq ($(BUILDTYPE), Linux)
+- # as the defaults changed on most Linux distributions
+- # explicitly specify non-deterministic archives to not break make
+- ARFLAGS ?= rsU
+-else
+- ARFLAGS ?= rs
+-endif
++
++ARFLAGS ?= rs
+
+
+ ifeq ($(UNAME),Cygwin)
=====================================
debian/patches/series
=====================================
@@ -3,3 +3,7 @@
0003-cleanup-more-thoroughly.patch
0004-remove-rpath.patch
0005-remove-commands-listed-twice.patch
+0006-remove-exec-command-mechanism.patch
+0007-fix-initialization-for-direct-call-of-tools.patch
+0008-do-not-delete-command.txt.patch
+0009-deterministic-archives.patch
=====================================
debian/rules
=====================================
@@ -14,7 +14,7 @@ export PARALLEL=1
export PARALLEL_NJOBS=1
# some archs require turning of some optimizations
-NOEXPOPT_ARCHS=arm64 ppc64el s390x ia64 powerpc ppc64 riscv64
+NOEXPOPT_ARCHS=
# turn off hanging tests on i386
ifeq ($(DEB_BUILD_ARCH), i386)
@@ -28,10 +28,10 @@ endif
# Some tests fail on the following architectures probably
# due to minor differences in floating point processing.
# For now, just turn it off...
-NOTEST_ARCHS=hurd-i386 kfreebsd-i386
+NOTEST_ARCHS=
# For this architesture the test will be run but it will pass in any case even when errors occure
-PRINT_ERRORS_WHEN_TESTING=sh4 arc m68k alpha loong64
+PRINT_ERRORS_WHEN_TESTING=i386 sh4 arc m68k alpha
%:
dh $@
=====================================
debian/tests/suite
=====================================
@@ -12,6 +12,8 @@ cat <<EOF > $AUTOPKGTEST_TMP/Makefile
TOOLDIR=$AUTOPKGTEST_TMP/
ROOTDIR=$AUTOPKGTEST_TMP/
+export BART_TOOLBOX_PATH=$AUTOPKGTEST_TMP/
+
TESTS_DIR=$AUTOPKGTEST_TMP/tests/
TESTS_TMP=$AUTOPKGTEST_TMP/tests/tmp/\$\$\$\$/
TESTS_OUT=$AUTOPKGTEST_TMP/tests/out/
@@ -32,6 +34,9 @@ for CMD in $CMDS ; do
[ -e tests/$CMD.mk ] && cp tests/$CMD.mk $AUTOPKGTEST_TMP/tests/
done
+# copy scripts
+cp -r scripts/ $AUTOPKGTEST_TMP/scripts/
+
# copy some test data
cp -r tests/geom/ $AUTOPKGTEST_TMP/tests/geom/
View it on GitLab: https://salsa.debian.org/med-team/bart/-/compare/a75505d81d475acbcdf10b5249200ac5d4752efb...46fb71731a826b471d288f8140e0cc754fbe92f0
--
View it on GitLab: https://salsa.debian.org/med-team/bart/-/compare/a75505d81d475acbcdf10b5249200ac5d4752efb...46fb71731a826b471d288f8140e0cc754fbe92f0
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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260510/2ee83deb/attachment-0001.htm>
More information about the debian-med-commit
mailing list