Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Parameterize and move Fortran MPI bindings modulefiles install location #12649

Merged
merged 1 commit into from
Jul 9, 2024
Merged

Parameterize and move Fortran MPI bindings modulefiles install location #12649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions config/ompi_configure_options.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,15 @@ case "x$enable_mpi_fortran" in
;;
esac

AC_MSG_CHECKING([where to install Fortran MPI modules])
AC_ARG_WITH([mpi-moduledir],
[AS_HELP_STRING([--with-mpi-moduledir],
[specify where to install Fortran MPI modules (default: $libdir)])],
[OMPI_FORTRAN_MODULEDIR=$withval],
[OMPI_FORTRAN_MODULEDIR=$libdir])
AC_SUBST(OMPI_FORTRAN_MODULEDIR)
AC_MSG_RESULT([$OMPI_FORTRAN_MODULEDIR])

# Remove these when we finally kill them once and for all
AC_ARG_ENABLE([mpi1-compatibility],
[AS_HELP_STRING([--enable-mpi1-compatibility],
Expand Down
4 changes: 2 additions & 2 deletions config/opal_setup_wrappers.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
OMPI_WRAPPER_FCFLAGS='-I${includedir}'" ${wrapper_extra_fcflags} ${with_wrapper_fcflags}"
AS_IF([test -n "${OMPI_FC_MODULE_FLAG}"],
[dnl deal with some interesting expansion behavior in OPAL_APPEND
wrapper_tmp_arg="${OMPI_FC_MODULE_FLAG}"'${libdir}'
wrapper_tmp_arg="${OMPI_FC_MODULE_FLAG} ${OMPI_FORTRAN_MODULEDIR}"
OPAL_APPEND([OMPI_WRAPPER_FCFLAGS], [${wrapper_tmp_arg}])])
AC_SUBST([OMPI_WRAPPER_FCFLAGS])
AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_FCFLAGS])
Expand Down Expand Up @@ -780,7 +780,7 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
OSHMEM_WRAPPER_FCFLAGS='-I${includedir}'" ${wrapper_extra_fcflags} ${with_wrapper_fcflags}"
AS_IF([test -n "${OMPI_FC_MODULE_FLAG}"],
[dnl deal with some interesting expansion behavior in OPAL_APPEND
wrapper_tmp_arg="${OMPI_FC_MODULE_FLAG}"'${libdir}'
wrapper_tmp_arg="${OMPI_FC_MODULE_FLAG} ${OMPI_FORTRAN_MODULEDIR}"
OPAL_APPEND([OSHMEM_WRAPPER_FCFLAGS], [${wrapper_tmp_arg}])])
AC_SUBST([OSHMEM_WRAPPER_FCFLAGS])
AC_MSG_RESULT([$OSHMEM_WRAPPER_EXTRA_FCFLAGS])
Expand Down
5 changes: 5 additions & 0 deletions docs/installing-open-mpi/configure-cli-options/mpi.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ MPI API behaviors that can be used with ``configure``:
``--disable-mpi-fortran``). This is mutually exclusive
with building the OpenSHMEM Fortran interface.

* ``--with-mpi-moduledir=DIR``:
Specify a specific ``DIR`` directory where to install the MPI
Fortran bindings modulefiles. By default, Open MPI will install
Fortran modulefiles into ``$libdir``.

