Skip to content

Commit

Permalink
Merge branch 'master' into tech-isolv-bse
Browse files Browse the repository at this point in the history
  • Loading branch information
sangallidavide committed Dec 11, 2024
2 parents 24d60eb + 6f78224 commit 679093e
Show file tree
Hide file tree
Showing 237 changed files with 1,684 additions and 1,309 deletions.
7 changes: 6 additions & 1 deletion config/m4/scalapack.m4
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ fi
#
# Parse configure options
#
if test "$enable_par_linalg" = "yes" ; then
enable_blacs="internal" ;
enable_scalapack="internal" ;
fi
#
case $with_blacs_libs in
yes) enable_blacs="internal" ;;
no) enable_blacs="no" ; enable_par_linalg="no" ;;
Expand Down Expand Up @@ -127,7 +132,7 @@ if test "$mpibuild" = "yes"; then
fi
#
if test "$mpif_found" = "yes" && test "$enable_blacs" = "internal"; then
enable_blacs="yes"
enable_blacs="yes";
internal_blacs="yes";
BLACS_LIBS="${extlibs_path}/${FCKIND}/${FC}/lib/libblacs.a ${extlibs_path}/${FCKIND}/${FC}/lib/libblacs_C_init.a ${extlibs_path}/${FCKIND}/${FC}/lib/libblacs_init.a";
if test -e "${extlibs_path}/${FCKIND}/${FC}/lib/libblacs.a" && test -e "${extlibs_path}/${FCKIND}/${FC}/lib/libblacs_init.a"; then
Expand Down
2 changes: 1 addition & 1 deletion config/mk/global/actions/compile_interfaces.mk
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ $(GOALS):
@$(MAKE) $(MAKEFLAGS) dependencies
@$(MAKE) $(MAKEFLAGS) ext-libs
@$(MAKE) $(MAKEFLAGS) int-libs
@+LIBS="$(2Y_LIBS)";BASE="src";ADF="$(I_PRECMP) -D_$@";$(todo_lib);$(mk_lib)
@+LIBS="$(2Y_LIBS)";LAB="_Y_";BASE="src";ADF="$(I_PRECMP) -D_$@";$(todo_lib);$(mk_lib)
@+LIBS="int_modules";BASE="interfaces";ADF="$(I_PRECMP)";$(todo_lib);$(mk_lib)
@+X2DO="$@";BASE="interfaces/$@";XLIBS="$(2Y_LIBS_LD)";ADF="$(I_PRECMP)";$(todo_driver)
@+X2DO="$@";BASE="interfaces/$@";XLIBS="$(2Y_LIBS_LD)";ADF="$(I_PRECMP)";$(mk_exe)
4 changes: 2 additions & 2 deletions config/mk/global/actions/compile_yambo.mk
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ endif
#
# Compilation
#
yambo yambo_ph yambo_sc yambo_rt yambo_nl:
yambo yambo_ph yambo_sc yambo_rt yambo_nl:
@rm -f ${compdir}/log/"compile_"$@".log"
@rm -f ${compdir}/config/stamps_and_lists/compilation_stop_$@.stamp
@touch ${compdir}/config/stamps_and_lists/compiling_$@.stamp
@$(call todo_precision,$(PRECMP))
@$(MAKE) $(MAKEFLAGS) dependencies
@$(MAKE) $(MAKEFLAGS) ext-libs
@$(MAKE) $(MAKEFLAGS) int-libs
@+LIBS="$(SRC_LIBS)";BASE="src";ADF="$(PRECMP) -D_yambo";$(todo_lib);$(mk_lib)
@+LIBS="$(SRC_LIBS)";LAB="_Y_";BASE="src";ADF="$(PRECMP) -D_yambo";$(todo_lib);$(mk_lib)
@+X2DO="$@";BASE="driver";XLIBS="$(EXE_LIBS)";ADF="$(PRECMP)";$(todo_driver)
@+X2DO="$@";BASE="driver";XLIBS="$(EXE_LIBS)";ADF="$(PRECMP)";$(mk_exe)
4 changes: 2 additions & 2 deletions config/mk/global/actions/compile_ypp.mk
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ypp ypp_ph ypp_sc ypp_rt_gpl ypp_rt ypp_nl:
@$(MAKE) $(MAKEFLAGS) dependencies
@$(MAKE) $(MAKEFLAGS) ext-libs
@$(MAKE) $(MAKEFLAGS) int-libs
@+LIBS="$(Y_SRC_LIBS)";BASE="src";ADF="$(Y_PRECMP) -D_ypp";$(todo_lib);$(mk_lib)
@+LIBS="$(YPP_SRC_LIBS)";LAB="_ypp_";BASE="ypp";ADF="$(YPP_PRECMP)";$(todo_lib);$(mk_lib)
@+LIBS="$(Y_SRC_LIBS)";LAB="_Y_";BASE="src";ADF="$(Y_PRECMP) -D_ypp";$(todo_lib);$(mk_lib)
@+LIBS="$(YPP_SRC_LIBS)";LAB="_YPP_";BASE="ypp";ADF="$(YPP_PRECMP)";$(todo_lib);$(mk_lib)
@+X2DO="$@";BASE="driver";XLIBS="$(Y_EXE_LIBS)";X_ypp_LIBS="$(YPP_EXE_LIBS)";ADF="$(YPP_PRECMP)";$(todo_driver)
@+X2DO="$@";BASE="driver";XLIBS="$(Y_EXE_LIBS)";X_ypp_LIBS="$(YPP_EXE_LIBS)";ADF="$(YPP_PRECMP)";$(mk_exe)
7 changes: 4 additions & 3 deletions config/mk/global/functions/help.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Authors (see AUTHORS file for details): AM
#
define yambo_help
$(ECHO) "\n This is $(y_version)";
$(ECHO) "\n This is $(y_version)\n";
if [ "$(1)" = "header" ] || [ -z "$(1)" ] ; then \
$(ECHO) "\n Use the following commands to get specific help:\n" ;\
$(ECHO) " to get general info on the Yambo projects included in this source use:\n >make help what=intro" ;\
Expand All @@ -31,8 +31,9 @@ define yambo_help
$(ECHO) "\n *** Utils ***";\
$(ECHO) -n " [utils] "; for target in $(UTILS); do $(ECHO) -n " $$target" ; done;$(ECHO) ;\
$(ECHO) "\n *** Files & Packages ***" ;\
$(ECHO) " make check-packages = check the packages required (and optional) for Yambo to compile correctly";\
$(ECHO) " make check-files = list all git untracked files and empty directories.";\
$(ECHO) " make check-packages = check the packages required (and optional) for Yambo to compile correctly";\
$(ECHO) " make check-files = list all git untracked files and empty directories.";\
$(ECHO) " make dependencies what=update = clean and update the .mod dependencies files.";\
$(ECHO) "\n *** Cleaning ***" ;\
$(ECHO) " The cleaning procedure of yambo is divided in several modules: bin int-libs driver src ypp interfaces conf dep";\
$(ECHO) " Each of these module can be called by using";\
Expand Down
7 changes: 3 additions & 4 deletions config/mk/global/functions/mk_exe.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
# Authors (see AUTHORS file for details): AM
#
define mk_exe
LLIBS="";for lib in $$XLIBS; do if test -f $(compdir)/lib/lib$$lib.a; then LLIBS="$$LLIBS -l$$lib" ; fi; done ; \
for lib in $$X_ypp_LIBS; do if test -f $(compdir)/lib/lib_ypp_$$lib.a; then LLIBS="$$LLIBS -l_ypp_$$lib" ; fi ; done ; \
LLIBS="";for lib in $$XLIBS; do if test -f $(compdir)/lib/lib_Y_$$lib.a; then LLIBS="$$LLIBS -l_Y_$$lib" ; fi; done ; \
for lib in $$X_ypp_LIBS; do if test -f $(compdir)/lib/lib_YPP_$$lib.a; then LLIBS="$$LLIBS -l_YPP_$$lib" ; fi ; done ; \
for exe in $$X2DO; do \
if test ! -f $(compdir)/config/stamps_and_lists/$$exe.stamp && test ! -f $(compdir)/config/stamps_and_lists/compilation_stop_$$exe.stamp; then \
DLIBS="-ldriver"; \
./sbin/compilation/helper.sh -d $$BASE -t $$exe -o .objects -m x -g $@ -- "$$DLIBS $$LLIBS $(xcpp) $$ADF"; \
./sbin/compilation/helper.sh -d $$BASE -t $$exe -o .objects -m x -g $@ -- "$$LLIBS $(xcpp) $$ADF"; \
cd $$BASE ; $(MAKE) $(MAKEFLAGS) VPATH=$(srcdir)/$$BASE exe || { grep Error $(compdir)/log/compile_$@.log ; exit "$$?"; } ; cd $(compdir); \
fi;\
if test ! -f $(compdir)/config/stamps_and_lists/$$exe.stamp; then \
Expand Down
10 changes: 5 additions & 5 deletions config/mk/global/libraries.mk
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ include lib/archive/package.list
#
INT_LIBS = qe_pseudo slatec math77 local
YAMBO_INT_LIBS= Yio
YLIBIO = Ymodules Yio
YLIBIO = modules Yio
YLIBIO_LD = $(YLIBIO)
#
# Yambo folders
#===============
#
BASIC_LIBS = driver tools Ymodules memory allocations matrices linear_algebra parallel parser communicate output common timing Yio io $(IO_MODE) \
BASIC_LIBS = driver tools modules memory allocations matrices linear_algebra parallel parser communicate output common timing Yio io $(IO_MODE) \
xc_functionals interface stop_and_restart wf_and_fft bz_ops coulomb
BASIC_LIBS_LD= tools memory allocations communicate Ymodules matrices linear_algebra bz_ops parallel parser output common timing Yio io $(IO_MODE) \
BASIC_LIBS_LD= driver tools memory allocations communicate modules matrices linear_algebra bz_ops parallel parser output common timing Yio io $(IO_MODE) \
xc_functionals interface stop_and_restart wf_and_fft coulomb

