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

Add cray mod output check and unused newunit macro to configure script #1561

Merged
merged 4 commits into from
Aug 29, 2024
Merged

Add cray mod output check and unused newunit macro to configure script #1561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
209c498
add in m4 macro to check if cray module output flag is needed
Jul 25, 2024
3b5bd28
remove some unneeded spaces and force the added rm
Jul 25, 2024
184b6b7
fix notneeded getting added as a flag
Jul 25, 2024
47cc553
use variable for module extension and add in previously unused m4
Jul 26, 2024
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
7 changes: 7 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,13 @@ if test $hdf5_fpe_bug = yes; then
NetCDF must be built with a HDF5 version other than 1.14.3 to support floating point exception traps.])
fi

rm -f test.nc

# Check if we need a flag to not capitalize module output (needed with cray compiler)
GX_FC_MOD_CASE_FLAG([FCFLAGS="$FCFLAGS $FC_MOD_CASE_FLAG"])

# Check if new unit is supported
GX_FC_08_OPEN_NEWUNIT([], [AC_MSG_ERROR([Compiler support for use of newunit argument is required to build FMS])])

# Check if Fortran compiler has the Class, Character array assign bug
GX_FC_CLASS_CHAR_ARRAY_BUG_CHECK()
Expand Down
52 changes: 52 additions & 0 deletions m4/gx_fortran_options.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
# GX_FC_CRAY_POINTER_FLAG([ACTION-IF-SUCCESS], [ACTION-IF-FAILURE = FAILURE])
# GX_FC_INTERNAL_FILE_NML()
# GX_FC_CHECK_MOD(module-name, [only], [action-if-found], [action-if-not-found])
# GX_FC_MOD_OUTPUT_CASE([ACTION-IF-SUCCESS], [ACTION-IF-FAILURE])
#
# DESCRIPTION
#
Expand Down Expand Up @@ -405,3 +406,54 @@ AC_DEFUN([_GX_FORTRAN_PP_SRCEXT_POP], [
AS_VAR_SET_IF([_gx_fortran_pp_srcext_save], [ac_ext=${_gx_fortran_pp_srcext_save}], [ac_ext="f"])
unset _gx_fortran_pp_srcext_save
])# _GX_FORTRAN_PP_SRCEXT_POP


# GX_FC_MOD_CASE_FLAG([ACTION-IF-SUCCESS], [ACTION-IF-FAILURE])
# -----------------------------------------------------------------------------
# Checks if the output .mod files are in uppercase by default.
# This has only been seen with cray compiler. A flag is required to disable the uppercase output
# and instead follow the case of the module name as written in the source file.
#
# Sets the variable FC_MOD_CASE_FLAG to hold the flag that disables the behavior.
#
AC_DEFUN([GX_FC_MOD_CASE_FLAG],[
AC_LANG_PUSH([Fortran])
AC_FC_SRCEXT(F90)
AC_CACHE_CHECK([if Fortran flag needed for module output case], [gx_cv_fc_mod_case_flag],[
gx_cv_fc_mod_case_flag="unknown"
gx_mod_case_flag_FCFLAGS_save=$FCFLAGS

FCFLAGS="$gx_mod_case_flag_FCFLAGS_save -c"
AC_COMPILE_IFELSE([[module foo
end module foo]],
[],
AC_MSG_ERROR(["Failed to compile test module with -c"]))

# if output .mod file is capitalized, add the flag and check that it works
if test -f "FOO.${FC_MODEXT}"; then
FCFLAGS="$gx_mod_case_flag_FCFLAGS_save -c -ef"
AC_COMPILE_IFELSE([[module foo
end module mod]],
[])
if test -f "foo.${FC_MODEXT}"; then
gx_cv_fc_mod_case_flag="-ef"
fi
else
gx_cv_fc_mod_case_flag=no
fi

rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
FCFLAGS=$gx_mod_case_flag_FCFLAGS_save
])

if test "x$gx_cv_fc_mod_case_flag" = "xunknown"; then
m4_default([$2],
[AC_MSG_ERROR([No working flag found to disable module filename capitalization])])
elif test "x$gx_cv_fc_mod_case_flag" != "xno"; then
FC_MOD_CASE_FLAG=$gx_cv_fc_mod_case_flag
AC_SUBST([FC_MOD_CASE_FLAG])
$1
fi
AC_LANG_POP([Fortran])
])

Loading