[Pkg-openmpi-commits] r373 - in /openmpi/trunk/debian: changelog control libopenmpi-dev.links patches/opal_thread_add64.patch patches/series rules
mckinstry at users.alioth.debian.org
mckinstry at users.alioth.debian.org
Tue Mar 8 15:31:18 UTC 2016
Author: mckinstry
Date: Tue Mar 8 15:31:17 2016
New Revision: 373
URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=373
Log:
* Drop Suggests: for openmpi-checkpoint, which no longer exists.
Closes: #816648.
* libopenmpi1.10: Depend on libhwloc-plugins. Closes: #790540.
* opal_thread_add64.patch: Fix for OPAL_THREAD_ADD64 not
defined on 32-bit systems. Closes: #816303.
* Fix broken symlinks in -dev package. Closes: #817020.
Added:
openmpi/trunk/debian/patches/opal_thread_add64.patch
Modified:
openmpi/trunk/debian/changelog
openmpi/trunk/debian/control
openmpi/trunk/debian/libopenmpi-dev.links
openmpi/trunk/debian/patches/series
openmpi/trunk/debian/rules
Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=373&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Tue Mar 8 15:31:17 2016
@@ -1,3 +1,14 @@
+openmpi (1.10.2-9) UNRELEASED; urgency=medium
+
+ * Drop Suggests: for openmpi-checkpoint, which no longer exists.
+ Closes: #816648.
+ * libopenmpi1.10: Depend on libhwloc-plugins. Closes: #790540.
+ * opal_thread_add64.patch: Fix for OPAL_THREAD_ADD64 not
+ defined on 32-bit systems. Closes: #816303.
+ * Fix broken symlinks in -dev package. Closes: #817020.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 08 Mar 2016 11:00:41 +0000
+
openmpi (1.10.2-8) unstable; urgency=medium
* Don't ship opal.pc link that conflicts with libopal-dev. Closes: #814515
Modified: openmpi/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/control?rev=373&op=diff
==============================================================================
--- openmpi/trunk/debian/control (original)
+++ openmpi/trunk/debian/control Tue Mar 8 15:31:17 2016
@@ -20,7 +20,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-common (= ${source:Version})
Conflicts: openmpi-bin
-Suggests: gfortran, openmpi-checkpoint [amd64 armel armhf i386 powerpc]
+Suggests: gfortran
Description: high performance message passing library -- binaries
Open MPI is a project combining technologies and resources from several other
projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in order to build the best
@@ -65,7 +65,7 @@
Section: libs
Architecture: any
Recommends: openmpi-bin
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libhwloc-plugins
Conflicts: libopenmpi1.6
Description: high performance message passing library -- shared library
Open MPI is a project combining technologies and resources from several other
Modified: openmpi/trunk/debian/libopenmpi-dev.links
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi-dev.links?rev=373&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi-dev.links (original)
+++ openmpi/trunk/debian/libopenmpi-dev.links Tue Mar 8 15:31:17 2016
@@ -7,16 +7,16 @@
usr/share/man/man1/opal_wrapper.1 usr/share/man/man1/ortec++.1
usr/share/man/man1/opal_wrapper.1 usr/share/man/man1/ortecc.1
## SONAME symlinks
-usr/lib/libmca_common_sm.so.3 usr/lib/libmca_common_sm.so
+usr/lib/libmca_common_sm.so.4 usr/lib/libmca_common_sm.so
usr/lib/libmca_common_verbs.so.7 usr/lib/libmca_common_verbs.so
usr/lib/libmpi_cxx.so.1 usr/lib/libmpi_cxx.so
usr/lib/libmpi_mpifh.so.12 usr/lib/libmpi_mpifh.so
usr/lib/libompitrace.so.0 usr/lib/libompitrace.so
-usr/lib/libopen-pal.so.4 usr/lib/libopen-pal.so
-usr/lib/libopen-rte.so.4 usr/lib/libopen-rte.so
-usr/lib/liboshmem.so.8.1.0 usr/lib/liboshmem.so
-usr/lib/libmpi_usempif08.so.11.1.0 usr/lib/libmpi_usempif08.so
-usr/lib/libmpi_usempi_ignore_tkr.so.6.1.0 usr/lib/libmpi_usempi_ignore_tkr.so
+usr/lib/libopen-pal.so.13 usr/lib/libopen-pal.so
+usr/lib/libopen-rte.so.12 usr/lib/libopen-rte.so
+usr/lib/liboshmem.so.8. usr/lib/liboshmem.so
+usr/lib/libmpi_usempif08.so.11 usr/lib/libmpi_usempif08.so
+usr/lib/libmpi_usempi_ignore_tkr.so.6 usr/lib/libmpi_usempi_ignore_tkr.so
## Convenience link for header files, see bug #493875
usr/lib/openmpi/include/ usr/include/openmpi
# pkg-config
Added: openmpi/trunk/debian/patches/opal_thread_add64.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/opal_thread_add64.patch?rev=373&op=file
==============================================================================
--- openmpi/trunk/debian/patches/opal_thread_add64.patch (added)
+++ openmpi/trunk/debian/patches/opal_thread_add64.patch Tue Mar 8 15:31:17 2016
@@ -0,0 +1,109 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openmpi (1.10.2-8) unstable; urgency=medium
+ .
+ * Don't ship opal.pc link that conflicts with libopal-dev. Closes: #814515
+ * openmpi-doc breaks/replaces openmpi-checkpoint (<< 1.10.2).
+ Closes: #814518.
+Author: Alastair McKinstry <mckinstry at debian.org>
+Bug-Debian: https://bugs.debian.org/814515
+Bug-Debian: https://bugs.debian.org/814518
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openmpi-1.10.2.orig/ompi/mca/btl/portals4/btl_portals4.c
++++ openmpi-1.10.2/ompi/mca/btl/portals4/btl_portals4.c
+@@ -319,7 +319,11 @@ mca_btl_portals4_prepare_src(struct mca_
+
+ frag->segments[0].base.seg_len = max_data;
+ frag->segments[0].base.seg_addr.pval = iov.iov_base;
++#ifdef OPAL_HAVE_ATOMIC_MATH_64
+ frag->segments[0].key = OPAL_THREAD_ADD64(&(portals4_btl->portals_rdma_key), 1);
++#else
++ frag->segments[0].key = OPAL_THREAD_ADD32(&(portals4_btl->portals_rdma_key), 1);
++#endif
+ frag->base.des_src_cnt = 1;
+
+ /* either a put or get. figure out which later */
+@@ -405,7 +409,11 @@ mca_btl_portals4_prepare_dst(struct mca_
+
+ frag->segments[0].base.seg_len = *size;
+ opal_convertor_get_current_pointer( convertor, (void**)&(frag->segments[0].base.seg_addr.pval) );
++#ifdef OPAL_HAVE_ATOMIC_MATH_64
+ frag->segments[0].key = OPAL_THREAD_ADD64(&(portals4_btl->portals_rdma_key), 1);
++#else
++ frag->segments[0].key = OPAL_THREAD_ADD32(&(portals4_btl->portals_rdma_key), 1);
++#endif
+ frag->base.des_src = NULL;
+ frag->base.des_src_cnt = 0;
+ frag->base.des_dst = &frag->segments[0].base;
+--- openmpi-1.10.2.orig/ompi/mca/mtl/portals4/mtl_portals4_send.c
++++ openmpi-1.10.2/ompi/mca/mtl/portals4/mtl_portals4_send.c
+@@ -411,7 +411,11 @@ ompi_mtl_portals4_send_start(struct mca_
+ ret = ompi_mtl_datatype_pack(convertor, &start, &length, &free_after);
+ if (OMPI_SUCCESS != ret) return ret;
+
++#ifdef OPAL_HAVE_ATOMIC_MATH_64
+ ptl_request->opcount = OPAL_THREAD_ADD64((int64_t*)&ompi_mtl_portals4.opcount, 1);
++#else
++ ptl_request->opcount = OPAL_THREAD_ADD32((int64_t*)&ompi_mtl_portals4.opcount, 1);
++#endif
+ ptl_request->buffer_ptr = (free_after) ? start : NULL;
+ ptl_request->event_count = 0;
+
+--- openmpi-1.10.2.orig/ompi/mca/osc/portals4/osc_portals4_active_target.c
++++ openmpi-1.10.2/ompi/mca/osc/portals4/osc_portals4_active_target.c
+@@ -102,7 +102,11 @@ ompi_osc_portals4_complete(struct ompi_w
+ PTL_SUM,
+ PTL_INT32_T);
+ if (ret != OMPI_SUCCESS) return ret;
++#ifdef OPAL_HAVE_ATOMIC_MATH_64
+ OPAL_THREAD_ADD64(&module->opcount, 1);
++#else
++ OPAL_THREAD_ADD32(&module->opcount, 1);
++#endif
+ }
+
+ ret = ompi_osc_portals4_complete_all(module);
+@@ -151,7 +155,11 @@ ompi_osc_portals4_post(struct ompi_group
+ PTL_SUM,
+ PTL_INT32_T);
+ if (ret != OMPI_SUCCESS) return ret;
++#ifdef OPAL_HAVE_ATOMIC_MATH_64
+ OPAL_THREAD_ADD64(&module->opcount, 1);
++#else
++ OPAL_THREAD_ADD64(&module->opcount, 1);
++#endif
+ }
+ } else {
+ module->post_group = NULL;
+--- openmpi-1.10.2.orig/ompi/mca/osc/pt2pt/osc_pt2pt_passive_target.c
++++ openmpi-1.10.2/ompi/mca/osc/pt2pt/osc_pt2pt_passive_target.c
+@@ -331,7 +331,11 @@ static int ompi_osc_pt2pt_lock_internal
+ lock->target = target;
+ lock->lock_acks_expected = 0;
+ lock->unlock_acks_expected = 0;
++#ifdef OPAL_HAVE_ATOMIC_MATH_64
+ lock->serial_number = OPAL_THREAD_ADD64((int64_t *) &module->lock_serial_number, 1);
++#else
++ lock->serial_number = OPAL_THREAD_ADD64((int64_t *) &module->lock_serial_number, 1);
++#endif
+ lock->type = lock_type;
+ lock->assert = assert;
+
Modified: openmpi/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/series?rev=373&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/series (original)
+++ openmpi/trunk/debian/patches/series Tue Mar 8 15:31:17 2016
@@ -8,3 +8,4 @@
reproducible-build.patch
fix-man-pages.patch
x32.patch
+opal_thread_add64.patch
Modified: openmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/rules?rev=373&op=diff
==============================================================================
--- openmpi/trunk/debian/rules (original)
+++ openmpi/trunk/debian/rules Tue Mar 8 15:31:17 2016
@@ -94,7 +94,7 @@
cp -a debian/tmp/usr/bin/oshmem_info debian/openmpi-bin//usr/bin/ ; \
cp -a debian/tmp/usr/bin/oshcc debian/libopenmpi-dev/usr/bin ; \
cp -a debian/tmp/usr/bin/oshfort debian/libopenmpi-dev/usr/bin ; \
- cp -a debian/tmp/usr/lib/openmpi/lib/liboshmem.so.8.1.0 usr/lib/libopenmpi1.10/usr/lib/openmpi/lib ; \
+ cp -a debian/tmp/usr/lib/openmpi/lib/liboshmem.so.8.1.0 debian/libopenmpi1.10/usr/lib/openmpi/lib ; \
cp -a debian/tmp/usr/share/man/man1/oshcc.1 debian/libopenmpi-dev/usr/share/man/man1 ; \
cp -a debian/tmp/usr/share/man/man1/oshfort.1 debian/libopenmpi-dev/usr/share/man/man1 ; \
cp -a debian/tmp/usr/share/man/man1/oshrun.1 debian/openmpi-bin/usr/share/man/man1 ; \
More information about the Pkg-openmpi-commits
mailing list