MAIN_LIBS = $(BASIC_LIBS) interpolate qp_control setup tddft dipoles pol_function qp acfdt bse
Expand Down Expand Up @@ -55,9 +55,9 @@ PJ_NLLIBS_LD = $(BASIC_LIBS_LD) interpolate real_time_control qp_control setup \
# Yambo folders needed by Interfaces
#=====================================
#
2Y_LIBS = driver tools Ymodules memory allocations matrices linear_algebra parallel parser communicate output common timing Yio io $(IO_MODE) \
2Y_LIBS = driver tools modules memory allocations matrices linear_algebra parallel parser communicate output common timing Yio io $(IO_MODE) \
setup interface stop_and_restart bz_ops
2Y_LIBS_LD = tools memory allocations communicate Ymodules matrices linear_algebra parallel parser output common timing Yio io $(IO_MODE) \
2Y_LIBS_LD = driver tools memory allocations communicate modules matrices linear_algebra parallel parser output common timing Yio io $(IO_MODE) \
setup interface stop_and_restart bz_ops
#
# YPP folders
Expand Down
2 changes: 1 addition & 1 deletion config/mk/global/targets.mk
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ MAIN = $(CORE) $(PH_PROJ) $(SC_PROJ) $(RT_PROJ) $(NL_PROJ)
ALL = $(CORE) $(PH_PROJ) $(SC_PROJ) $(RT_PROJ) $(NL_PROJ)
BROKEN =
SCRIPTS = ydb.pl
EXE = $(CORE) $(PH_PROJ) $(SC_PROJ) $(RT_PROJ) $(GPL) $(NL_PROJ) $(BROKEN) $(SCRIPTS)
EXE = $(CORE) $(PH_PROJ) $(SC_PROJ) $(RT_PROJ) $(NL_PROJ) $(BROKEN) $(SCRIPTS)
11 changes: 6 additions & 5 deletions config/report.in
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@
# [@GPU_check@] GPU support ( @GPU_SUPPORT@ @GPU_libinfo@@LIBCUDA_PATH@)
# [@MPI_check@] MPI
# [@OPENMP_check@] OpenMP
# [@PARIO_check@] Parallel I/O
#
# - I/O -
#
# [@PARIO_check@]: Parallel I/O @PARIO_info@
# [@HDF5_check@]: HDF5 @HDF5_info@
# [@NETCDF_check@]: NETCDF @NETCDF_info@
#
# - LIBRARIES -
#
Expand Down Expand Up @@ -71,10 +76,6 @@
# @LIBCUDA_INCS_R@
# [@MPI_check@] MPI : @MPI_LIBS@ @MPI_info@
# @MPI_INCS@
# [@FUTILE_check@] FUTILE : @FUTILE_LIBS_R@
# @FUTILE_INCS_R@
# [@YAML_check@] YAML : @YAML_LIBS_R@
# @YAML_INCS_R@
#
# - COMPILERS -
#
Expand Down
2 changes: 1 addition & 1 deletion config/setup.in
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ netcdf_flag = @NETCDFFLAGS@
lhdf5 = @HDF5_LIBS@
ihdf5 = @HDF5_INCS@
hdf5_opt = @HDF5_OPT@
hdf5_mode = @HDF5_MODE@ # ( production | clean | debug )
hdf5_mode = @HDF5_MODE@ # ( production | clean | debug )
io_lib_ver = @IO_LIB_VER@
llibxc = @LIBXC_LIBS@
ilibxc = @LIBXC_INCS@
Expand Down
74 changes: 50 additions & 24 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.23795 h.87d0217fe1.
# Generated by GNU Autoconf 2.71 for Yambo 5.2.0 r.23884 h.24d60eb8ca.
#
# 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.23795 h.87d0217fe1'
PACKAGE_STRING='Yambo 5.3.0 r.23795 h.87d0217fe1'
PACKAGE_VERSION='5.2.0 r.23884 h.24d60eb8ca'
PACKAGE_STRING='Yambo 5.2.0 r.23884 h.24d60eb8ca'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -696,8 +696,6 @@ DEVXLIB_check
LIBXC_check
YPY_check
YDB_check
SLEPC_info
PETSC_info
SLEPC_check
PETSC_check
SLK_check
Expand Down Expand Up @@ -1661,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.23795 h.87d0217fe1 to adapt to many kinds of systems.
\`configure' configures Yambo 5.2.0 r.23884 h.24d60eb8ca to adapt to many kinds of systems.

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

Expand Down Expand Up @@ -1727,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.23795 h.87d0217fe1:";;
short | recursive ) echo "Configuration of Yambo 5.2.0 r.23884 h.24d60eb8ca:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1969,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.23795 h.87d0217fe1
Yambo configure 5.2.0 r.23884 h.24d60eb8ca
generated by GNU Autoconf 2.71

Copyright (C) 2021 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2598,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.23795 h.87d0217fe1, which was
It was created by Yambo $as_me 5.2.0 r.23884 h.24d60eb8ca, which was
generated by GNU Autoconf 2.71. Invocation command line was

$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -3354,10 +3352,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu


SVERSION="5"
SSUBVERSION="3"
SSUBVERSION="2"
SPATCHLEVEL="0"
SREVISION="23872"
SHASH="27b840107a"
SREVISION="23884"
SHASH="24d60eb8ca"



Expand Down Expand Up @@ -6951,6 +6949,16 @@ case "${host}" in
#TIMER="ct_etime.o"
if test -z "$F90SUFFIX"; then F90SUFFIX=".f90"; fi
;;
aarch*apple* | arm*apple* )
build_os="apple"
#TIMER="ct_etime.o"
if test -z "$F90SUFFIX"; then F90SUFFIX=".f90"; fi
;;
aarch*linux* | arm*linux* )
build_os="linux"
#TIMER="ct_etime.o"
if test -z "$F90SUFFIX"; then F90SUFFIX=".f90"; fi
;;
powerpc64*linux* )
build_os="linux"
#TIMER="ct_etime.o"
Expand Down Expand Up @@ -7340,7 +7348,7 @@ i?86*linux*)
NETCDFFLAGS="-Df2cFortran"
esac
;;
*86*apple* )
*86*apple* | aarch*apple* | arm*apple* )
case "${FC}" in
*pgf9* | *ftn* | *pgfortran* )
SYSFLAGS="-O1 -gopt -Mnoframe -Mdalign -Mbackslash -cpp"
Expand Down Expand Up @@ -7487,6 +7495,23 @@ ia64*linux* )
NETCDFFLAGS="-Df2cFortran"
esac
;;
aarch*linux* | arm*linux* )
case "${FC}" in
*gfortran*)
SYSFLAGS="-O3 -g -mtune=native -fno-lto"
FUFLAGS="-O0 -g -mtune=native"
SLK_FC_FLAGS="-fallow-argument-mismatch"
FCMFLAG=""
OMPFLAGS="-fopenmp"
NETCDFFLAGS="-DgFortran"
DEBUG_FLAGS="-Og -g -Wall -pedantic -fbounds-check -ffpe-trap=invalid,zero,overflow"
;;
*)
SYSFLAGS="-g -O"
FUFLAGS="-O0"
NETCDFFLAGS="-Df2cFortran"
esac
;;
*x86*64* )
case "${FC}" in
*ftn* )
Expand Down Expand Up @@ -8900,7 +8925,7 @@ case "${CPP}" in
;;
*gcc* )
case "${host}" in
*86*apple* )
*86*apple* | *arm*apple* )
if test -z "$CPPFLAGS"; then CPPFLAGS="-P -D_apple"; fi
;;
* )
Expand All @@ -8920,7 +8945,7 @@ case "${CPP}" in
;;
esac
;;
*86*apple* )
*86*apple* | *arm*apple* )
if test -z "$CPPFLAGS"; then CPPFLAGS="-P -traditional -D_apple"; fi
;;
powerpc64*linux* )
Expand Down Expand Up @@ -13485,6 +13510,11 @@ fi
#
# Parse configure options
#
if test "$enable_par_linalg" = "yes" ; then
enable_blacs="internal" ;
enable_scalapack="internal" ;
fi
#
case $with_blacs_libs in
yes) enable_blacs="internal" ;;
no) enable_blacs="no" ; enable_par_linalg="no" ;;
Expand Down Expand Up @@ -13586,7 +13616,7 @@ printf "%s\n" "$enable_scalapack" >&6; }
fi
#
if test "$mpif_found" = "yes" && test "$enable_blacs" = "internal"; then
enable_blacs="yes"
enable_blacs="yes";
internal_blacs="yes";
BLACS_LIBS="${extlibs_path}/${FCKIND}/${FC}/lib/libblacs.a ${extlibs_path}/${FCKIND}/${FC}/lib/libblacs_C_init.a ${extlibs_path}/${FCKIND}/${FC}/lib/libblacs_init.a";
if test -e "${extlibs_path}/${FCKIND}/${FC}/lib/libblacs.a" && test -e "${extlibs_path}/${FCKIND}/${FC}/lib/libblacs_init.a"; then
Expand Down Expand Up @@ -16686,21 +16716,19 @@ if test "$internal_blacs" = "yes" ; then
fi
#
PETSC_check="-"
PETSC_info=""
if test "$internal_petsc" = "yes" ; then
if test "$compile_petsc" = "yes" ; then PETSC_check="C"; fi
if test "$compile_petsc" = "no" ; then PETSC_check="I"; fi
if ! test "$with_petsc_branch" = "none"; then PETSC_info="(git branch $with_petsc_branch)"; fi
if ! test "$with_petsc_branch" = "none"; then PETSC_LIBS="$PETSC_LIBS (git branch $with_petsc_branch)"; fi
elif test "$enable_petsc" = "yes" ; then
PETSC_check="E"
fi
#
SLEPC_check="-"
SLEPC_info=""
if test "$internal_slepc" = "yes" ; then
if test "$compile_slepc" = "yes" ; then SLEPC_check="C"; fi
if test "$compile_slepc" = "no" ; then SLEPC_check="I"; fi
if ! test "$with_slepc_branch" = "none"; then SLEPC_info="(git branch $with_slepc_branch)"; fi
if ! test "$with_slepc_branch" = "none"; then SLEPC_LIBS="$SLEPC_LIBS (git branch $with_slepc_branch)"; fi
elif test "$enable_slepc" = "yes" ; then
SLEPC_check="E"
fi
Expand Down Expand Up @@ -16794,8 +16822,6 @@ fi





#


Expand Down Expand Up @@ -17754,7 +17780,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.23795 h.87d0217fe1, which was
This file was extended by Yambo $as_me 5.2.0 r.23884 h.24d60eb8ca, which was
generated by GNU Autoconf 2.71. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -17818,7 +17844,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.23795 h.87d0217fe1
Yambo config.status 5.2.0 r.23884 h.24d60eb8ca
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"

Expand Down
Loading

0 comments on commit 679093e

Please sign in to comment.