Skip to content

Commit 9cfdc38

Browse files
rhc54rhc54
authored
Merge pull request #7454 from rhc54/topic/orte
Remove lingering ORTE references
2 parents 7c76237 + 76b9c15 commit 9cfdc38

10 files changed

+22
-37
lines changed

‎Makefile.ompi-rules

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# -*- makefile -*-
22
# Copyright (c) 2008-2018 Cisco Systems, Inc. All rights reserved.
33
# Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
4+
# Copyright (c) 2020 Intel, Inc. All rights reserved.
45
# $COPYRIGHT$
56
#
67
# Additional copyrights may follow
@@ -25,7 +26,6 @@ endif
2526
--package-version='@PACKAGE_VERSION@' \
2627
--ompi-date='@OMPI_RELEASE_DATE@' \
2728
--opal-date='@OPAL_RELEASE_DATE@' \
28-
--orte-date='@ORTE_RELEASE_DATE@' \
2929
--input=$< \
3030
--output=$@
3131

@@ -35,7 +35,6 @@ endif
3535
--package-version='@PACKAGE_VERSION@' \
3636
--ompi-date='@OMPI_RELEASE_DATE@' \
3737
--opal-date='@OPAL_RELEASE_DATE@' \
38-
--orte-date='@ORTE_RELEASE_DATE@' \
3938
$(TRIM_OPTIONS) \
4039
--input=$< \
4140
--output=$@
@@ -46,7 +45,6 @@ endif
4645
--package-version='@PACKAGE_VERSION@' \
4746
--ompi-date='@OMPI_RELEASE_DATE@' \
4847
--opal-date='@OPAL_RELEASE_DATE@' \
49-
--orte-date='@ORTE_RELEASE_DATE@' \
5048
--input=$< \
5149
--output=$@
5250

‎config/make_manpage.pl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# Copyright (c) 2015 Research Organization for Information Science
44
# and Technology (RIST). All rights reserved.
55
# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
6+
# Copyright (c) 2020 Intel, Inc. All rights reserved.
67
# $COPYRIGHT$
78
#
89
# Subroutine to generate a bunch of Fortran declarations and symbols
@@ -16,7 +17,6 @@
1617
my $package_version;
1718
my $ompi_date;
1819
my $opal_date;
19-
my $orte_date;
2020
my $cxx = '1';
2121
my $fortran = '1';
2222
my $f08 = '1';
@@ -29,7 +29,6 @@
2929
"package-version=s" => \$package_version,
3030
"ompi-date=s" => \$ompi_date,
3131
"opal-date=s" => \$opal_date,
32-
"orte-date=s" => \$orte_date,
3332
"cxx!" => \$cxx,
3433
"fortran!" => \$fortran,
3534
"f08!" => \$f08,
@@ -42,9 +41,8 @@
4241
!defined($package_name) ||
4342
!defined($package_version) ||
4443
!defined($ompi_date) ||
45-
!defined($opal_date) ||
46-
!defined($orte_date)) {
47-
print "Usage: $0 --package-name=<package name> --package-version=<package version> --ompi-date=<ompi date> --opal-date=<opal date> --orte-date=<orte date> --input=<input file> --output=<output file> [--nocxx] [ --nofortran] [--nof08]\n";
44+
!defined($opal_date)) {
45+
print "Usage: $0 --package-name=<package name> --package-version=<package version> --ompi-date=<ompi date> --opal-date=<opal date> --input=<input file> --output=<output file> [--nocxx] [ --nofortran] [--nof08]\n";
4846
exit(1 - $ok);
4947
}
5048

@@ -59,7 +57,6 @@
5957
$file =~ s/#PACKAGE_VERSION#/$package_version/g;
6058
$file =~ s/#OMPI_DATE#/$ompi_date/g;
6159
$file =~ s/#OPAL_DATE#/$opal_date/g;
62-
$file =~ s/#ORTE_DATE#/$orte_date/g;
6360

