-
Notifications
You must be signed in to change notification settings - Fork 931
fortran2008: fix mpiext example #3617
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.
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
Conversation
|
@jsquyres could you please review this before it lands into master ? btw, can you point me to a compiler that will use |
|
just to be clear, i blindingly updated |
|
The IBM CI (PGI Compiler) build failed! Please review the log, linked below. Gist: https://gist.github.com/b263311298475efed1441e9f6fde6e04 |
|
The IBM CI (XL Compiler) build failed! Please review the log, linked below. Gist: https://gist.github.com/511b9c2765392e4c916c9b06a914a328 |
|
The IBM CI (GNU Compiler) build failed! Please review the log, linked below. Gist: https://gist.github.com/fbc67eac58ea60a3c8bea7c80a21cf6d |
04d2ee7 to
4393ab6
Compare
|
I confirmed diff --git a/config/ompi_configure_options.m4 b/config/ompi_configure_options.m4
index 3301df0..5bde2b2 100644
--- a/config/ompi_configure_options.m4
+++ b/config/ompi_configure_options.m4
@@ -247,8 +247,7 @@ AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -lt $OMPI_FORTRAN_USEMPIF08_BINDINGS],
[OMPI_BUILD_FORTRAN_F08_SUBARRAYS=1
AC_MSG_RESULT([extra crispy (subarray prototype)])
AC_MSG_WARN([Sorry, the subarray prototype is no longer available])
- AC_MSG_WARN([Contact your favorite OMPI developer and ask for it to be re-enabled])
- AC_MSG_ERROR([Cannot continue])],
+ AC_MSG_WARN([Contact your favorite OMPI developer and ask for it to be re-enabled])]
[AC_MSG_RESULT([regular (no subarray support)])])
])
AC_DEFINE_UNQUOTED([OMPI_BUILD_FORTRAN_F08_SUBARRAYS],
diff --git a/config/ompi_ext.m4 b/config/ompi_ext.m4
index ae0e91b..1054a74 100644
--- a/config/ompi_ext.m4
+++ b/config/ompi_ext.m4
@@ -216,8 +216,7 @@ EOF
# Only build this mpi_f08_ext module if we're building the "use
# mpi_f08" module *and* it's the non-descriptor one.
- AS_IF([test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS && \
- test $OMPI_BUILD_FORTRAN_F08_SUBARRAYS -eq 0],
+ AS_IF([test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS],
[OMPI_BUILD_FORTRAN_USEMPIF08_EXT=1],
[OMPI_BUILD_FORTRAN_USEMPIF08_EXT=0])
AM_CONDITIONAL(OMPI_BUILD_FORTRAN_USEMPIF08_EXT,
diff --git a/ompi/mpi/fortran/use-mpi-f08-desc/Makefile.am b/ompi/mpi/fortran/use-mpi-f08-desc/Makefile.am
index f7d1275..559012f 100644
--- a/ompi/mpi/fortran/use-mpi-f08-desc/Makefile.am
+++ b/ompi/mpi/fortran/use-mpi-f08-desc/Makefile.am
@@ -59,7 +59,7 @@ MOSTLYCLEANFILES = *.mod
# manually here. Bummer!
#
-OMPI_Fortran_binding.lo: OMPI_Fortran_binding.f90 mpi-f08-types.lo
+OMPI_Fortran_binding.lo: OMPI_Fortran_binding.f90 mod/mpi-f08-types.lo
#
diff --git a/ompi/mpi/fortran/use-mpi-f08-desc/mod/Makefile.am b/ompi/mpi/fortran/use-mpi-f08-desc/mod/Makefile.am
index ec5a76f..2e47016 100644
--- a/ompi/mpi/fortran/use-mpi-f08-desc/mod/Makefile.am
+++ b/ompi/mpi/fortran/use-mpi-f08-desc/mod/Makefile.am
@@ -27,7 +27,7 @@ noinst_LTLIBRARIES = $(module_sentinel_file)
# f08 support modules
libforce_usempif08_internal_modules_to_be_built_la_SOURCES = \
- mpi-f08-types.f90 \
+ mpi-f08-types.F90 \
mpi-f08-interfaces.F90
#
@@ -41,7 +41,7 @@ MOSTLYCLEANFILES = *.mod
# manually here. Bummer!
#
-mpi-f08-types.lo: mpi-f08-types.f90
+mpi-f08-types.lo: mpi-f08-types.F90
mpi-f08-interfaces.lo: mpi-f08-interfaces.F90 mpi-f08-types.loWill it be merged to the master? |
|
first thing first, @jsquyres can you please review this PR ? @t-kurita do you really need the Jeff, do you have any recollection on why we
regarding the inline patch, at first glance, i'd rather add yet an other |
|
@t-kurita is my colleague. I'll explain. In Open MPI master (and release branches),
|
|
Let me ask a different question: should we delete the descriptor-based It has sat dormant for years, and I certainly have no cycles to develop it further. Does anyone else? If not, we should probably delete it (it'll always be in git history if someone wants to dig it out / continue the work). |
in order to solve an egg and the chicken problem, in which mpiext need mpi-f08-types.mod and/but use-mpi-f08[-desc] needs mpiext, add an extra step - build fortran 2008 modules only - build fortran 2008 mpi extensions - and then build fortran 2008 bindings Fixes open-mpi#3605 Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
so Open MPI can be configure'd with --enable-mpi-f08-subarray-prototype Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
344f000 to
2c71c27
Compare
|
@jsquyres i pushed two commits into master, so this PR is now really only for the last one @t-kurita @kawashima-fj just to be clear, is the inline patch something you need ? i have no strong opinion whether we should (or not) remove |
|
@ggouaillardet Thanks for your work. We Fujitsu don't need the inline patch and we also have no strong option about
|
|
If no one has any strong feelings, then we should remove the |
in order to solve an egg and the chicken problem, in which mpiext need mpi-f08-types.mod
and/but use-mpi-f08[-desc] needs mpiext, add an extra step
Fixes #3605
Signed-off-by: Gilles Gouaillardet gilles@rist.or.jp