* ``--enable-mpi-ext[=LIST]``:
Enable Open MPI's non-portable API extensions. ``LIST`` is a
comma-delmited list of extensions. If no ``LIST`` is specified, all
Expand Down
8 changes: 4 additions & 4 deletions ompi/mpi/fortran/mpiext-use-mpi-f08/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ CLEANFILES += *.i90
#
install-exec-hook:
@ for file in `ls *.mod`; do \
echo $(INSTALL) $$file $(DESTDIR)$(libdir); \
$(INSTALL) $$file $(DESTDIR)$(libdir); \
echo $(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
$(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
done

uninstall-local:
@ for file in `ls *.mod`; do \
echo rm -f $(DESTDIR)$(libdir)/$$file; \
rm -f $(DESTDIR)$(libdir)/$$file; \
echo rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
done

else
Expand Down
8 changes: 4 additions & 4 deletions ompi/mpi/fortran/mpiext-use-mpi/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,14 @@ CLEANFILES += *.i90
#
install-exec-hook:
@ for file in `ls *.mod`; do \
echo $(INSTALL) $$file $(DESTDIR)$(libdir); \
$(INSTALL) $$file $(DESTDIR)$(libdir); \
echo $(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
$(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
done

uninstall-local:
@ for file in `ls *.mod`; do \
echo rm -f $(DESTDIR)$(libdir)/$$file; \
rm -f $(DESTDIR)$(libdir)/$$file; \
echo rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
done

else
Expand Down
8 changes: 4 additions & 4 deletions ompi/mpi/fortran/use-mpi-f08/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,14 +566,14 @@ mpi-f08.lo: $(module_sentinel_files) $(SIZEOF_H)

install-exec-hook:
@ for file in `ls *.mod`; do \
echo $(INSTALL) $$file $(DESTDIR)$(libdir); \
$(INSTALL) $$file $(DESTDIR)$(libdir); \
echo $(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
$(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
done

uninstall-local:
@ for file in `ls *.mod`; do \
echo rm -f $(DESTDIR)$(libdir)/$$file; \
rm -f $(DESTDIR)$(libdir)/$$file; \
echo rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
done

endif
8 changes: 4 additions & 4 deletions ompi/mpi/fortran/use-mpi-f08/mod/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,14 @@ pmpi-f08-interfaces.lo: mpi-f08-rename.h

install-exec-hook:
@ for file in `ls *.mod`; do \
echo $(INSTALL) $$file $(DESTDIR)$(libdir); \
$(INSTALL) $$file $(DESTDIR)$(libdir); \
echo $(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
$(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
done

uninstall-local:
@ for file in `ls *.mod`; do \
echo rm -f $(DESTDIR)$(libdir)/$$file; \
rm -f $(DESTDIR)$(libdir)/$$file; \
echo rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
done

endif
8 changes: 4 additions & 4 deletions ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,14 @@ CLEANFILES += *.i90

install-exec-hook:
@ for file in `ls *.mod`; do \
echo $(INSTALL) $$file $(DESTDIR)$(libdir); \
$(INSTALL) $$file $(DESTDIR)$(libdir); \
echo $(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
$(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
done

uninstall-local:
@ for file in `ls *.mod`; do \
echo rm -f $(DESTDIR)$(libdir)/$$file; \
rm -f $(DESTDIR)$(libdir)/$$file; \
echo rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
done

endif
8 changes: 4 additions & 4 deletions ompi/mpi/fortran/use-mpi-tkr/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,14 @@ DISTCLEANFILES = $(nodist_lib@OMPI_LIBMPI_NAME@_usempi_la_SOURCES)

install-exec-hook:
@ for file in `ls *.mod`; do \
echo $(INSTALL) $$file $(DESTDIR)$(libdir); \
$(INSTALL) $$file $(DESTDIR)$(libdir); \
echo $(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
$(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
done

uninstall-local:
@ for file in `ls *.mod`; do \
echo rm -f $(DESTDIR)$(libdir)/$$file; \
rm -f $(DESTDIR)$(libdir)/$$file; \
echo rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
done

# if OMPI_BUILD_FORTRAN_USEMPI_TKR_BINDINGS
Expand Down
8 changes: 4 additions & 4 deletions ompi/mpi/fortran/use-mpi/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ mpi-types.lo: mpi-types.F90

install-exec-hook:
@ for file in `ls *.mod`; do \
echo $(INSTALL) $$file $(DESTDIR)$(libdir); \
$(INSTALL) $$file $(DESTDIR)$(libdir); \
echo $(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
$(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
done

uninstall-local:
@ for file in `ls *.mod`; do \
echo rm -f $(DESTDIR)$(libdir)/$$file; \
rm -f $(DESTDIR)$(libdir)/$$file; \
echo rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
done
endif
Loading