Mikhail Kurnosov 9557fa087f Resolve merge conflicts ...

Signed-off-by: Mikhail Kurnosov <mkurnosov@gmail.com>

2018-10-05 21:40:27 +07:00

..

attribute

ompi/attributes: revamp attribute handling.

2017-07-12 10:27:45 +09:00

class

Revert "Update to sync with OMPI master and cleanup to build"

2016-11-22 15:03:20 -08:00

communicator

opal: add types for atomic variables

2018-09-14 10:48:55 -06:00

contrib

ompitrace: MPI_Address -> MPI_Get_address

2018-05-01 15:20:02 -06:00

datatype

opal: add types for atomic variables

2018-09-14 10:48:55 -06:00

debuggers

misc: compiler warning fixes

2018-09-15 06:04:13 -07:00

dpm

pmix: added check for pmix fence status

2018-08-06 15:01:57 +06:00

errhandler

mpi.h: file errhandeler typedef: use new form of name

2018-09-28 07:49:28 -07:00

etc

Revert "Update to sync with OMPI master and cleanup to build"

2016-11-22 15:03:20 -08:00

file

ompi/file: rename ompi_file_t's f_mutex into f_lock

2017-12-01 16:06:22 +09:00

group

opal: add types for atomic variables

2018-09-14 10:48:55 -06:00

include

mpi.h: remove MPI_UB/MPI_LB when not enabling MPI-1 compat

2018-09-28 09:10:03 -07:00

info

ompi/info: plug memory leaks in ompi_mpiinfo_finalize()

2018-08-30 10:07:17 +09:00

interlib

Update the interlib example to show an alternative method for model declaration. Add a missing range value to the OPAL layer. Make it easier to see OMPI model callbacks

2017-10-23 11:27:42 -07:00

mca

Resolve merge conflicts

2018-10-05 21:40:27 +07:00

message

predefined MPI object padding: set to fixed number of bytes (#3634)

2017-06-01 15:28:23 -04:00

mpi

man: Correct markup of MPI_Neighbor_allgather

2018-10-04 21:02:35 +09:00

mpiext

Merge pull request #5840 from kawashima-fj/pr/pcollreq-f08-signatures

2018-10-05 08:59:03 +09:00

op

predefined MPI object padding: set to fixed number of bytes (#3634)

2017-06-01 15:28:23 -04:00

patterns

scripted symbol name change (ompi_ prefix)

2017-07-11 02:13:23 -04:00

peruse

mpi/finalized: revamp INITIALIZED/FINALIZED

2018-06-01 13:36:29 -07:00

proc

ompi: Avoid unnecessary PMIx lookups when adding procs (step 2).

2017-03-16 07:47:27 +07:00

request

Merge pull request #4897 from bosilca/topic/waitsome

2018-09-18 12:34:22 -04:00

runtime

Merge pull request #5445 from hjelmn/asm_type

2018-09-14 12:32:56 -06:00

tools

ompi_info: add ipv6 config param

2017-11-08 07:02:27 -08:00

util

timings: added new timing points

2018-03-21 05:16:25 +02:00

win

ompi/attributes: revamp attribute handling.

2017-07-12 10:27:45 +09:00

Makefile.am

fortran/use-mpi-f08: fix [p]ompi_FOO_f symbols handling

2018-09-19 14:12:55 +09:00