Merge ~adrien/ubuntu/+source/mpi4py:plucky-merge-4.0.1-6 into ubuntu/+source/mpi4py:ubuntu/devel

Proposed by Adrien Nader
Status: Superseded
Proposed branch: ~adrien/ubuntu/+source/mpi4py:plucky-merge-4.0.1-6
Merge into: ubuntu/+source/mpi4py:ubuntu/devel
Diff against target: 147 lines (+74/-6) (has conflicts)
4 files modified
debian/changelog (+41/-0)
debian/control (+2/-1)
debian/rules (+24/-5)
debian/tests/mpi4py-test (+7/-0)
Conflict in debian/changelog
Conflict in debian/tests/mpi4py-test
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+477530@code.launchpad.net

This proposal has been superseded by a proposal from 2024-12-06.

Description of the change

Merge from Debian. Chances are that will fix a test triggered by openmpi and help with the transition.

I've dropped changes that are not needed anymore: as far as I understand, they only applied during build but not during autopkgtest unfortunately. I wasn't able to test in a PPA due to infra issues (pulling from a PPA is broken everywhere at the moment) but the tests passed at build-time, including on armhf and s390x.

It's possible that we could sync the package instead but without the ability to test in PPA, I went for a middle-ground that seemed enough and safe.

To post a comment you must log in.

Unmerged commits

2865325... by Adrien Nader

update-maintainer

d5c1c0c... by Adrien Nader

reconstruct-changelog

8776a12... by Adrien Nader

merge-changelog

ec3f5ae... by Matthias Klose

Restore test_pack skipping in skip_failing_tests_32bit_mpich.patch

ae613cd... by Drew Parsons

4.0.1-6 (patches unapplied)

Imported using git-ubuntu import.

7cf8960... by Drew Parsons

4.0.1-5 (patches unapplied)

Imported using git-ubuntu import.

fce3c0d... by Drew Parsons

4.0.1-4 (patches unapplied)

