Skip to content

Commit ba1f016

Browse files
authored
Merge pull request #7428 from hjelmn/finally_kill_the_old_cpp_bindings
ompi: remove obsolete c++ bindings
2 parents 9cc0f63 + 0b8baa2 commit ba1f016

File tree

360 files changed

+682
-12274
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

360 files changed

+682
-12274
lines changed

Makefile.ompi-rules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
#
1111

1212
TRIM_OPTIONS=
13-
if ! MAN_PAGE_BUILD_MPI_CXX_BINDINGS
14-
TRIM_OPTIONS += --nocxx
15-
endif
1613
if ! MAN_PAGE_BUILD_MPIFH_BINDINGS
1714
TRIM_OPTIONS += --nofortran
1815
endif

README

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -347,11 +347,6 @@ Compiler Notes
347347
version of the Intel 12.1 Linux compiler suite, the problem will go
348348
away.
349349

350-
- Early versions of the Portland Group 6.0 compiler have problems
351-
creating the C++ MPI bindings as a shared library (e.g., v6.0-1).
352-
Tests with later versions show that this has been fixed (e.g.,
353-
v6.0-5).
354-
355350
- The Portland Group compilers prior to version 7.0 require the
356351
"-Msignextend" compiler flag to extend the sign bit when converting
357352
from a shorter to longer integer. This is is different than other
@@ -370,24 +365,6 @@ Compiler Notes
370365
- It has been reported that Pathscale 5.0.5 and 6.0.527 compilers
371366
give an internal compiler error when trying to Open MPI.
372367

373-
- Using the MPI C++ bindings with older versions of the Pathscale
374-
compiler on some platforms is an old issue that seems to be a
375-
problem when Pathscale uses a back-end GCC 3.x compiler. Here's a
376-
proposed solution from the Pathscale support team (from July 2010):
377-
378-
The proposed work-around is to install gcc-4.x on the system and
379-
use the pathCC -gnu4 option. Newer versions of the compiler (4.x
380-
and beyond) should have this fixed, but we'll have to test to
381-
confirm it's actually fixed and working correctly.
382-
383-
We don't anticipate that this will be much of a problem for Open MPI
384-
users these days (our informal testing shows that not many users are
385-
still using GCC 3.x). Contact Pathscale support if you continue to
386-
have problems with Open MPI's C++ bindings.
387-
388-
Note the MPI C++ bindings have been deprecated by the MPI Forum and
389-
may not be supported in future releases.
390-
391368
- As of July 2017, the Pathscale compiler suite apparently has no
392369
further commercial support, and it does not look like there will be
393370
further releases. Any issues discovered regarding building /
@@ -1340,12 +1317,6 @@ MPI FUNCTIONALITY
13401317
Disable the MPI thread level MPI_THREAD_MULTIPLE (it is enabled by
13411318
default).
13421319

1343-
--enable-mpi-cxx
1344-
Enable building the C++ MPI bindings (default: disabled).
1345-
1346-
The MPI C++ bindings were deprecated in MPI-2.2, and removed from
1347-
the MPI standard in MPI-3.0.
1348-
13491320
--enable-mpi-java
13501321
Enable building of an EXPERIMENTAL Java MPI interface (disabled by
13511322
default). You may also need to specify --with-jdk-dir,
@@ -1914,7 +1885,7 @@ each different wrapper compiler (language):
19141885
ompi Synonym for "ompi-c"; Open MPI applications using the C
19151886
MPI bindings
19161887
ompi-c Open MPI applications using the C MPI bindings
1917-
ompi-cxx Open MPI applications using the C or C++ MPI bindings
1888+
ompi-cxx Open MPI applications using the C MPI bindings
19181889
ompi-fort Open MPI applications using the Fortran MPI bindings
19191890
------------------------------------------------------------------------
19201891

VERSION

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,7 @@ date="Unreleased developer copy"
7070
# functions over time; these technically did not change the interface
7171
# because Fortran 77 does not link by parameter type.
7272

73-
# 4. Similar to libmpi, libmpi_cxx's version number refers to the
74-
# public MPI interfaces. Note that this version number may or may not
75-
# be affected by changes to inlined functions in OMPI's
76-
# header-file-based C++ bindings implementation.
77-
78-
# 5. The ORTE and OPAL libraries will change versions when their
73+
# 4. The ORTE and OPAL libraries will change versions when their
7974
# public interfaces change (as relative to the layer(s) above them).
8075
# None of the ORTE and OPAL interfaces are public to MPI applications,
8176
# but they are "public" within the OMPI code base and select 3rd party
@@ -85,7 +80,6 @@ date="Unreleased developer copy"
8580
# format.
8681

