1
1

29741 Коммитов

Автор SHA1 Сообщение Дата
Geoff Paulsen
6cbe383163
Merge pull request #6469 from bertwesarg/v4.0.x-allow-user-to-overwrite-OMPI_ENABLE_MPI1_COMPAT
v4.0.x: Allow user to overwrite `OMPI_ENABLE_MPI1_COMPAT`
2019-03-07 06:18:15 -06:00
Bert Wesarg
73134ab9e7 v4.0.x: Allow user to overwrite OMPI_ENABLE_MPI1_COMPAT
Follow-up to #6120.

As mentioned in [1], it may be desirable to nevertheless get the hidden
MPI 1 prototypes, for users who know what they are doing, i.e., the tools
guys. @ggouaillardet mentioned in [2], that `-DOMPI_OMIT_MPI1_COMPAT_DECLS=0`
should work, but it does not, as than we only get redefinition warnings.
See [3].

This topic does not relate to master, as we can remove the actual symbols
there, but here in v4.0.x land, the symbols are always there.

[1] https://github.com/open-mpi/ompi/pull/6120#issuecomment-443104700
[2] https://github.com/open-mpi/ompi/pull/6120#issuecomment-443117892
[3] https://github.com/open-mpi/ompi/pull/6120#issuecomment-468962596

Signed-off-by: Bert Wesarg <bert.wesarg@tu-dresden.de>
2019-03-07 09:54:20 +01:00
Howard Pritchard
8b2d804661
Merge pull request #6450 from ggouaillardet/topic/v4.0.x/usnic_test
v4.0.x: btl/usnic: fix usnic_btl_run_tests CPPFLAGS
2019-03-06 09:26:09 -07:00
Howard Pritchard
28e07b68d2
Merge pull request #6446 from rhc54/cmr40x/cnct
v4.0.x: Fix cross-mpirun connect/accept operations
2019-03-06 09:24:26 -07:00
Howard Pritchard
1bff1806cf
Merge pull request #6466 from bosilca/backport/4.x/6029
Backport/4.x/6029
2019-03-06 09:22:59 -07:00
George Bosilca
9aff3a9a54
Add more details about what is going on.
Signed-off-by: George Bosilca <bosilca@icl.utk.edu>
2019-03-05 19:43:44 -05:00
George Bosilca
e4aae6b5c8
Add a test for very large data.
Signed-off-by: George Bosilca <bosilca@icl.utk.edu>
2019-03-05 19:43:31 -05:00
Gilles Gouaillardet
320a839be9
opal/datatype: correctly handle large datatypes
Always use size_t (instead of converting to an uint32_t) in order to
correctly support large datatypes.

Thanks Ben Menadue for the initial bug report

Refs open-mpi/ompi#6016

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
2019-03-05 19:41:39 -05:00
Gilles Gouaillardet
9c5d4bb3b9 oshmem: fix macro usage in pshmem.h
pshmem.h now includes shmem.h (since open-mpi/ompi@f46130cd20) and some macros were removed at that time.

Use the OSHMEM_HAVE_C11 macro (defined in shmem.h) instead of the
previous OSHMEMP_HAVE_C11 macrso previously defined in pshmem.h

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
(cherry picked from commit 5ea939aa542605503b7926a44df10e23a344d063)
2019-03-06 00:14:19 +01:00
Bert Wesarg
d174e46dc1 OSHMEM: Let pshmem.h include shmem.h to be stand-alone again
See #6093

Signed-off-by: Bert Wesarg <bert.wesarg@tu-dresden.de>
(cherry picked from commit f46130cd20914a3c60b19c3b2ed7c4b380319ee9)
2019-03-06 00:13:34 +01:00
Jeff Squyres
8c4c982271 btl/usnic: amend Makefile.am fix from b4097626ab
Use $(AM_CPPFLAGS) in $(usnic_btl_run_tests_CPPFLAGS) so that we don't
have to replicate hard-coded values.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
(cherry picked from commit 14563770a1d64c465ee1f205c9981de39970bb33)
2019-03-05 09:42:03 -08:00
Gilles Gouaillardet
a9ba07b04e btl/usnic: fix usnic_btl_run_tests CPPFLAGS
do define the OMPI_LIBMPI_NAME macro via the CPPFLAGS.
The issue occurs when Open MPI is configured with
--enable-opal-btl-usnic-unit-tests