Imported using git-ubuntu import.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 3f7feb8..01a9f3d 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,44 @@
6+<<<<<<< debian/changelog
7+=======
8+mpi4py (4.0.1-6ubuntu1) plucky; urgency=medium
9+
10+ * Merge with Debian; remaining changes:
11+ - Restore test_pack skipping in skip_failing_tests_32bit_mpich.patch
12+
13+ -- Adrien Nader <adrien.nader@canonical.com> Fri, 29 Nov 2024 17:44:01 +0100
14+
15+mpi4py (4.0.1-6) unstable; urgency=medium
16+
17+ * mips64el is in trouble. Reinstate version restriction. Test
18+ default python only and skip all TestRMA.
19+ * skip testAccumulate from test_rma_nb on bigendian architectures
20+ (s390x ppc64 sparc64, not alpha). Skip separately from DMA skips.
21+
22+ -- Drew Parsons <dparsons@debian.org> Tue, 19 Nov 2024 21:55:01 +0100
23+
24+mpi4py (4.0.1-5) unstable; urgency=medium
25+
26+ * update test skips
27+ - add alpha, sparc64 to the DMA skip list
28+ - DMA skip arches also skip testGetAccumulate
29+ - mips64el skips all TestRMA
30+ * revert mips64el version restriction, run tests on all supported
31+ python versions. The problem was TestRMA.
32+
33+ -- Drew Parsons <dparsons@debian.org> Tue, 19 Nov 2024 11:53:52 +0100
34+
35+mpi4py (4.0.1-4) unstable; urgency=medium
36+
37+ * s390x ppc64: skip all TestDPM tests (test_dynproc.py)
38+ see https://github.com/mpi4py/mpi4py/issues/586
39+ Closes: #1087609. Future ref. #1087800.
40+ * apply test skips to serial build tests
41+ * debian/rules: explicitly set DEB_HOST_ARCH
42+ * mips64el times out. Run build tests on default python only
43+
44+ -- Drew Parsons <dparsons@debian.org> Mon, 18 Nov 2024 23:37:00 +0100
45+
46+>>>>>>> debian/changelog
47 mpi4py (4.0.1-3ubuntu2) plucky; urgency=medium
48
49 * No-change rebuild for openmpi soname change.
50diff --git a/debian/control b/debian/control
51index e17bc3b..aeefcf6 100644
52--- a/debian/control
53+++ b/debian/control
54@@ -1,5 +1,6 @@
55 Source: mpi4py
56-Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
57+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
58+XSBC-Original-Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
59 Uploaders: Drew Parsons <dparsons@debian.org>,
60 Yaroslav Halchenko <debian@onerussian.com>,
61 Michael Hanke <michael.hanke@gmail.com>,
62diff --git a/debian/rules b/debian/rules
63index 12be5da..4cf8d02 100755
64--- a/debian/rules
65+++ b/debian/rules
66@@ -1,6 +1,8 @@
67 #!/usr/bin/make -f
68 # -*- makefile -*-
69
70+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
71+
72 PY3DEF = $(shell py3versions -vd)
73 PY3VERS = $(shell py3versions -vs)
74
75@@ -32,6 +34,13 @@ ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
76 RUNTEST=no
77 endif
78
79+ifeq ($(DEB_HOST_ARCH),mips64el)
80+# mips64el times out. Run tests on default python only.
81+ PY3VERS_TESTS = $(PY3DEF)
82+else
83+ PY3VERS_TESTS = $(PY3VERS)
84+endif
85+
86 # hurd fails a couple of tests
87 # but hell, hurd needs all the help it can get, so let it pass
88 ARCH_IGNORE_FAILED_TESTS = hurd-i386 armhf s390x
89@@ -43,12 +52,22 @@ ifneq (,$(findstring $(space)$(DEB_HOST_ARCH)$(space), $(space)$(ARCH_IGNORE_FAI
90 endif
91
92 # segfault via PMIX (PMIX_ERR_BAD_PARAM) in test_dynproc.TestDPM
93-SKIP_PMIX_DPM_CONNECT_ARCH_LIST = s390x ppc64
94+SKIP_PMIX_DPM_CONNECT_ARCH_LIST = s390x alpha ppc64 sparc64
95 ifneq (,$(findstring $(space)$(DEB_HOST_ARCH)$(space), $(space)$(SKIP_PMIX_DPM_CONNECT_ARCH_LIST)$(space)))
96- SKIP_TEST_LIST += testAcceptConnect testConnectAccept
97+ SKIP_TEST_LIST += TestDPM
98+endif
99+
100+# failing RMA tests from test_rma_nb
101+SKIP_RMA_ACCUMULATE_ARCH_LIST = s390x ppc64 sparc64
102+ifneq (,$(findstring $(space)$(DEB_HOST_ARCH)$(space), $(space)$(SKIP_RMA_ACCUMULATE_ARCH_LIST)$(space)))
103+ SKIP_TEST_LIST += testAccumulate testGetAccumulate
104+endif
105+
106+ifeq ($(DEB_HOST_ARCH),mips64el)
107+ SKIP_TEST_LIST += TestRMA
108 endif
109
110-ifneq (,$(findstring $(DEB_HOST_ARCH), sparc64))
111+ifeq ($(DEB_HOST_ARCH),sparc64)
112 # OpenMPI broke memory alignment on sparc64, see https://github.com/mpi4py/mpi4py/issues/147
113 SKIP_TEST_LIST += testPackUnpackExternal
114 endif
115@@ -109,12 +128,12 @@ override_dh_auto_test:
116 fi; \
117 done; \
118 echo "skipping tests: $${SKIP_TESTS}"; \
119- for vv in $(PY3VERS); do \
120+ for vv in $(PY3VERS_TESTS); do \
121 echo "I: testing using python$$vv"; \
122 echo "I: running tests with single process"; \
123 PYTHONPATH=`pybuild -p $$vv --print "{build_dir}"` \
124 GITHUB_ACTIONS=true MPI4PY_TEST_SPAWN=false \
125- /usr/bin/python$$vv $(CURDIR)/test/runtests.py -v || $(IGNORE_FAILED_TESTS); \
126+ /usr/bin/python$$vv $(CURDIR)/test/runtests.py -v $${SKIP_TESTS} || $(IGNORE_FAILED_TESTS); \
127 nproc=`nproc`; MIN_PROC=$$(( nproc > 2 ? nproc : 2 )); \
128 NUM_PROC=$$(( MIN_PROC > 5 ? 5 : MIN_PROC )); \
129 echo "I: running tests with MPI ($$NUM_PROC processes)"; \
130diff --git a/debian/tests/mpi4py-test b/debian/tests/mpi4py-test
131index 9cf2f63..31bd469 100644
132--- a/debian/tests/mpi4py-test
133+++ b/debian/tests/mpi4py-test
134@@ -18,7 +18,14 @@ declare -a DISABLED_TESTS
135 if [ "${DEB_HOST_ARCH}" = "s390x" ] ; then
136 DISABLED_TESTS=("${DISABLED_TESTS[@]}"
137 # segfault via PMIX (PMIX_ERR_BAD_PARAM) in test_dynproc.TestDPM
138+<<<<<<< debian/tests/mpi4py-test
139 testAcceptConnect testConnectAccept testJoin testNamePublishing
140+=======
141+ TestDPM
142+
143+ # failing RMA tests from test_rma_nb
144+ testAccumulate testGetAccumulate
145+>>>>>>> debian/tests/mpi4py-test
146 )
147 fi
148

Subscribers

People subscribed via source and target branches