Skip to content

Commit

Permalink
Version 5.3.0, Revision 23887, Hash d7cf4a0
Browse files Browse the repository at this point in the history
MODIFIED *  config/m4/acx_fortran_flags.m4 config/m4/acx_get_fc_kind.m4 configure include/version/version.m4

Bugs:
-Fixed configure for intel 2025

Additions:
-

Changes:
-

Patch sent by:  Claudio Attaccalite <[email protected]>
  • Loading branch information
attacc committed Dec 9, 2024
1 parent d7cf4a0 commit 8803efb
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 32 deletions.
8 changes: 4 additions & 4 deletions config/m4/acx_fortran_flags.m4
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ i?86*linux*)
CPU_FLAG=" "
;;
esac
SYSFLAGS="-assume bscc -O3 -g -ip $CPU_FLAG"
SYSFLAGS="-assume bscc -O3 -g $CPU_FLAG"
FUFLAGS="-assume bscc -O0 $CPU_FLAG"
DEBUG_FLAGS="-check all -CB -traceback -check bound"
;;
Expand Down Expand Up @@ -166,7 +166,7 @@ i?86*linux*)
CPU_FLAG="-mtune=pentium4"
;;
esac
SYSFLAGS="-assume bscc -O3 -g -ip ${CPU_FLAG}"
SYSFLAGS="-assume bscc -O3 -g ${CPU_FLAG}"
FUFLAGS="-assume bscc -O0 -g ${CPU_FLAG}"
FCMFLAG="-nofor_main"
OMPFLAGS="-openmp"
Expand Down Expand Up @@ -243,7 +243,7 @@ ia64*linux* )
CPU_FLAG=""
;;
esac
SYSFLAGS="-assume bscc -O2 -g -ip ${CPU_FLAG}"
SYSFLAGS="-assume bscc -O2 -g ${CPU_FLAG}"
FUFLAGS="-assume bscc -O0 -g ${CPU_FLAG}"
FCMFLAG="-nofor_main"
OMPFLAGS="-openmp"
Expand Down Expand Up @@ -361,7 +361,7 @@ aarch*linux* | arm*linux* )
CPU_FLAG=" "
;;
esac
SYSFLAGS="-assume bscc -O3 -g -ip ${CPU_FLAG}"
SYSFLAGS="-assume bscc -O3 -g ${CPU_FLAG}"
FUFLAGS="-assume bscc -O0 -g ${CPU_FLAG}"
NETCDFFLAGS="-DpgiFortran"
DEBUG_FLAGS="-CB -traceback -debug full"
Expand Down
14 changes: 9 additions & 5 deletions config/m4/acx_get_fc_kind.m4
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,7 @@ case "${FC}" in
FCKIND="intel"
FCVERSION=`$FC -v 2>&1`
;;
*ifx*)
FCKIND="intel"
FCVERSION=`$FC -v 2>&1`
;;
*ifort*)
*ifort* | *ifx* )
FCKIND="intel"
FCVERSION=`$FC -v 2>&1`
$FC -v >& ver_
Expand All @@ -56,6 +52,10 @@ case "${FC}" in
VER_18=`grep 18. ver_ | wc -l`
VER_19=`grep 19. ver_ | wc -l`
VER_2021=`grep 2021. ver_ | wc -l`
VER_2022=`grep 2022. ver_ | wc -l`
VER_2023=`grep 2023. ver_ | wc -l`
VER_2024=`grep 2024. ver_ | wc -l`
VER_2025=`grep 2025. ver_ | wc -l`
if ! test "$VER_8" = "0"; then INTELVERSION="8" ; fi
if ! test "$VER_9" = "0"; then INTELVERSION="9" ; fi
if ! test "$VER_10" = "0"; then INTELVERSION="10" ; fi
Expand All @@ -69,6 +69,10 @@ case "${FC}" in
if ! test "$VER_18" = "0"; then INTELVERSION="18" ; fi
if ! test "$VER_19" = "0"; then INTELVERSION="19" ; fi
if ! test "$VER_2021" = "0"; then INTELVERSION="2021" ; fi
if ! test "$VER_2022" = "0"; then INTELVERSION="2022" ; fi
if ! test "$VER_2023" = "0"; then INTELVERSION="2023" ; fi
if ! test "$VER_2024" = "0"; then INTELVERSION="2024" ; fi
if ! test "$VER_2025" = "0"; then INTELVERSION="2025" ; fi
rm -f ver_
;;
*)
Expand Down
44 changes: 24 additions & 20 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for Yambo 5.3.0 r.23887 h.4679cafa1.
# Generated by GNU Autoconf 2.71 for Yambo 5.3.0 r.23888 h.d7cf4a00d.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -610,8 +610,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Yambo'
PACKAGE_TARNAME='yambo'
PACKAGE_VERSION='5.3.0 r.23887 h.4679cafa1'
PACKAGE_STRING='Yambo 5.3.0 r.23887 h.4679cafa1'
PACKAGE_VERSION='5.3.0 r.23888 h.d7cf4a00d'
PACKAGE_STRING='Yambo 5.3.0 r.23888 h.d7cf4a00d'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1659,7 +1659,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures Yambo 5.3.0 r.23887 h.4679cafa1 to adapt to many kinds of systems.
\`configure' configures Yambo 5.3.0 r.23888 h.d7cf4a00d to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1725,7 +1725,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Yambo 5.3.0 r.23887 h.4679cafa1:";;
short | recursive ) echo "Configuration of Yambo 5.3.0 r.23888 h.d7cf4a00d:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1967,7 +1967,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Yambo configure 5.3.0 r.23887 h.4679cafa1
Yambo configure 5.3.0 r.23888 h.d7cf4a00d
generated by GNU Autoconf 2.71

Copyright (C) 2021 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2596,7 +2596,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by Yambo $as_me 5.3.0 r.23887 h.4679cafa1, which was
It was created by Yambo $as_me 5.3.0 r.23888 h.d7cf4a00d, which was
generated by GNU Autoconf 2.71. Invocation command line was

$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -3354,8 +3354,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
SVERSION="5"
SSUBVERSION="3"
SPATCHLEVEL="0"
SREVISION="23887"
SHASH="4679cafa1"
SREVISION="23888"
SHASH="d7cf4a00d"



Expand Down Expand Up @@ -7176,11 +7176,7 @@ case "${FC}" in
FCKIND="intel"
FCVERSION=`$FC -v 2>&1`
;;
*ifx*)
FCKIND="intel"
FCVERSION=`$FC -v 2>&1`
;;
*ifort*)
*ifort* | *ifx* )
FCKIND="intel"
FCVERSION=`$FC -v 2>&1`
$FC -v >& ver_
Expand All @@ -7197,6 +7193,10 @@ case "${FC}" in
VER_18=`grep 18. ver_ | wc -l`
VER_19=`grep 19. ver_ | wc -l`
VER_2021=`grep 2021. ver_ | wc -l`
VER_2022=`grep 2022. ver_ | wc -l`
VER_2023=`grep 2023. ver_ | wc -l`
VER_2024=`grep 2024. ver_ | wc -l`
VER_2025=`grep 2025. ver_ | wc -l`
if ! test "$VER_8" = "0"; then INTELVERSION="8" ; fi
if ! test "$VER_9" = "0"; then INTELVERSION="9" ; fi
if ! test "$VER_10" = "0"; then INTELVERSION="10" ; fi
Expand All @@ -7210,6 +7210,10 @@ case "${FC}" in
if ! test "$VER_18" = "0"; then INTELVERSION="18" ; fi
if ! test "$VER_19" = "0"; then INTELVERSION="19" ; fi
if ! test "$VER_2021" = "0"; then INTELVERSION="2021" ; fi
if ! test "$VER_2022" = "0"; then INTELVERSION="2022" ; fi
if ! test "$VER_2023" = "0"; then INTELVERSION="2023" ; fi
if ! test "$VER_2024" = "0"; then INTELVERSION="2024" ; fi
if ! test "$VER_2025" = "0"; then INTELVERSION="2025" ; fi
rm -f ver_
;;
*)
Expand Down Expand Up @@ -7330,7 +7334,7 @@ i?86*linux*)
CPU_FLAG=" "
;;
esac
SYSFLAGS="-assume bscc -O3 -g -ip $CPU_FLAG"
SYSFLAGS="-assume bscc -O3 -g $CPU_FLAG"
FUFLAGS="-assume bscc -O0 $CPU_FLAG"
DEBUG_FLAGS="-check all -CB -traceback -check bound"
;;
Expand Down Expand Up @@ -7392,7 +7396,7 @@ i?86*linux*)
CPU_FLAG="-mtune=pentium4"
;;
esac
SYSFLAGS="-assume bscc -O3 -g -ip ${CPU_FLAG}"
SYSFLAGS="-assume bscc -O3 -g ${CPU_FLAG}"
FUFLAGS="-assume bscc -O0 -g ${CPU_FLAG}"
FCMFLAG="-nofor_main"
OMPFLAGS="-openmp"
Expand Down Expand Up @@ -7469,7 +7473,7 @@ ia64*linux* )
CPU_FLAG=""
;;
esac
SYSFLAGS="-assume bscc -O2 -g -ip ${CPU_FLAG}"
SYSFLAGS="-assume bscc -O2 -g ${CPU_FLAG}"
FUFLAGS="-assume bscc -O0 -g ${CPU_FLAG}"
FCMFLAG="-nofor_main"
OMPFLAGS="-openmp"
Expand Down Expand Up @@ -7587,7 +7591,7 @@ aarch*linux* | arm*linux* )
CPU_FLAG=" "
;;
esac
SYSFLAGS="-assume bscc -O3 -g -ip ${CPU_FLAG}"
SYSFLAGS="-assume bscc -O3 -g ${CPU_FLAG}"
FUFLAGS="-assume bscc -O0 -g ${CPU_FLAG}"
NETCDFFLAGS="-DpgiFortran"
DEBUG_FLAGS="-CB -traceback -debug full"
Expand Down Expand Up @@ -17780,7 +17784,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by Yambo $as_me 5.3.0 r.23887 h.4679cafa1, which was
This file was extended by Yambo $as_me 5.3.0 r.23888 h.d7cf4a00d, which was
generated by GNU Autoconf 2.71. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -17844,7 +17848,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
Yambo config.status 5.3.0 r.23887 h.4679cafa1
Yambo config.status 5.3.0 r.23888 h.d7cf4a00d
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"

Expand Down
6 changes: 3 additions & 3 deletions include/version/version.m4
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
AC_INIT(Yambo, 5.3.0 r.23887 h.4679cafa1, [email protected])
AC_INIT(Yambo, 5.3.0 r.23888 h.d7cf4a00d, [email protected])
SVERSION="5"
SSUBVERSION="3"
SPATCHLEVEL="0"
SREVISION="23887"
SHASH="4679cafa1"
SREVISION="23888"
SHASH="d7cf4a00d"
AC_SUBST(SVERSION)
AC_SUBST(SSUBVERSION)
AC_SUBST(SPATCHLEVEL)
Expand Down

0 comments on commit 8803efb

Please sign in to comment.