Ubuntu
adios2 package

Merge ~adrien/ubuntu/+source/adios2:plucky-too-many-procs into ubuntu/+source/adios2:ubuntu/devel

  1. Git
  2. lp:~adrien/ubuntu/+source/adios2
  3. plucky-too-many-procs
  4. Merge into ubuntu/devel
Proposed by Adrien Nader
Status: Needs review
Proposed branch: ~adrien/ubuntu/+source/adios2:plucky-too-many-procs
Merge into: ubuntu/+source/adios2:ubuntu/devel
Diff against target: 67 lines (+23/-5)
4 files modified
debian/changelog (+17/-0)
debian/control (+2/-1)
debian/tests/adios2-mpi-examples (+2/-2)
debian/tests/adios2-mpi-test (+2/-2)
Reviewer Review Type Date Requested Status
Simon Quigley (community) Needs Fixing
Review via email: mp+477906@code.launchpad.net

Description of the change

Please review this merge request. In addition to the git commits, a debdiff put in comments below for convenience.

OpenMPI 5.0 changed the name and the value of environment variable. This change adapts the ones used in tests.

# 📊 PPA
A PPA is available at:
 https://launchpad.net/~adrien/+archive/ubuntu/plucky-adios2-too-many-procs

# 🧪 Autopkgtest results
No autopkgtest results yet.

# 🔍 Lintian diff from most recent published package
No relevant lintian change.

To post a comment you must log in.
Revision history for this message
Adrien Nader (adrien) wrote :

For convenience: debdiff below:

diff -Nru adios2-2.10.1+dfsg1/debian/changelog adios2-2.10.1+dfsg1/debian/changelog
--- adios2-2.10.1+dfsg1/debian/changelog 2024-12-01 02:00:25.000000000 +0100
+++ adios2-2.10.1+dfsg1/debian/changelog 2024-12-06 10:34:31.000000000 +0100
@@ -1,3 +1,20 @@
+adios2 (2.10.1+dfsg1-13ubuntu1) plucky; urgency=medium
+
+ * OpenMPI 5.0 changed the name and the value of the environment variable to
+ allow oversubscription from
+ export OMPI_MCA_rmaps_base_oversubscribe=1
+ to
+ export PRTE_MCA_rmaps_default_mapping_policy=:oversubscribe
+ Use the new variable name in debian/tests.
+ * OpenMPI 5.0 changed the name of the environment variable to set the SSH
+ agent from
+ export OMPI_MCA_plm_rsh_agent=/bin/false
+ to
+ export PRTE_MCA_plm_ssh_agent=/bin/false
+ Use the new variable name in debian/tests.
+
+ -- Adrien Nader <email address hidden> Fri, 06 Dec 2024 10:34:31 +0100
+
 adios2 (2.10.1+dfsg1-13) unstable; urgency=medium

   * Team upload.
diff -Nru adios2-2.10.1+dfsg1/debian/control adios2-2.10.1+dfsg1/debian/control
--- adios2-2.10.1+dfsg1/debian/control 2024-12-01 02:00:25.000000000 +0100
+++ adios2-2.10.1+dfsg1/debian/control 2024-12-06 10:34:31.000000000 +0100
@@ -1,6 +1,7 @@
 Source: adios2
 Priority: optional
-Maintainer: Debian Science Maintainers <email address hidden>
+Maintainer: Ubuntu Developers <email address hidden>
+XSBC-Original-Maintainer: Debian Science Maintainers <email address hidden>
 Uploaders: Drew Parsons <email address hidden>,
            Francesco Ballarin <email address hidden>
 Build-Depends:
diff -Nru adios2-2.10.1+dfsg1/debian/tests/adios2-mpi-examples adios2-2.10.1+dfsg1/debian/tests/adios2-mpi-examples
--- adios2-2.10.1+dfsg1/debian/tests/adios2-mpi-examples 2024-12-01 02:00:25.000000000 +0100
+++ adios2-2.10.1+dfsg1/debian/tests/adios2-mpi-examples 2024-12-06 10:34:17.000000000 +0100
@@ -4,8 +4,8 @@

 err_code=0

-export OMPI_MCA_plm_rsh_agent=/bin/false
-export OMPI_MCA_rmaps_base_oversubscribe=1
+export PRTE_MCA_plm_ssh_agent=/bin/false
+export PRTE_MCA_rmaps_default_mapping_policy=:oversubscribe
 # MPI is typically more efficient with 1 thread per process
 export OMP_NUM_THREADS=1

diff -Nru adios2-2.10.1+dfsg1/debian/tests/adios2-mpi-test adios2-2.10.1+dfsg1/debian/tests/adios2-mpi-test
--- adios2-2.10.1+dfsg1/debian/tests/adios2-mpi-test 2024-12-01 02:00:25.000000000 +0100
+++ adios2-2.10.1+dfsg1/debian/tests/adios2-mpi-test 2024-12-06 10:33:00.000000000 +0100
@@ -8,8 +8,8 @@
 DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_ARCH_ENDIAN=$(dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)