6461
if ($cxx == 0) {
6562
$file =~ s/\n\.SH C\+\+ Syntax.+?\n\.SH/\n\.SH/s;

‎config/opal_set_lib_prefix.m4

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# -*- shell-script -*-
22
#
3-
# Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
3+
# Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
44
# Copyright (c) 2016 IBM Corporation. All rights reserved.
5+
# Copyright (c) 2020 Intel, Inc. All rights reserved.
56
# $COPYRIGHT$
67
#
78
# Additional copyrights may follow
@@ -26,20 +27,6 @@ AC_DEFUN([OPAL_SET_LIB_PREFIX],[
2627
AC_SUBST(OPAL_LIB_PREFIX)
2728
])dnl
2829

29-
#
30-
# Same as OPAL LIB_PREFIX, but for the ORTE layer
31-
#
32-
AC_DEFUN([ORTE_SET_LIB_PREFIX],[
33-
AS_IF([test "$orte_lib_prefix_set" = "yes"],
34-
[AC_MSG_WARN([ORTE lib prefix was already set!])
35-
AC_MSG_WARN([This is a configury programming error])
36-
AC_MSG_ERROR([Cannot continue])])
37-
38-
ORTE_LIB_PREFIX=$1
39-
orte_lib_prefix_set=yes
40-
AC_SUBST(ORTE_LIB_PREFIX)
41-
])dnl
42-
4330
#
4431
# Rename 'libmpi' and 'libmpi_FOO' with a configure time option.
4532
#

‎contrib/libadd_mca_comp_update.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/usr/bin/env python
22

33
# Copyright (c) 2017 IBM Corporation. All rights reserved.
4+
# Copyright (c) 2020 Intel, Inc. All rights reserved.
45
# $COPYRIGHT$
56
#
67

78
import glob, os, re, shutil
89

910
projects= {'opal' : ["$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la"],
10-
'orte' : ["$(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la"],
1111
'ompi' : ["$(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la"],
1212
'oshmem' : ["$(top_builddir)/oshmem/liboshmem.la"],
1313
}

‎ompi/tools/wrappers/mpic++-wrapper-data.txt.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ compiler_flags_prefix=@OMPI_WRAPPER_EXTRA_CXXFLAGS_PREFIX@
1717
compiler_flags=@OMPI_WRAPPER_EXTRA_CXXFLAGS@
1818
linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
1919
# Note that per https://svn.open-mpi.org/trac/ompi/ticket/3422, we
20-
# intentionally only link in the MPI libraries (ORTE, OPAL, etc. are
20+
# intentionally only link in the MPI libraries (OPAL, etc. are
2121
# pulled in implicitly) because we intend MPI applications to only use
2222
# the MPI API.
2323
libs=@OMPI_WRAPPER_CXX_LIB@ -l@OMPI_LIBMPI_NAME@
24-
libs_static=@OMPI_WRAPPER_CXX_LIB@ -l@OMPI_LIBMPI_NAME@ -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
24+
libs_static=@OMPI_WRAPPER_CXX_LIB@ -l@OMPI_LIBMPI_NAME@ -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
2525
dyn_lib_file=lib@OMPI_LIBMPI_NAME@.@OPAL_DYN_LIB_SUFFIX@
2626
static_lib_file=lib@OMPI_LIBMPI_NAME@.a
2727
required_file=@OMPI_WRAPPER_CXX_REQUIRED_FILE@

‎ompi/tools/wrappers/mpicc-wrapper-data.txt.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ compiler_flags_prefix=@OMPI_WRAPPER_EXTRA_CFLAGS_PREFIX@
1717
compiler_flags=@OMPI_WRAPPER_EXTRA_CFLAGS@
1818
linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
1919
# Note that per https://svn.open-mpi.org/trac/ompi/ticket/3422, we
20-
# intentionally only link in the MPI libraries (ORTE, OPAL, etc. are
20+
# intentionally only link in the MPI libraries (OPAL, etc. are
2121
# pulled in implicitly) because we intend MPI applications to only use
2222
# the MPI API.
2323
libs=-l@OMPI_LIBMPI_NAME@
24-
libs_static=-l@OMPI_LIBMPI_NAME@ -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
24+
libs_static=-l@OMPI_LIBMPI_NAME@ -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
2525
dyn_lib_file=lib@OMPI_LIBMPI_NAME@.@OPAL_DYN_LIB_SUFFIX@
2626
static_lib_file=lib@OMPI_LIBMPI_NAME@.a
2727
required_file=

‎ompi/tools/wrappers/mpifort-wrapper-data.txt.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ preprocessor_flags=
1616
compiler_flags=@OMPI_WRAPPER_EXTRA_FCFLAGS@
1717
linker_flags=@OMPI_WRAPPER_EXTRA_FC_LDFLAGS@
1818
# Note that per https://svn.open-mpi.org/trac/ompi/ticket/3422, we
19-
# intentionally only link in the MPI libraries (ORTE, OPAL, etc. are
19+
# intentionally only link in the MPI libraries (OPAL, etc. are
2020
# pulled in implicitly) because we intend MPI applications to only use
2121
# the MPI API.
2222
libs=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@
23-
libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@ -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
23+
libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@ -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
2424
dyn_lib_file=lib@OMPI_LIBMPI_NAME@.@OPAL_DYN_LIB_SUFFIX@
2525
static_lib_file=lib@OMPI_LIBMPI_NAME@.a
2626
required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@

‎oshmem/tools/wrappers/shmemc++-wrapper-data.txt.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Copyright (c) 2013 Mellanox Technologies, Inc.
22
# All rights reserved.
33
# Copyright (c) 2014-2015 Cisco Systems, Inc. All rights reserved.
4+
# Copyright (c) 2020 Intel, Inc. All rights reserved.
45
# $COPYRIGHT$
56
#
67
# Additional copyrights may follow
@@ -25,11 +26,11 @@ preprocessor_flags=@OMPI_WRAPPER_EXTRA_CPPFLAGS@
2526
compiler_flags=@OMPI_WRAPPER_EXTRA_CXXFLAGS@
2627
linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
2728
# Note that per https://svn.open-mpi.org/trac/ompi/ticket/3422, we
28-
# intentionally only link in the SHMEM and MPI libraries (ORTE, OPAL,
29+
# intentionally only link in the SHMEM and MPI libraries (OPAL,
2930
# etc. are pulled in implicitly) because we intend SHMEM/MPI
3031
# applications to only use the SHMEM and MPI APIs.
3132
libs=-loshmem -lmpi
32-
libs_static=-loshmem -lmpi -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
33+
libs_static=-loshmem -lmpi -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
3334
dyn_lib_file=liboshmem.@OPAL_DYN_LIB_SUFFIX@
3435
static_lib_file=liboshmem.a
3536
required_file=

‎oshmem/tools/wrappers/shmemcc-wrapper-data.txt.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# All rights reserved.
33
# Copyright (c) 2014-2015 Cisco Systems, Inc. All rights reserved.
44
# Copyright (c) 2016 IBM Corporation. All rights reserved.
5+
# Copyright (c) 2020 Intel, Inc. All rights reserved.
56
# $COPYRIGHT$
67
#
78
# Additional copyrights may follow
@@ -26,11 +27,11 @@ preprocessor_flags=@OMPI_WRAPPER_EXTRA_CPPFLAGS@
2627
compiler_flags=@OMPI_WRAPPER_EXTRA_CFLAGS@
2728
linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
2829
# Note that per https://svn.open-mpi.org/trac/ompi/ticket/3422, we
29-
# intentionally only link in the SHMEM and MPI libraries (ORTE, OPAL,
30+
# intentionally only link in the SHMEM and MPI libraries (OPAL,
3031
# etc. are pulled in implicitly) because we intend SHMEM/MPI
3132
# applications to only use the SHMEM and MPI APIs.
3233
libs=-loshmem -l@OMPI_LIBMPI_NAME@
33-
libs_static=-loshmem -l@OMPI_LIBMPI_NAME@ -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
34+
libs_static=-loshmem -l@OMPI_LIBMPI_NAME@ -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
3435
dyn_lib_file=liboshmem.@OPAL_DYN_LIB_SUFFIX@
3536
static_lib_file=liboshmem.a
3637
required_file=

‎oshmem/tools/wrappers/shmemfort-wrapper-data.txt.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# All rights reserved.
33
# Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
44
# Copyright (c) 2016 IBM Corporation. All rights reserved.
5+
# Copyright (c) 2020 Intel, Inc. All rights reserved.
56
# $COPYRIGHT$
67
#
78
# Additional copyrights may follow
@@ -26,11 +27,11 @@ preprocessor_flags=
2627
compiler_flags=@OMPI_WRAPPER_EXTRA_FCFLAGS@
2728
linker_flags=@OMPI_WRAPPER_EXTRA_FC_LDFLAGS@
2829
# Note that per https://svn.open-mpi.org/trac/ompi/ticket/3422, we
29-
# intentionally only link in the SHMEM and MPI libraries (ORTE, OPAL,
30+
# intentionally only link in the SHMEM and MPI libraries (OPAL,
3031
# etc. are pulled in implicitly) because we intend SHMEM/MPI
3132
# applications to only use the SHMEM and MPI APIs.
3233
libs=-loshmem -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@
33-
libs_static=-loshmem -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@ -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
34+
libs_static=-loshmem -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@ -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
3435
dyn_lib_file=liboshmem.@OPAL_DYN_LIB_SUFFIX@
3536
static_lib_file=liboshmem.a
3637
required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@

0 commit comments

Comments
 (0)