From 5efdfdfa09ba458bb40f322afc1890f33fc88a5d Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 27 Apr 2012 19:35:23 +0000 Subject: [PATCH] * Make mpif77 and mpif90 be sym links to mpifort, just to drive the point home that they're deprecated * Similarly, make mpif77-wrapper-data.txt be a sym link to mpifirt-wrapper-data.txt (ditto with mpif90) * Make new mpif77.1 and mpif90.1 man pages that say that they're deprecated; use mpifort instead This commit was SVN r26353. --- ompi/tools/wrappers/Makefile.am | 42 ++++++++++++++++------------- ompi/tools/wrappers/mpif77.1in | 48 +++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 19 deletions(-) create mode 100644 ompi/tools/wrappers/mpif77.1in diff --git a/ompi/tools/wrappers/Makefile.am b/ompi/tools/wrappers/Makefile.am index 204a4ae2f7..bcff0c3a4a 100644 --- a/ompi/tools/wrappers/Makefile.am +++ b/ompi/tools/wrappers/Makefile.am @@ -21,7 +21,7 @@ generated_man_pages = mpicc.1 mpic++.1 mpicxx.1 mpifort.1 mpif77.1 mpif90.1 man_pages = $(generated_man_pages) mpijavac.1 -EXTRA_DIST = mpijavac.1 +EXTRA_DIST = mpijavac.1 mpif77.1in if OPAL_WANT_SCRIPT_WRAPPER_COMPILERS @@ -34,19 +34,19 @@ install-exec-hook-always: (cd $(DESTDIR)$(bindir); rm -f mpicc; $(LN_S) ompi_wrapper_script mpicc) (cd $(DESTDIR)$(bindir); rm -f mpic++; $(LN_S) ompi_wrapper_script mpic++) (cd $(DESTDIR)$(bindir); rm -f mpicxx; $(LN_S) ompi_wrapper_script mpicxx) - (cd $(DESTDIR)$(bindir); rm -f mpif77; $(LN_S) ompi_wrapper_script mpif77) - (cd $(DESTDIR)$(bindir); rm -f mpif90; $(LN_S) ompi_wrapper_script mpif90) (cd $(DESTDIR)$(bindir); rm -f mpifort; $(LN_S) ompi_wrapper_script mpifort) + (cd $(DESTDIR)$(bindir); rm -f mpif77; $(LN_S) mpifort mpif77) + (cd $(DESTDIR)$(bindir); rm -f mpif90; $(LN_S) mpifort mpif90) (cd $(DESTDIR)$(bindir); chmod +x mpijavac.pl; rm -f mpijavac; $(LN_S) mpijavac.pl mpijavac) uninstall-local-always: rm -f $(DESTDIR)$(bindir)/mpicc \ $(DESTDIR)$(bindir)/mpic++ \ $(DESTDIR)$(bindir)/mpicxx \ + $(DESTDIR)$(bindir)/mpifort \ $(DESTDIR)$(bindir)/mpif77 \ $(DESTDIR)$(bindir)/mpif90 \ - $(DESTDIR)$(bindir)/mpijavac \ - $(DESTDIR)$(bindir)/mpifort + $(DESTDIR)$(bindir)/mpijavac if CASE_SENSITIVE_FS install-exec-hook: install-exec-hook-always @@ -78,9 +78,9 @@ install-exec-hook-always: (cd $(DESTDIR)$(bindir); rm -f mpicc$(EXEEXT); $(LN_S) opal_wrapper mpicc) (cd $(DESTDIR)$(bindir); rm -f mpic++$(EXEEXT); $(LN_S) opal_wrapper mpic++) (cd $(DESTDIR)$(bindir); rm -f mpicxx$(EXEEXT); $(LN_S) opal_wrapper mpicxx) - (cd $(DESTDIR)$(bindir); rm -f mpif77$(EXEEXT); $(LN_S) opal_wrapper mpif77) - (cd $(DESTDIR)$(bindir); rm -f mpif90$(EXEEXT); $(LN_S) opal_wrapper mpif90) (cd $(DESTDIR)$(bindir); rm -f mpifort$(EXEEXT); $(LN_S) opal_wrapper mpifort) + (cd $(DESTDIR)$(bindir); rm -f mpif77$(EXEEXT); $(LN_S) mpifort mpif77) + (cd $(DESTDIR)$(bindir); rm -f mpif90$(EXEEXT); $(LN_S) mpifort mpif90) (cd $(DESTDIR)$(bindir); chmod +x mpijavac.pl; rm -f mpijavac; $(LN_S) mpijavac.pl mpijavac) install-data-hook-always: @@ -154,18 +154,22 @@ mpicxx.1: $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 rm -f mpicxx.1 sed -e 's/#COMMAND#/mpicxx/g' -e 's/#PROJECT#/Open MPI/g' -e 's/#PROJECT_SHORT#/OMPI/g' -e 's/#LANGUAGE#/C++/g' < $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 > mpicxx.1 -# Intentionally set the COMMAND to be mpifort, because we want to push -# everyone to use mpifort instead of the deprecated mpif77 wrapper name. -mpif77.1: $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 - rm -f mpif77.1 - sed -e 's/#COMMAND#/mpifort/g' -e 's/#PROJECT#/Open MPI/g' -e 's/#PROJECT_SHORT#/OMPI/g' -e 's/#LANGUAGE#/Fortran/g' < $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 > mpif77.1 - -# Intentionally set the COMMAND to be mpifort, because we want to push -# everyone to use mpifort instead of the deprecated mpif90 wrapper name. -mpif90.1: $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 - rm -f mpif90.1 - sed -e 's/#COMMAND#/mpifort/g' -e 's/#PROJECT#/Open MPI/g' -e 's/#PROJECT_SHORT#/OMPI/g' -e 's/#LANGUAGE#/Fortran/g' < $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 > mpif90.1 - mpifort.1: $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 rm -f mpifort.1 sed -e 's/#COMMAND#/mpifort/g' -e 's/#PROJECT#/Open MPI/g' -e 's/#PROJECT_SHORT#/OMPI/g' -e 's/#LANGUAGE#/Fortran/g' < $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 > mpifort.1 + +# Deprecated +mpif77.1: mpif77.1in + rm -f mpif77.1 + sed -e 's/#PROJECT#/Open MPI/g' \ + -e 's/#PROJECT_SHORT#/OMPI/g' \ + -e 's/#LANGUAGE#/Fortran/g' \ + -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \ + -e 's/#PACKAGE_VERSION#/@PACKAGE_VERSION@/g' \ + -e 's/#OMPI_DATE#/@OMPI_RELEASE_DATE@/g' \ + < $(top_srcdir)/ompi/tools/wrappers/mpif77.1in > mpif77.1 + +# Deprecated +mpif90.1: mpif77.1 + rm -f mpif90.1 + ln -s mpif77.1 mpif90.1 diff --git a/ompi/tools/wrappers/mpif77.1in b/ompi/tools/wrappers/mpif77.1in new file mode 100644 index 0000000000..2653305f10 --- /dev/null +++ b/ompi/tools/wrappers/mpif77.1in @@ -0,0 +1,48 @@ +.\" Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. +.\" Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. +.TH "mpif77,mpif90" 1 "#OMPI_DATE#" "#PACKAGE_VERSION#" "Open MPI" +. +.SH NAME +mpif77, mpif90 -- Deprecated Open MPI Fortran wrapper compilers +. +.SH SYNTAX +mpif90 ... +. +.\" ************************** +.\" Description Section +.\" ************************** +. +.SH DESCRIPTION +.PP +The +.I mpif77 +and +.I mpif90 +wrapper compiler names are deprecated, and will disappear in a future +version of Open MPI. You should use the +.I mpifort +wrapper compiler, instead. While they are deprecated, +.I mpif77 +and +.I mpif90 +accept all the same parameters as +.IR mpifort , +and behaves the same as +.IR mpifort . +. +.PP +With +.IR mpifort , +you can compile any Fortran program that uses the "mpif.h", "use mpi", +and/or "use mpi_f08" MPI Fortran interfaces. +. +.PP +See mpifort(1) for more details. +. +.\" ************************** +.\" See Also Section +.\" ************************** +. +.SH SEE ALSO +mpifort(1) +.