-export OMPI_MCA_plm_rsh_agent=/bin/false
-export OMPI_MCA_rmaps_base_oversubscribe=1
+export PRTE_MCA_plm_ssh_agent=/bin/false
+export PRTE_MCA_rmaps_default_mapping_policy=:oversubscribe
 # MPI is typically more efficient with 1 thread per process
 export OMP_NUM_THREADS=1

Reply
Revision history for this message
Simon Quigley (tsimonq2) wrote :

Please rebase this MP on the latest changes in Plucky.

review: Needs Fixing
Reply
Revision history for this message
Adrien Nader (adrien) wrote :

I hadn't noticed that a new version had been uploaded to Debian. I think I'll update the MR or maybe push that to Debian (I thought the change was needed for the openmpi transition but it seems it wasn't).

Reply

Unmerged commits

cdfc7cc... by Adrien Nader

update-maintainer

07dda06... by Adrien Nader

reconstruct-changelog

3b16e23... by Adrien Nader

  * OpenMPI 5.0 changed the name and the value of the environment variable to
    allow oversubscription from
       export OMPI_MCA_rmaps_base_oversubscribe=1
    to
       export PRTE_MCA_rmaps_default_mapping_policy=:oversubscribe
    Use the new variable name in debian/tests.
  * OpenMPI 5.0 changed the name of the environment variable to set the SSH
    agent from
       export OMPI_MCA_plm_rsh_agent=/bin/false
    to
       export PRTE_MCA_plm_ssh_agent=/bin/false
    Use the new variable name in debian/tests.

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 3a72b84..89e8b0c 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,20 @@
6+adios2 (2.10.1+dfsg1-13ubuntu1) plucky; urgency=medium
7+
8+ * OpenMPI 5.0 changed the name and the value of the environment variable to
9+ allow oversubscription from
10+ export OMPI_MCA_rmaps_base_oversubscribe=1
11+ to
12+ export PRTE_MCA_rmaps_default_mapping_policy=:oversubscribe
13+ Use the new variable name in debian/tests.
14+ * OpenMPI 5.0 changed the name of the environment variable to set the SSH
15+ agent from
16+ export OMPI_MCA_plm_rsh_agent=/bin/false
17+ to
18+ export PRTE_MCA_plm_ssh_agent=/bin/false
19+ Use the new variable name in debian/tests.
20+
21+ -- Adrien Nader <adrien.nader@canonical.com> Fri, 06 Dec 2024 10:34:31 +0100
22+
23 adios2 (2.10.1+dfsg1-13) unstable; urgency=medium
24
25 * Team upload.
26diff --git a/debian/control b/debian/control
27index 87212e6..8ab6811 100644
28--- a/debian/control
29+++ b/debian/control
30@@ -1,6 +1,7 @@
31 Source: adios2
32 Priority: optional
33-Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
34+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
35+XSBC-Original-Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
36 Uploaders: Drew Parsons <dparsons@debian.org>,
37 Francesco Ballarin <francesco.ballarin@unicatt.it>
38 Build-Depends:
39diff --git a/debian/tests/adios2-mpi-examples b/debian/tests/adios2-mpi-examples
40index 82de9ef..c600ef0 100644
41--- a/debian/tests/adios2-mpi-examples
42+++ b/debian/tests/adios2-mpi-examples
43@@ -4,8 +4,8 @@
44
45 err_code=0
46
47-export OMPI_MCA_plm_rsh_agent=/bin/false
48-export OMPI_MCA_rmaps_base_oversubscribe=1
49+export PRTE_MCA_plm_ssh_agent=/bin/false
50+export PRTE_MCA_rmaps_default_mapping_policy=:oversubscribe
51 # MPI is typically more efficient with 1 thread per process
52 export OMP_NUM_THREADS=1
53
54diff --git a/debian/tests/adios2-mpi-test b/debian/tests/adios2-mpi-test
55index c6e5e91..3318f5a 100644
56--- a/debian/tests/adios2-mpi-test
57+++ b/debian/tests/adios2-mpi-test
58@@ -8,8 +8,8 @@ set -e
59 DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
60 DEB_HOST_ARCH_ENDIAN=$(dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)
61
62-export OMPI_MCA_plm_rsh_agent=/bin/false
63-export OMPI_MCA_rmaps_base_oversubscribe=1
64+export PRTE_MCA_plm_ssh_agent=/bin/false
65+export PRTE_MCA_rmaps_default_mapping_policy=:oversubscribe
66 # MPI is typically more efficient with 1 thread per process
67 export OMP_NUM_THREADS=1
68

Subscribers

People subscribed via source and target branches