8782
libmpi_so_version=0:0:0
88-
libmpi_cxx_so_version=0:0:0
8983
libmpi_mpifh_so_version=0:0:0
9084
libmpi_usempi_tkr_so_version=0:0:0
9185
libmpi_usempi_ignore_tkr_so_version=0:0:0

config/make_manpage.pl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
my $package_version;
1818
my $ompi_date;
1919
my $opal_date;
20-
my $cxx = '1';
2120
my $fortran = '1';
2221
my $f08 = '1';
2322
my $input;
@@ -29,7 +28,6 @@
2928
"package-version=s" => \$package_version,
3029
"ompi-date=s" => \$ompi_date,
3130
"opal-date=s" => \$opal_date,
32-
"cxx!" => \$cxx,
3331
"fortran!" => \$fortran,
3432
"f08!" => \$f08,
3533
"input=s" => \$input,
@@ -58,10 +56,6 @@
5856
$file =~ s/#OMPI_DATE#/$ompi_date/g;
5957
$file =~ s/#OPAL_DATE#/$opal_date/g;
6058

61-
if ($cxx == 0) {
62-
$file =~ s/\n\.SH C\+\+ Syntax.+?\n\.SH/\n\.SH/s;
63-
}
64-
6559
if ($fortran == 0) {
6660
$file =~ s/\n\.SH Fortran Syntax.+?\n\.SH/\n\.SH/s;
6761
}

config/ompi_config_files.m4

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- shell-script -*-
22
#
3-
# Copyright (c) 2009-2019 Cisco Systems, Inc. All rights reserved
3+
# Copyright (c) 2009-2020 Cisco Systems, Inc. All rights reserved
44
# Copyright (c) 2017-2018 Research Organization for Information Science
55
# and Technology (RIST). All rights reserved.
66
# Copyright (c) 2018 Los Alamos National Security, LLC. All rights
@@ -26,7 +26,6 @@ AC_DEFUN([OMPI_CONFIG_FILES],[
2626

2727
ompi/mpi/c/Makefile
2828
ompi/mpi/c/profile/Makefile
29-
ompi/mpi/cxx/Makefile
3029
ompi/mpi/fortran/base/Makefile
3130
ompi/mpi/fortran/mpif-h/Makefile
3231
ompi/mpi/fortran/mpif-h/profile/Makefile

config/ompi_configure_options.m4

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -166,36 +166,6 @@ case "x$enable_mpi_fortran" in
166166
;;
167167
esac
168168

169-
#
170-
# C++
171-
#
172-
173-
AC_MSG_CHECKING([if want C++ bindings])
174-
AC_ARG_ENABLE(mpi-cxx,
175-
AC_HELP_STRING([--enable-mpi-cxx],
176-
[enable C++ MPI bindings (default: disabled)]))
177-
if test "$enable_mpi_cxx" = "yes"; then
178-
AC_MSG_RESULT([yes])
179-
WANT_MPI_CXX_SUPPORT=1
180-
else
181-
AC_MSG_RESULT([no])
182-
WANT_MPI_CXX_SUPPORT=0
183-
fi
184-
185-
AC_MSG_CHECKING([if want MPI::SEEK_SET support])
186-
AC_ARG_ENABLE([mpi-cxx-seek],
187-
[AC_HELP_STRING([--enable-mpi-cxx-seek],
188-
[enable support for MPI::SEEK_SET, MPI::SEEK_END, and MPI::SEEK_POS in C++ bindings (default: enabled)])])
189-
if test "$enable_mpi_cxx_seek" != "no" ; then
190-
AC_MSG_RESULT([yes])
191-
OMPI_WANT_MPI_CXX_SEEK=1
192-
else
193-
AC_MSG_RESULT([no])
194-
OMPI_WANT_MPI_CXX_SEEK=0
195-
fi
196-
AC_DEFINE_UNQUOTED([OMPI_WANT_MPI_CXX_SEEK], [$OMPI_WANT_MPI_CXX_SEEK],
197-
[do we want to try to work around C++ bindings SEEK_* issue?])
198-
199169
# Remove these when we finally kill them once and for all
200170
AC_ARG_ENABLE([mpi1-compatibility],
201171
[AC_HELP_STRING([--enable-mpi1-compatibility],

config/ompi_cxx_find_exception_flags.m4

Lines changed: 0 additions & 94 deletions
This file was deleted.

config/ompi_cxx_find_template_parameters.m4

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)