Thanks George Marselis for reporting this issue

Refs. open-mpi/ompi#6441

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>

(cherry picked from commit open-mpi/ompi@b4097626ab)
2019-03-05 11:02:13 +09:00
Howard Pritchard
a2bea960bc
Merge pull request #6445 from rhc54/cmr40x/slurm
v4.0.x: Update Slurm PMI configury to account for PMIx
2019-03-04 07:06:32 -07:00
Ralph Castain
b5d46494cd Fix cross-mpirun connect/accept operations
Ensure we publish all the info required to be returned to the other
mpirun when executing this operation. We need to know the daemon (and
its URI) that is hosting each of the other procs so we can do a direct
modex operation and retrieve their connection info.

Signed-off-by: Ralph Castain <rhc@pmix.org>
(cherry picked from commit 60961ceb41cde6fbdc84694748696e90ddcfb345)
2019-03-01 08:41:23 -08:00
Ralph Castain
1675b8ee65 Ensure we push/pop local AC vars in the right place
Signed-off-by: Ralph Castain <rhc@pmix.org>
(cherry picked from commit c054d4d1cc063fd22c7111d15d8b14707506bfb7)
2019-03-01 08:40:35 -08:00
Ralph Castain
0322ad028d Update slurm pmi configury to account for pmix
When Slurm is built against PMIx, some installations place a copy of the
PMIx library that Slurm is linking against in the Slurm PMI location.
Current configury ignores that location. The desired behavior is to look
for a PMIx lib in that location when --with-pmi is given. If the user
also specifies --with-pmix and gives a different location, then override
anything previously found and look for it where the user directed.

Signed-off-by: Ralph Castain <rhc@pmix.org>
(cherry picked from commit cd1b5641beca7f158360983cd31f7297548b0a3c)
2019-03-01 08:39:49 -08:00
Geoff Paulsen
c0ee7add0f
Merge pull request #6359 from gpaulsen/topic/v4.0.x/mpi1removal
Fix MPI1 function removal [v4.0.x] Issue 6114
2019-02-27 12:31:09 -06:00
Geoffrey Paulsen
6df6a3f4bc mpi.h.in: Revamp MPI-1 removed function warnings
Refs https://github.com/open-mpi/ompi/issues/6278.

This commit is intended to be cherry-picked to v4.0.x and
the following commit will ammend to this functionality for
master's removal.

Changes the prototypes for MPI removed functions in the
following ways:

