openkylin
/
openmpi
mirror of https://gitee.com/openkylin/openmpi.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

changed debian/source/format to native

This commit is contained in:
luoyaoming 2022-11-01 14:46:01 +08:00
parent 366131c822
commit 833b404cff
14 changed files with 1 additions and 10906 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
debian/patches/build_hurd vendored
View File

@ -1,152 +0,0 @@
Description: Fix build problems on hurd-i386
This patch allows Open MPI to build on Debian GNU/HURD.
.
Also, the memory:linux MCA component is disabled, since its use of POSIX API
in malloc hooks called very early at startup causes troubles.
.
Also changes by Samuel Thibault <sthibault@debian.org>
See bugs.debian.org/846965
Author: Pino Toscano <pino@debian.org>
Forwarded: partially
Last-Update: 2018-10-24
Index: openmpi-4.1.0/opal/util/stacktrace.c
===================================================================
--- openmpi-4.1.0.orig/opal/util/stacktrace.c
+++ openmpi-4.1.0/opal/util/stacktrace.c
@@ -588,8 +588,12 @@ int opal_util_register_stackhandlers (vo
/* Setup the signals to catch */
memset(&act, 0, sizeof(act));
+#ifdef SA_SIGINFO
act.sa_sigaction = show_stackframe;
act.sa_flags = SA_SIGINFO;
+#else
+ act.sa_handler = show_stackframe_handler;
+#endif
#ifdef SA_ONESHOT
act.sa_flags |= SA_ONESHOT;
#else
Index: openmpi-4.1.0/orte/mca/odls/base/odls_base_default_fns.c
===================================================================
--- openmpi-4.1.0.orig/orte/mca/odls/base/odls_base_default_fns.c
+++ openmpi-4.1.0/orte/mca/odls/base/odls_base_default_fns.c
@@ -859,7 +859,11 @@ static int setup_path(orte_app_context_t
* again not match getcwd! This is beyond our control - we are only
* ensuring they start out matching.
*/
+#if !defined(MAXPATHLEN) && defined(__GLIBC__)
+ basedir = get_current_dir_name();
+#else
getcwd(dir, sizeof(dir));
+#endif
*wdir = strdup(dir);
opal_setenv("PWD", dir, true, &app->env);
/* update the initial wdir value too */
@@ -1068,7 +1072,11 @@ void orte_odls_base_default_launch_local
orte_app_context_t *app;
orte_proc_t *child=NULL;
int rc=ORTE_SUCCESS;
- char basedir[MAXPATHLEN];
+#if !defined(MAXPATHLEN) && defined(__GLIBC__)
+ char *basedir=NULL;
+#else
+ char basedir[MAXPATHLEN];
+#endif
int j, idx;
int total_num_local_procs = 0;
orte_odls_launch_local_t *caddy = (orte_odls_launch_local_t*)cbdata;
@@ -2064,7 +2072,11 @@ int orte_odls_base_default_restart_proc(
* bouncing around as we execute this app, but we will always return
* to this place as our default directory
*/
+#if !defined(MAXPATHLEN) && defined(__GLIBC__)
+ basedir = get_current_dir_name();
+#else
getcwd(basedir, sizeof(basedir));
+#endif
/* find this child's jobdat */
if (NULL == (jobdat = orte_get_job_data_object(child->name.jobid))) {
Index: openmpi-4.1.0/ompi/include/ompi_config.h
===================================================================
--- openmpi-4.1.0.orig/ompi/include/ompi_config.h
+++ openmpi-4.1.0/ompi/include/ompi_config.h
@@ -28,6 +28,10 @@
#include "opal_config.h"
+#ifndef PATH_MAX /* Hurd */
+#define PATH_MAX 65535
+#endif
+
#define OMPI_IDENT_STRING OPAL_IDENT_STRING
/***********************************************************************
Index: openmpi-4.1.0/opal/mca/base/mca_base_var.c
===================================================================
--- openmpi-4.1.0.orig/opal/mca/base/mca_base_var.c
+++ openmpi-4.1.0/opal/mca/base/mca_base_var.c
@@ -51,6 +51,14 @@
#include "opal/util/opal_environ.h"
#include "opal/runtime/opal.h"
+#ifndef MAXPATHLEN /* Hurd */
+#define MAXPATHLEN 65535
+#endif
+
+#ifndef PATH_MAX /* Hurd */
+#define PATH_MAX 65535
+#endif
+
/*
* local variables
*/
Index: openmpi-4.1.0/orte/include/orte_config.h
===================================================================
--- openmpi-4.1.0.orig/orte/include/orte_config.h
+++ openmpi-4.1.0/orte/include/orte_config.h
@@ -26,6 +26,13 @@
#include "opal_config.h"
+#ifndef PATH_MAX /* Hurd */
+#define PATH_MAX 65535
+#endif
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 65535
+#endif
+
#define ORTE_IDENT_STRING OPAL_IDENT_STRING
# if OPAL_C_HAVE_VISIBILITY
Index: openmpi-4.1.0/ompi/mca/fbtl/posix/fbtl_posix_preadv.c
===================================================================
--- openmpi-4.1.0.orig/ompi/mca/fbtl/posix/fbtl_posix_preadv.c
+++ openmpi-4.1.0/ompi/mca/fbtl/posix/fbtl_posix_preadv.c
@@ -32,6 +32,10 @@
static ssize_t mca_fbtl_posix_preadv_datasieving (ompio_file_t *fh);
static ssize_t mca_fbtl_posix_preadv_generic (ompio_file_t *fh);
+#ifndef IOV_MAX
+#define IOV_MAX 1024
+#endif
+
ssize_t mca_fbtl_posix_preadv (ompio_file_t *fh )
{
ssize_t bytes_read=0, ret_code=0;
Index: openmpi-4.1.0/ompi/mca/fbtl/posix/fbtl_posix_pwritev.c
===================================================================
--- openmpi-4.1.0.orig/ompi/mca/fbtl/posix/fbtl_posix_pwritev.c
+++ openmpi-4.1.0/ompi/mca/fbtl/posix/fbtl_posix_pwritev.c
@@ -33,6 +33,10 @@
static ssize_t mca_fbtl_posix_pwritev_datasieving (ompio_file_t *fh );
static ssize_t mca_fbtl_posix_pwritev_generic (ompio_file_t *fh );
+#ifndef IOV_MAX
+#define IOV_MAX 1024
+#endif
+
ssize_t mca_fbtl_posix_pwritev(ompio_file_t *fh )
{
ssize_t bytes_written=0, ret_code=0;

17
debian/patches/fix-underlinking.patch vendored
View File

@ -1,17 +0,0 @@
Desciption: Fix underlinking
Prevents symbol lookup error: ../openmpi4/mca_mtl_ofi.so:
undefined symbol: fi_dupinfo when linked with --as-needed
Bug-Debian: https://bugs.debian.org/899104
Author: Graham Inggs <ginggs@debian.org>
Last-Update: 2018-05-23
Index: openmpi-4.1.0/ompi/mca/mtl/ofi/Makefile.am
===================================================================
--- openmpi-4.1.0.orig/ompi/mca/mtl/ofi/Makefile.am
+++ openmpi-4.1.0/ompi/mca/mtl/ofi/Makefile.am
@@ -1,4 +1,4 @@
-#
+
# Copyright (c) 2013-2015 Intel, Inc. All rights reserved
#
# Copyright (c) 2014-2019 Cisco Systems, Inc. All rights reserved

240
debian/patches/hppa.patch vendored
View File

@ -1,240 +0,0 @@
Author: Helge Deller <deller@gmx.de>
Description: Support for the HPPA architecture
Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776730
Last-Updated: 2016-09-04
Forwarded: no
Index: openmpi-4.1.0/config/opal_config_asm.m4
===================================================================
--- openmpi-4.1.0.orig/config/opal_config_asm.m4
+++ openmpi-4.1.0/config/opal_config_asm.m4
@@ -1104,6 +1104,12 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
[AC_MSG_ERROR([No atomic primitives available for $host])])
;;
+ hppa*)
+ opal_cv_asm_arch="HPPA"
+ OPAL_ASM_SUPPORT_64BIT=0
+ OPAL_GCC_INLINE_ASSIGN='"copy 0,%0" : "=&r"(ret)'
+ ;;
+
mips-*|mips64*)
# Should really find some way to make sure that we are on
# a MIPS III machine (r4000 and later)
Index: openmpi-4.1.0/opal/include/opal/sys/architecture.h
===================================================================
--- openmpi-4.1.0.orig/opal/include/opal/sys/architecture.h
+++ openmpi-4.1.0/opal/include/opal/sys/architecture.h
@@ -36,6 +36,7 @@
#define OPAL_X86_64 0030
#define OPAL_POWERPC32 0050
#define OPAL_POWERPC64 0051
+#define OPAL_HPPA 0120
#define OPAL_SPARC 0060
#define OPAL_SPARCV9_32 0061
#define OPAL_SPARCV9_64 0062
Index: openmpi-4.1.0/opal/include/opal/sys/hppa/atomic.h
===================================================================
--- /dev/null
+++ openmpi-4.1.0/opal/include/opal/sys/hppa/atomic.h
@@ -0,0 +1,95 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ * University Research and Technology
+ * Corporation. All rights reserved.
+ * Copyright (c) 2004-2013 The University of Tennessee and The University
+ * of Tennessee Research Foundation. All rights
+ * reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ * University of Stuttgart. All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ * All rights reserved.
+ * Copyright (c) 2011 Sandia National Laboratories. All rights reserved.
+ * Copyright (c) 2014 Los Alamos National Security, LLC. All rights
+ * reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef OPAL_SYS_ARCH_ATOMIC_H
+#define OPAL_SYS_ARCH_ATOMIC_H 1
+
+/**********************************************************************
+ *
+ * Memory Barriers
+ *
+ *********************************************************************/
+#define OPAL_HAVE_ATOMIC_MEM_BARRIER 1
+
+static inline void opal_atomic_mb(void)
+{
+ __sync_synchronize();
+}
+
+static inline void opal_atomic_rmb(void)
+{
+ __sync_synchronize();
+}
+
+static inline void opal_atomic_wmb(void)
+{
+ __sync_synchronize();
+}
+
+#if OPAL_WANT_SMP_LOCKS
+#define MB() opal_atomic_mb()
+#else
+#define MB()
+#endif
+
+/**********************************************************************
+ *
+ * Atomic math operations
+ *
+ *********************************************************************/
+
+#define OPAL_HAVE_ATOMIC_CMPSET_32 1
+static inline int opal_atomic_cmpset_acq_32( volatile int32_t *addr,
+ int32_t oldval, int32_t newval)
+{
+ return __sync_bool_compare_and_swap(addr, oldval, newval);
+}
+
+
+static inline int opal_atomic_cmpset_rel_32( volatile int32_t *addr,
+ int32_t oldval, int32_t newval)
+{
+ return __sync_bool_compare_and_swap(addr, oldval, newval);}
+
+static inline int opal_atomic_cmpset_32( volatile int32_t *addr,
+ int32_t oldval, int32_t newval)
+{
+ return __sync_bool_compare_and_swap(addr, oldval, newval);
+}
+
+#define OPAL_HAVE_ATOMIC_MATH_32 1
+
+#define OPAL_HAVE_ATOMIC_ADD_32 1
+static inline int32_t opal_atomic_add_32(volatile int32_t *addr, int32_t delta)
+{
+ return __sync_add_and_fetch(addr, delta);
+}
+
+#define OPAL_HAVE_ATOMIC_SUB_32 1
+static inline int32_t opal_atomic_sub_32(volatile int32_t *addr, int32_t delta)
+{
+ return __sync_sub_and_fetch(addr, delta);
+}
+
+#define OPAL_HAVE_ATOMIC_CMPSET_64 0
+
+#endif /* ! OPAL_SYS_ARCH_ATOMIC_H */
Index: openmpi-4.1.0/opal/include/opal/sys/hppa/Makefile.am
===================================================================
--- /dev/null
+++ openmpi-4.1.0/opal/include/opal/sys/hppa/Makefile.am
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+# University Research and Technology
+# Corporation. All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+# of Tennessee Research Foundation. All rights
+# reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+# University of Stuttgart. All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+# All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from opal/include/Makefile.am
+
+headers += \
+ opal/sys/hppa/atomic.h \
+ opal/sys/hppa/timer.h
Index: openmpi-4.1.0/opal/include/opal/sys/hppa/timer.h
===================================================================
--- /dev/null
+++ openmpi-4.1.0/opal/include/opal/sys/hppa/timer.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ * University Research and Technology
+ * Corporation. All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * of Tennessee Research Foundation. All rights
+ * reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ * University of Stuttgart. All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ * All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef OPAL_SYS_ARCH_TIMER_H
+#define OPAL_SYS_ARCH_TIMER_H 1
+
+
+typedef uint64_t opal_timer_t;
+
+static inline opal_timer_t
+opal_sys_timer_get_cycles(void)
+{
+ return 0;
+}
+
+#define OPAL_HAVE_SYS_TIMER_GET_CYCLES 0
+
+#endif /* ! OPAL_SYS_ARCH_TIMER_H */
Index: openmpi-4.1.0/opal/include/opal/sys/timer.h
===================================================================
--- openmpi-4.1.0.orig/opal/include/opal/sys/timer.h
+++ openmpi-4.1.0/opal/include/opal/sys/timer.h
@@ -90,6 +90,8 @@ BEGIN_C_DECLS
#include "opal/sys/sparcv9/timer.h"
#elif OPAL_ASSEMBLY_ARCH == OPAL_MIPS
#include "opal/sys/mips/timer.h"
+#elif OPAL_ASSEMBLY_ARCH == OPAL_HPPA
+#include "opal/sys/hppa/timer.h"
#endif
#ifndef DOXYGEN
Index: openmpi-4.1.0/opal/mca/timer/linux/configure.m4
===================================================================
--- openmpi-4.1.0.orig/opal/mca/timer/linux/configure.m4
+++ openmpi-4.1.0/opal/mca/timer/linux/configure.m4
@@ -47,7 +47,7 @@ AC_DEFUN([MCA_opal_timer_linux_CONFIG],[
[timer_linux_happy="no"])])
case "${host}" in
- i?86-*linux*|x86_64*linux*|ia64-*linux*|powerpc-*linux*|powerpc64-*linux*|powerpc64le-*linux*|powerpcle-*linux*|sparc*-*linux*|aarch64-*linux*)
+ i?86-*linux*|x86_64*linux*|ia64-*linux*|powerpc-*linux*|powerpc64-*linux*|powerpc64le-*linux*|powerpcle-*linux*|sparc*-*linux*|aarch64-*linux*|hppa*-*linux*)
AS_IF([test "$timer_linux_happy" = "yes"],
[AS_IF([test -r "/proc/cpuinfo"],
[timer_linux_happy="yes"],
Index: openmpi-4.1.0/opal/include/opal/sys/atomic.h
===================================================================
--- openmpi-4.1.0.orig/opal/include/opal/sys/atomic.h
+++ openmpi-4.1.0/opal/include/opal/sys/atomic.h
@@ -169,6 +169,8 @@ enum {
#include "opal/sys/ia32/atomic.h"
#elif OPAL_ASSEMBLY_ARCH == OPAL_IA64
#include "opal/sys/ia64/atomic.h"
+#elif OPAL_ASSEMBLY_ARCH == OPAL_HPPA
+#include "opal/sys/hppa/atomic.h"
#elif OPAL_ASSEMBLY_ARCH == OPAL_MIPS
#include "opal/sys/mips/atomic.h"
#elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC32

11
debian/patches/ia64.patch vendored
View File

@ -1,11 +0,0 @@
--- a/opal/include/opal/sys/timer.h
+++ b/opal/include/opal/sys/timer.h
@@ -78,8 +78,6 @@
#include "opal/sys/arm64/timer.h"
#elif OPAL_ASSEMBLY_ARCH == OPAL_IA32
#include "opal/sys/ia32/timer.h"
-#elif OPAL_ASSEMBLY_ARCH == OPAL_IA64
-#include "opal/sys/ia64/timer.h"
#elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC32
#include "opal/sys/powerpc/timer.h"
#elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC64

26
debian/patches/libdir.patch vendored
View File

@ -1,26 +0,0 @@
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Change install libdir to openmpi3
This is needed to ensure that libopenmpi2, libopenmpi3 do not collide.
Last-Updated: 2019-03-09
Forwarded: no
Index: openmpi-4.1.0/configure.ac
===================================================================
--- openmpi-4.1.0.orig/configure.ac
+++ openmpi-4.1.0/configure.ac
@@ -1444,11 +1444,13 @@ esac
# easier to deal with the problem of opal, orte, and ompi built from
# their own tarballs, with their own PACKAGE variables.
opaldatadir='${datadir}/openmpi'
-opallibdir='${libdir}/openmpi'
+opallibdir='${libdir}/openmpi3'
opalincludedir='${includedir}/openmpi'
+pkglibdir='${libdir}/openmpi3'
AC_SUBST(opaldatadir)
AC_SUBST(opallibdir)
AC_SUBST(opalincludedir)
+AC_SUBST(pkglibdir)
OPAL_SET_MCA_PREFIX([OMPI_MCA_])
OPAL_SET_MCA_CMD_LINE_ID([mca])

73
debian/patches/manpage_macros vendored
View File

@ -1,73 +0,0 @@
Description: Fix problems in manpages
In some man page headers, a macro (-*-) is used which makes lintian
choke and probably should not be there anyway.
Author: Alastair McKinstry <mckinstry@debian.org>
Forwarded: no
Last-Update: 2018-04-08
Index: openmpi-4.1.0/ompi/mpi/man/man3/MPI_T_enum_get_info.3in
===================================================================
--- openmpi-4.1.0.orig/ompi/mpi/man/man3/MPI_T_enum_get_info.3in
+++ openmpi-4.1.0/ompi/mpi/man/man3/MPI_T_enum_get_info.3in
@@ -32,7 +32,7 @@ Length of the string and/or buffer for n
.SH OUTPUT PARAMETERS
.ft R
-.TP li
+.TP 1i
num
number of discrete values represented by this enumeration.
.TP 1i
Index: openmpi-4.1.0/ompi/mpi/man/man3/MPI_T_pvar_get_info.3in
===================================================================
--- openmpi-4.1.0.orig/ompi/mpi/man/man3/MPI_T_pvar_get_info.3in
+++ openmpi-4.1.0/ompi/mpi/man/man3/MPI_T_pvar_get_info.3in
@@ -131,7 +131,7 @@ MPI_T_PVAR_CLASS_GENERIC
Variable does not fit into any other class. Can by represented by an type supported by the MPI tool
information interface (see DATATYPE). Starting value is variable specific.
-For more information see MPI-3 \[char 167] 14.3.7.
+For more information see MPI-3 \[char167] 14.3.7.
.SH DATATYPE
.ft R
Index: openmpi-4.1.0/ompi/mpi/man/man3/MPI_Get.3in
===================================================================
--- openmpi-4.1.0.orig/ompi/mpi/man/man3/MPI_Get.3in
+++ openmpi-4.1.0/ompi/mpi/man/man3/MPI_Get.3in
@@ -104,7 +104,7 @@ window object used for communication (ha
.SH OUTPUT PARAMETER
.ft R
-.TP li
+.TP 1i
request
MPI_Rget: RMA request
.TP 1i
Index: openmpi-4.1.0/ompi/mpi/man/man3/MPI_T_enum_get_item.3in
===================================================================
--- openmpi-4.1.0.orig/ompi/mpi/man/man3/MPI_T_enum_get_item.3in
+++ openmpi-4.1.0/ompi/mpi/man/man3/MPI_T_enum_get_item.3in
@@ -36,7 +36,7 @@ Length of the string and/or buffer for n
.SH OUTPUT PARAMETERS
.ft R
-.TP li
+.TP 1i
value
Variable value.
.TP 1i
Index: openmpi-4.1.0/orte/mca/sstore/orte_sstore.7in
===================================================================
--- openmpi-4.1.0.orig/orte/mca/sstore/orte_sstore.7in
+++ openmpi-4.1.0/orte/mca/sstore/orte_sstore.7in
@@ -12,8 +12,7 @@
.\" **************************
.SH NAME
.
-Open RTE MCA File Management (SStore) Framework \- Overview of Open RTE's SStore
-framework, and selected modules. #PACKAGE_NAME# #PACKAGE_VERSION#
+ORTE_SSTORE \- Overview of Open RTE's SStore framework, and selected modules
.
.\" **************************
.\" Description Section

20
debian/patches/mpifort.patch vendored
View File

@ -1,20 +0,0 @@
Index: openmpi-4.0.2/ompi/tools/wrappers/mpifort-wrapper-data.txt.in
===================================================================
--- openmpi-4.0.2.orig/ompi/tools/wrappers/mpifort-wrapper-data.txt.in
+++ openmpi-4.0.2/ompi/tools/wrappers/mpifort-wrapper-data.txt.in
@@ -12,6 +12,7 @@ language=Fortran
compiler_env=FC
compiler_flags_env=FCFLAGS
compiler=@FC@
+compiler_version=@COMPILER_VERSION@
preprocessor_flags=
compiler_flags=@OMPI_WRAPPER_EXTRA_FCFLAGS@
linker_flags=@OMPI_WRAPPER_EXTRA_FC_LDFLAGS@
@@ -24,5 +25,5 @@ libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@
dyn_lib_file=lib@OMPI_LIBMPI_NAME@.@OPAL_DYN_LIB_SUFFIX@
static_lib_file=lib@OMPI_LIBMPI_NAME@.a
required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@
-includedir=${includedir}
-libdir=${libdir}
+includedir=${libdir}/../../fortran/@COMPILER_VERSION@/openmpi
+libdir=${libdir}/fortran/@FC@

26
debian/patches/no-warning-unused.patch vendored
View File

@ -1,26 +0,0 @@
Description: Turn off warning that openfabric is not available
because it breaks some overlying layers/appications in Debian.
Also exclude openfabric/openib by default.
See: #979041
Author: Alastair McKinstry <mckinstry@debian.org>
Last-Updated: 2021-09-02
Forwarded: not-needed
--- a/opal/etc/openmpi-mca-params.conf
+++ b/opal/etc/openmpi-mca-params.conf
@@ -57,3 +57,14 @@
# See "ompi_info --param all all --level 9" for a full listing of Open
# MPI MCA parameters available and their default values.
+
+# Silence this warning on Debian, as many systems don't have openfabric
+# but the warning breaks higher layers or application
+btl_base_warn_component_unused=0
+# Avoid openib an in case applications use fork: see https://github.com/ofiwg/libfabric/issues/6332
+# If you wish to use openib and know your application is safe, remove the following:
+# Similarly for UCX: https://github.com/open-mpi/ompi/issues/8367
+mtl = ^ofi
+btl = ^uct,openib,ofi
+pml = ^ucx
+osc = ^ucx,pt2pt
\ No newline at end of file

23
debian/patches/opal_fifo.patch vendored
View File

@ -1,23 +0,0 @@
Description: fix test-suite to build on ppc64el
Test suite hangs on ppc64el. This is due to a bug in test/class/opal_fifo.c.
thread_test() must end with pthread_exit(NULL), not return NULL.
Author: Thibaut Paumard <thibaut@debian.org>
Origin: Vendor
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=848218
Forwarded: no
Last-Update: 2016-12-15
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: openmpi-4.1.0/test/class/opal_fifo.c
===================================================================
--- openmpi-4.1.0.orig/test/class/opal_fifo.c
+++ openmpi-4.1.0/test/class/opal_fifo.c
@@ -63,7 +63,7 @@ static void *thread_test (void *arg) {
printf ("Atomics thread finished. Time: %d s %d us %d nsec/poppush\n", (int) total.tv_sec,
(int)total.tv_usec, (int)(timing / 1e-9));
- return NULL;
+ pthread_exit(NULL);
}
static void *thread_test_exhaust (void *arg) {

26
debian/patches/pkg-config.patch vendored
View File

@ -1,26 +0,0 @@
Description: Enable non-gfortran compilation
Author: Alastair McKinstry <mckinstry@debian.org>
Last-Updated: 2020-01-13
Forwarded: no
Index: openmpi-4.0.2/ompi/tools/wrappers/ompi-fort.pc.in
===================================================================
--- openmpi-4.0.2.orig/ompi/tools/wrappers/ompi-fort.pc.in
+++ openmpi-4.0.2/ompi/tools/wrappers/ompi-fort.pc.in
@@ -11,11 +11,15 @@ exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
pkgincludedir=@opalincludedir@
+# override $fortran with --define-variable when building on non-gfortran compile
+fortran=gfortran
+fortrandir=${libdir}/../../fortran/${fortran}
+
#
# Note that -lopen-pal and all the EXTRA_LIBS are only necessary when
# static linking (they're pulled in by libopen-rte.so's implicit
# dependencies), so only list these in Libs.private.
#
-Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ @OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@
+Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ @OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@
Libs.private: -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FCFLAGS@

12
debian/patches/series vendored
View File

@ -1,12 +0,0 @@
pkg-config.patch
mpifort.patch
manpage_macros
build_hurd
libdir.patch
hppa.patch
opal_fifo.patch
verbose-ompi-rules.patch
fix-underlinking.patch
#version-script.patch
no-warning-unused.patch
ia64.patch

16
debian/patches/verbose-ompi-rules.patch vendored
View File

@ -1,16 +0,0 @@
Description: Makefile.ompi-rules: don't set silent building
Author: Adrian Bunk <bunk@debian.org>
Index: openmpi-4.1.0/Makefile.ompi-rules
===================================================================
--- openmpi-4.1.0.orig/Makefile.ompi-rules
+++ openmpi-4.1.0/Makefile.ompi-rules
@@ -53,7 +53,7 @@ endif
# A little verbosity magic; "make" will show the terse output. "make
# V=1" will show the actual commands used (just like the other
# Automake-generated compilation/linker rules).
-V=0
+#V=0
OMPI_V_LN_S = $(ompi__v_LN_S_$V)
ompi__v_LN_S_ = $(ompi__v_LN_S_$AM_DEFAULT_VERBOSITY)

10263
debian/patches/version-script.patch vendored
View File

File diff suppressed because it is too large Load Diff

2
debian/source/format vendored
View File

@ -1 +1 @@
3.0 (quilt) 3.0 (native)