[med-svn] [Git][med-team/bart][master-contrib] 7 commits: Upload to unstable
Martin Uecker (@uecker-guest)
gitlab at salsa.debian.org
Thu Dec 30 16:52:25 GMT 2021
Martin Uecker pushed to branch master-contrib at Debian Med / bart
Commits:
dc2c4645 by Nilesh Patra at 2021-12-30T13:27:10+05:30
Upload to unstable
- - - - -
543dd843 by Martin Uecker at 2021-12-30T16:36:12+01:00
update workaround for compiler bug for armel
- - - - -
75012fe3 by Martin Uecker at 2021-12-30T16:36:12+01:00
tests on mips64el work
- - - - -
a7853570 by Martin Uecker at 2021-12-30T16:36:12+01:00
remove compatibility patch
- - - - -
ebcfae85 by Martin Uecker at 2021-12-30T16:36:12+01:00
Revert "deterministic archive"
This reverts commit 5cad340ed59f70020be9a85632b3233657cd3679.
It was not sufficient for reproducibility, but triggers
incorrect rebuilds (which is also problematic for cross-building).
- - - - -
917bdb27 by Martin Uecker at 2021-12-30T16:36:46+01:00
update changelog
- - - - -
8b2eeee1 by Martin Uecker at 2021-12-30T16:44:33+01:00
Merge branch 'master' into master-contrib
- - - - -
7 changed files:
- debian/changelog
- − debian/patches/0001-makefile-change-for-compatibility-with-debian.patch
- debian/patches/0002-remove-empty-directory.patch
- debian/patches/0005-workaround-for-compiler-bug.patch
- debian/patches/0006-do-not-update-doc-commands.txt-automatically.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+bart-cuda (0.7.00-2) UNRELEASED; urgency=medium
+
+ * Fix cross-builds by reverting patch for determinstic archives.
+ * Arm the unit tests on mips64el.
+ * Add workaround for compiler bug on armel and s390x.
+ * Drop old compatibility patch.
+
+ -- Martin Uecker <martin.uecker at med.uni-goettingen.de> Thu, 30 Dec 2021 16:28:18 +0100
+
bart-cuda (0.7.00-1) unstable; urgency=medium
[ Martin Uecker ]
=====================================
debian/patches/0001-makefile-change-for-compatibility-with-debian.patch deleted
=====================================
@@ -1,21 +0,0 @@
-From: Martin Uecker <martin.uecker at med.uni-goettingen.de>
-Date: Sat, 28 Apr 2018 21:28:14 +0200
-Subject: makefile change for compatibility with debian
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index f0aa2cc..fa077a7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -41,7 +41,7 @@ MEMONLY_CFL?=0
-
-
- DESTDIR ?= /
--PREFIX ?= usr/local/
-+PREFIX ?= usr/
-
- BUILDTYPE = Linux
- UNAME = $(shell uname -s)
=====================================
debian/patches/0002-remove-empty-directory.patch
=====================================
@@ -7,7 +7,7 @@ Subject: remove empty directory
1 file changed, 1 deletion(-)
diff --git a/Makefile b/Makefile
-index fa077a7..c917dc8 100644
+index f0aa2cc..ae1f3b0 100644
--- a/Makefile
+++ b/Makefile
@@ -727,7 +727,6 @@ install: bart $(root)/doc/commands.txt
=====================================
debian/patches/0005-workaround-for-compiler-bug.patch
=====================================
@@ -3,10 +3,26 @@ Date: Wed, 29 Dec 2021 14:31:57 +0100
Subject: workaround for compiler bug
---
+ src/num/flpmath.h | 4 ++--
src/simu/shape.h | 4 ++--
src/simu/shepplogan.h | 6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+diff --git a/src/num/flpmath.h b/src/num/flpmath.h
+index 95e02b2..3bad886 100644
+--- a/src/num/flpmath.h
++++ b/src/num/flpmath.h
+@@ -234,8 +234,8 @@ extern void md_sgreatequal2(unsigned int D, const long dim[__VLA(D)], const long
+
+ extern float md_znorm2(unsigned int D, const long dim[__VLA(D)], const long str[__VLA(D)], const _Complex float* ptr);
+ extern float md_znorm(unsigned int D, const long dim[__VLA(D)], const _Complex float* ptr);
+-extern _Complex float md_zscalar2(unsigned int D, const long dim[__VLA(D)], const long str1[__VLA(D)], const _Complex float* ptr1, const long str2[__VLA(D)], const _Complex float* ptr2);
+-extern _Complex float md_zscalar(unsigned int D, const long dim[__VLA(D)], const _Complex float* ptr1, const _Complex float* ptr2);
++extern _Complex float md_zscalar2(unsigned int D, const long dim[/*__VLA(D)*/], const long str1[/*__VLA(D)*/], const _Complex float* ptr1, const long str2[/*__VLA(D)*/], const _Complex float* ptr2);
++extern _Complex float md_zscalar(unsigned int D, const long dim[/*__VLA(D)*/], const _Complex float* ptr1, const _Complex float* ptr2);
+ extern float md_zscalar_real2(unsigned int D, const long dim[__VLA(D)], const long str1[__VLA(D)], const _Complex float* ptr1, const long str2[__VLA(D)], const _Complex float* ptr2);
+ extern float md_zscalar_real(unsigned int D, const long dim[__VLA(D)], const _Complex float* ptr1, const _Complex float* ptr2);
+
diff --git a/src/simu/shape.h b/src/simu/shape.h
index 52c1448..eae2b84 100644
--- a/src/simu/shape.h
=====================================
debian/patches/0006-do-not-update-doc-commands.txt-automatically.patch
=====================================
@@ -9,7 +9,7 @@ Subject: do not update doc/commands.txt automatically
create mode 100644 doc/commands.txt
diff --git a/Makefile b/Makefile
-index c917dc8..3d09e8b 100644
+index ae1f3b0..7977abd 100644
--- a/Makefile
+++ b/Makefile
@@ -568,7 +568,7 @@ XTARGETS:=$(sort $(XTARGETS))
=====================================
debian/patches/series
=====================================
@@ -1,4 +1,3 @@
-0001-makefile-change-for-compatibility-with-debian.patch
0002-remove-empty-directory.patch
0003-deactivate-ode-unit-tests.patch
0004-relax-failing-unit-test.patch
=====================================
debian/rules
=====================================
@@ -8,8 +8,8 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
export CUDA=1
export CUDA_BASE=/usr/
-# set AR flags for deterministic archive
-export ARFLAGS=rs
+# set installation prefix
+export PREFIX=/usr/
# Some tests fail on the following architectures probably
# due to minor differences in floating point processing.
@@ -17,7 +17,7 @@ export ARFLAGS=rs
NOTEST_ARCHS=armel armhf mips mipsel hurd-i386 kfreebsd-i386 m68k powerpcspe sh4
# For this architesture the test will be run but it will pass in any case even when errors occure
-PRINT_ERRORS_WHEN_TESTING=i386 mips64el s390x
+PRINT_ERRORS_WHEN_TESTING=i386 s390x
%:
dh $@
View it on GitLab: https://salsa.debian.org/med-team/bart/-/compare/49baa0dd31238301cb58e0f854bd401c7bcf0f41...8b2eeee1a30c9326e2508a77c5ef9d1e5b9a334e
--
View it on GitLab: https://salsa.debian.org/med-team/bart/-/compare/49baa0dd31238301cb58e0f854bd401c7bcf0f41...8b2eeee1a30c9326e2508a77c5ef9d1e5b9a334e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211230/e515ec3c/attachment-0001.htm>
More information about the debian-med-commit
mailing list