There are 4 cases:

 1) User wants MPI-1 compatibility (--enable-mpi1-compatibility)

    MPI_Address (and friends) are declared in mpi.h with
    deprecation notice

 2) User does not want MPI-1 compatibility, and has a C11-capable
    compiler

    Declare an MPI_Address (etc.) macro in mpi.h, which will
    cause a compile-time error using _Static_assert C11 feature

 3) User does not want MPI-1 compatibility, and does not have a
    C11-capable compiler, but the compiler supports error function
    attributes.

    Declare an MPI_Address (etc.) macro in mpi.h, which will
    cause a compile-time error using error function attribute.

 4) User does not want MPI-1 compatibility, and does not have a
    C11-capable compiler, or a compiler that supports error
    function attributes.

    Do not declare MPI_Address (etc.) in mpi.h at all.
    Unless the user is compiling with something like -Werror,
    this will allow the user's code to compile. We are
    choosing this because it seems like a losing battle to
    make some kind of compile time error that is friendly to
    the user (and doesn't make it look like mpi.h itself is broken).

    On v4.0.x, this will allow the user code to both compile
    (albeit with a warning) and link (because the MPI_Address
    will be in the MPI library because we are preserving ABI
    back to 3.0.x).

    On master/v5.0.x, this will allow the user code to compile,
    but it will fail to link (because the MPI_Address symbol will
    not be in the MPI library).

Signed-off-by: Geoffrey Paulsen <gpaulsen@us.ibm.com>
(cherry-picked from 3136a1706cdacb3f7530937da1dcfe15d2febc79)
2019-02-27 08:25:23 -08:00
Geoff Paulsen
5a892953d9
Merge pull request #6442 from hppritcha/topic/new_update3_v4.0.1
NEWS: another update for 4.0.1
2019-02-27 09:07:09 -06:00
Howard Pritchard
8449a00a74 NEWS: another update for 4.0.1
[skip ci]

Signed-off-by: Howard Pritchard <howardp@lanl.gov>
2019-02-27 08:01:01 -07:00
Howard Pritchard
0af10b7bfe
Merge pull request #6435 from jsquyres/pr/v4.0.x/fix-hwloc-configury
Hold off running hwloc:external feature tests until after we decide i…
2019-02-26 09:07:19 -07:00
Ben Menadue
8bf3a86cb0 Hold off running hwloc:external feature tests until after we decide if we're using the internal or external component. This fixes #6430.
Signed-off-by: Ben Menadue <ben.menadue@nci.org.au>
(cherry picked from commit 17dcc7041ac272c65eb727f45c5628459cbb6055)
2019-02-25 15:09:48 -08:00
Howard Pritchard
056d7ad0a3
Merge pull request #6419 from hppritcha/topic/fix_pgi_usempif08_4.0.x
fortran:use mpif08  fix for PGI linking
2019-02-25 15:54:15 -07:00
Howard Pritchard
fd143ebb36
Merge pull request #6434 from hppritcha/topic/readme_v4.0.1
README: updates for v4.0.1 release
2019-02-25 15:52:34 -07:00
Howard Pritchard
6a8dba3952 README: updates for v4.0.1 release
fixes #6425

Signed-off-by: Howard Pritchard <howardp@lanl.gov>
2019-02-25 13:25:58 -07:00
Geoff Paulsen
1920769946
Merge pull request #6423 from abouteiller/pr6417to4.0.x
v4.x: Cart/Graph create would not run the next_cid  algorithm
2019-02-22 16:25:38 -06:00
Geoff Paulsen
4b317e0c4f
Merge pull request #6421 from hppritcha/topic/version_v401
VERSION: update for v4.0.1rc1 release
2019-02-22 15:56:17 -06:00
Aurelien Bouteiller
d6e8d51d5f
Cart/Graph create would not run the next_cid algorithm and create
disjoint communicator with inconsistent cid.

Signed-off-by: Aurelien Bouteiller <bouteill@icl.utk.edu>
2019-02-22 15:11:56 -05:00
Howard Pritchard
a791db2dc3
Merge pull request #6420 from hppritcha/topic/license_v401
LICENSE: for v4.0.1
2019-02-22 13:03:45 -07:00
Howard Pritchard
8db349f64a VERSION: update for v4.0.1rc1 release
Signed-off-by: Howard Pritchard <howardp@lanl.gov>
2019-02-22 12:58:37 -07:00
Howard Pritchard
f38eebbbfb LICENSE: for v4.0.1
[skip ci]

Signed-off-by: Howard Pritchard <howardp@lanl.gov>
2019-02-22 12:02:18 -07:00
Howard Pritchard
6596277ee8 fortran:use mpif08 fix for PGI linking
commit c6070fd2e broke building fortran bindings
with PGI compilers.  Turns out PGI compilers need
to link in the *.o from a module file whether or
not there are module subroutines defined or not in
the module file.

Related to #6411

Signed-off-by: Howard Pritchard <howardp@lanl.gov>
(cherry picked from commit 266bc3aced5ff9019f01faef1ed01dd463fafd41)
2019-02-22 11:47:40 -07:00
Howard Pritchard
7aeb65579b
Merge pull request #6395 from brminich/topic/ucx_net_waddr_4.0.x
PML/UCX: Use net worker address for remote peers - v4.0.x
2019-02-21 20:29:47 -07:00
Geoff Paulsen
e82523fade
Merge pull request #6410 from hppritcha/topic/news_for_v4.0.1
update NEWS with a new fix
2019-02-21 15:48:50 -06:00
Howard Pritchard
7bb728b77a
Merge pull request #6399 from hppritcha/topic/excise_ofi_rml
rml/ofi: remove
2019-02-21 08:44:07 -07:00
Mikhail Brinskii
1c514948f6 PML/UCX: Use net worker address for remote peers
For remote node peers pack smaller worker address, which contains
network device addresses only. This would reduce amount of OOB traffic
during startup.

Signed-off-by: Mikhail Brinskii <mikhailb@mellanox.com>
(cherry picked from commit 751d88192d05edb7e1912bab4e48643c6f9e1574)
2019-02-21 16:58:20 +02:00
Howard Pritchard
35e3c071dc update NEWS with a new fix
Signed-off-by: Howard Pritchard <howardp@lanl.gov>
2019-02-20 09:55:07 -07:00
Howard Pritchard
83cb9ca51e
Merge pull request #6404 from ggouaillardet/topic/v4.0.x/osc_rdma_self
osc/rdma: correctly handle communications to self
2019-02-20 09:53:50 -07:00
Howard Pritchard
f433b6491a
Merge pull request #6405 from ggouaillardet/topic/v4.0.x/man_win_attach_detach
man: fix typos in MPI_Win_{attach,detach}
2019-02-20 09:51:26 -07:00
KAWASHIMA Takahiro
7b71369632 man: fix more typos in MPI_Win_attach man page
Signed-off-by: KAWASHIMA Takahiro <t-kawashima@jp.fujitsu.com>

[skip ci]
bot:notest

(cherry picked from commit open-mpi/ompi@7095ad10a5)
2019-02-20 13:26:48 +09:00
Gilles Gouaillardet
3ab227df30 man: fix typos in MPI_Win_{attach,detach} man pages
no code change

[skip ci]
bot:notest

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>

(cherry picked from commit open-mpi/ompi@7c0596819b)
2019-02-20 13:25:12 +09:00
Gilles Gouaillardet
749f51845b osc/rdma: correctly handle communications to self
mark the "self" peer OMPI_OSC_RDMA_PEER_LOCAL_BASE when
the window is dynamically created and use_cpu_atomics is set
in order to correctly handle communications to self.

Thanks Bart Janssens for reporting this issue.

Refs. open-mpi/ompi#6394

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>

(back-ported from commit open-mpi/ompi@fe05fcc11a)
2019-02-20 13:06:05 +09:00
Howard Pritchard
55915c3885 rml/ofi: remove
per discussion at the 2/19/19 devel-core meeting,
remove rml/ofi from 4.0.x

Signed-off-by: Howard Pritchard <howardp@lanl.gov>
2019-02-19 10:27:47 -07:00
Geoff Paulsen
4fd2c605d9
Merge pull request #6391 from hppritcha/topic/news_for_v4.0.1
NEWS: update for 4.0.1 release
2019-02-15 16:17:25 -06:00
Howard Pritchard
4b2c62d6fd NEWS: update for 4.0.1 release
Signed-off-by: Howard Pritchard <howardp@lanl.gov>
2019-02-15 13:43:05 -07:00
Geoff Paulsen
c593b2004e
Merge pull request #6380 from hppritcha/ggouaillardet-topic/oob_tcp_cross_version_compatibility
v4.0.x: oob/tcp: add cross version compatibility support
2019-02-15 13:39:12 -06:00
Howard Pritchard
40db950c7d
Merge pull request #6340 from jsquyres/pr/v4.0.x/make-mpi.h-a-little-friendlier-to-c++
v4.0.x: mpi.h.in: use C++ static_cast<> where appropriate
2019-02-14 17:06:47 -07:00
Howard Pritchard
d2745ad0ad
Merge pull request #6327 from ggouaillardet/topic/v4.0.x/op
ompi/op: fix support of non predefined datatypes with predefined oper…
2019-02-14 17:05:32 -07:00
Howard Pritchard
d82be47013
Merge pull request #6273 from ggouaillardet/topic/v4.0.x/configury_clang5
v4.0.x: configury: enhance C11 detection
2019-02-14 17:04:53 -07:00
Howard Pritchard
de1dd1c2b0 oob/tcp: hardwire oob_tcp version string to 4.0.0
Signed-off-by: Howard Pritchard <howardp@lanl.gov>
2019-02-13 12:54:03 -07:00