Merge branch 'tech-master' into tech-isolv-bse

yambo-code · Nov 21, 2024 · 27b8401 · 27b8401
2 parents 8750a03 + 3716ede
commit 27b8401
Show file tree

Hide file tree

Showing 68 changed files with 5,915 additions and 3,740 deletions.
diff --git a/config/configure.ac b/config/configure.ac
@@ -25,7 +25,6 @@ AC_CONFIG_SRCDIR([driver/yambo.F])
 #
 m4_include([config/m4/yambo_remote_compilation_setup.m4])
 m4_include([config/m4/yambo_specific.m4])
-m4_include([config/m4/yambo_driver.m4])
 # 
 #  General
 #
@@ -260,9 +259,6 @@ m4_include([config/m4/device_xlib.m4])
 #
 AC_LANG_PUSH(Fortran)
 # ============================================================================
-# Yambo Libs
-AC_YDRIVER
-# ============================================================================
 # YDB/YAMBOpy
 ACX_SCRIPTS
 # ============================================================================

diff --git a/config/m4/yambo_driver.m4 b/config/m4/yambo_driver.m4
diff --git a/config/mk/global/actions/compile_interfaces.mk b/config/mk/global/actions/compile_interfaces.mk
@@ -29,8 +29,7 @@ $(GOALS):
 	@$(MAKE) $(MAKEFLAGS) dependencies
 	@$(MAKE) $(MAKEFLAGS) ext-libs
 	@$(MAKE) $(MAKEFLAGS) int-libs
-	@+LIBS="$(YLIBDRIVER)";LAB="$@_Ydriver_";BASE="lib/yambo/Ydriver/src";ADF="$(I_PRECMP) -D_$@";$(todo_lib);$(mk_lib)
-	@+LIBS="$(2Y_LIBS)";BASE="src";ADF="$(I_PRECMP)";$(todo_lib);$(mk_lib)
+	@+LIBS="$(2Y_LIBS)";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)
diff --git a/config/mk/global/actions/compile_yambo.mk b/config/mk/global/actions/compile_yambo.mk
@@ -38,7 +38,6 @@ yambo yambo_ph yambo_sc yambo_rt yambo_nl:
 	@$(MAKE) $(MAKEFLAGS) dependencies
 	@$(MAKE) $(MAKEFLAGS) ext-libs
 	@$(MAKE) $(MAKEFLAGS) int-libs
-	@+LIBS="$(YLIBDRIVER)";LAB="$@_Ydriver_";BASE="lib/yambo/Ydriver/src";ADF="$(PRECMP) -D_yambo";$(todo_lib);$(mk_lib)
-	@+LIBS="$(SRC_LIBS)";BASE="src";ADF="$(PRECMP)";$(todo_lib);$(mk_lib)
+	@+LIBS="$(SRC_LIBS)";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)
diff --git a/config/mk/global/actions/compile_yambo_libraries.mk b/config/mk/global/actions/compile_yambo_libraries.mk
@@ -5,6 +5,5 @@
 #
 # Authors (see AUTHORS file for details): AM
 #
-Ydriver:Ydriver-dl
 Yio: ext-libs int-libs
 	@+LIBS="$(YLIBIO)"; BASE="src"; ADF="-D_io_lib"; $(todo_lib); $(mk_lib)
diff --git a/config/mk/global/actions/compile_ypp.mk b/config/mk/global/actions/compile_ypp.mk
@@ -52,8 +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="$(YLIBDRIVER)";LAB="$@_Ydriver_";BASE="lib/yambo/Ydriver/src";ADF="$(YPP_PRECMP) -D_ypp";$(todo_lib);$(mk_lib)
-	@+LIBS="$(Y_SRC_LIBS)";BASE="src";ADF="$(Y_PRECMP)";$(todo_lib);$(mk_lib)
+	@+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)
 	@+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)
diff --git a/config/mk/global/actions/dependencies.mk b/config/mk/global/actions/dependencies.mk
@@ -7,6 +7,5 @@
 #
 dependencies: 
 	@$(call clean_project_dependencies_stamp,$(what))
-	@LIB2DO="Ydriver"; $(get_external_libraries)
 	@if ! test -e $(compdir)/config/stamps_and_lists/dependencies.stamp; then ./sbin/compilation/helper.sh -D -N $(MAKEFLAGS);\
 	touch $(compdir)/config/stamps_and_lists/dependencies.stamp; fi
diff --git a/config/mk/global/actions/download_external_libraries.mk b/config/mk/global/actions/download_external_libraries.mk
@@ -39,5 +39,3 @@ petsc-dl:
 	@LIB2DO="petsc"; $(get_external_libraries)
 slepc-dl: 
 	@LIB2DO="slepc"; $(get_external_libraries)
-Ydriver-dl: 
-	@LIB2DO="Ydriver"; $(get_external_libraries)
diff --git a/config/mk/global/actions/help.mk b/config/mk/global/actions/help.mk
@@ -5,7 +5,7 @@
 #
 # Authors (see AUTHORS file for details): AM
 #
-CLEANING_COMPONENTS=bin int-libs driver Ydrive src ypp interfaces conf dep
+CLEANING_COMPONENTS=bin int-libs driver src ypp interfaces conf dep
 help:
 	@$(ECHO)  "\n\n * * * Yambo Makefile help * * * \n" ;
 	@$(ECHO)  "Interfaces: " ;
@@ -32,7 +32,7 @@ help:
 	@$(ECHO)  " The cleaning procedure of yambo is divided in several modules: $(CLEANING_COMPONENTS)"
 	@$(ECHO)  " Each of these module can be called by using"
 	@$(ECHO)  " make clean what=<MODULE> \n"
-	@$(ECHO)  " make clean               =  remove all modules except int-libs, ext-libs, Ydriver, dependencies and configure files."
+	@$(ECHO)  " make clean               =  remove all modules except int-libs, ext-libs, dependencies and configure files."
 	@$(ECHO)  " make clean_all           =  remove all modules. Complete cleaning."
 	@$(ECHO)  " make reset               =  clean  + int-libs."
 	@$(ECHO)  "\n";
diff --git a/config/mk/global/functions/cleaning.mk b/config/mk/global/functions/cleaning.mk
@@ -28,11 +28,6 @@ define clean_driver
  if [ "$(1)" = "driver"    ] || [ -z "$(1)" ] || [ "$(1)" = "all" ] ; then \
   EXTS="\.f90 \.o \.lock \.mk \.mod \.save \.tmp_source to_save";WDIR="$(compdir)";TARG="driver";$(clean_dir_driver);\
  fi
- if [ "$(1)" = "Ydriver"   ] ||                  [ "$(1)" = "all" ] ; then \
-   EXTS="\.f90 \.o \.lock \.mk \.mod \.save \.tmp_source to_save";WDIR="$(libdir)/yambo/Ydriver/src";TARG="$(YLIBDRIVER)";$(clean_dir_driver);\
-   WDIR="$(libdir)";TARG="Ydriver";$(clean_lib_driver);\
-   WDIR="$(libdir)/Ydriver/src";TARG="$(YLIBDRIVER)";$(clean_mod_driver);\
- fi;\
  if                             [ -z "$(1)" ] || [ "$(1)" = "all" ] ; then \
    $(clean_libs_using_stamps_driver); \
    $(call clean_src_driver,"src");\
@@ -44,7 +39,7 @@ define clean_driver
  if [ "$(1)" = "interfaces" ] ; then $(call clean_src_driver,"interfaces"); fi; \
  if [ "$(1)" = "conf"      ] ||                  [ "$(1)" = "all" ] ; then $(clean_config); fi; \
  if [ "$(1)" = "dep"       ] ||                  [ "$(1)" = "all" ] ; then $(clean_dependencies); fi ; \
- if                                              [ "$(1)" = "all" ] ; then $(clean_log_and_Ydriver_folder); fi 
+ if                                              [ "$(1)" = "all" ] ; then $(clean_log_folder); fi 
 endef
 #
 # Drivers (intermediate)
@@ -184,10 +179,8 @@ define clean_project_dependencies_stamp
  rm -f $(prefix)/config/stamps_and_lists/project_dependencies.stamp; \
  fi
 endef
-define clean_log_and_Ydriver_folder
- $(ECHO) "\t[CLEANING] folders and log" ; \
- rm -fr $(srcdir)/lib/yambo;\
- rm -fr $(prefix)/lib/yambo;\
+define clean_log_folder
+ $(ECHO) "\t[CLEANING] log" ; \
  rm -fr $(prefix)/log 
 endef
 define clean_archive

diff --git a/config/mk/global/functions/help.mk b/config/mk/global/functions/help.mk
@@ -34,10 +34,10 @@ define yambo_help
    $(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)  "\n *** Cleaning ***" ;\
-   $(ECHO)  " The cleaning procedure of yambo is divided in several modules: bin int-libs driver Ydriver src ypp interfaces conf dep";\
+   $(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";\
    $(ECHO)  " make clean what=<MODULE> \n";\
-   $(ECHO)  " make clean               =  remove all modules except int-libs, ext-libs, Ydriver, dependencies and configure files.";\
+   $(ECHO)  " make clean               =  remove all modules except int-libs, ext-libs, dependencies and configure files.";\
    $(ECHO)  " make clean_all           =  remove all modules. Complete cleaning.";\
    $(ECHO)  " make reset               =  clean + int-libs.";\
    $(ECHO)  " make gitclean            =  clean all git untracked files.";\

diff --git a/config/mk/global/functions/mk_exe.mk b/config/mk/global/functions/mk_exe.mk
@@ -10,7 +10,7 @@ define mk_exe
  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";for lib in $(YLIBDRIVER_LD); do DLIBS="$$DLIBS -l$$exe$$lib" ; done ; \
+   DLIBS="-ldriver"; \
    ./sbin/compilation/helper.sh -d $$BASE -t $$exe -o .objects -m x -g $@ -- "$$DLIBS $$LLIBS $(xcpp) $$ADF"; \
    cd $$BASE ; $(MAKE) $(MAKEFLAGS) VPATH=$(srcdir)/$$BASE exe || { grep Error $(compdir)/log/compile_$@.log ; exit "$$?"; } ; cd $(compdir); \
   fi;\

diff --git a/config/mk/global/libraries.mk b/config/mk/global/libraries.mk
@@ -14,8 +14,6 @@ include lib/archive/package.list
 #
 INT_LIBS      = qe_pseudo slatec math77 local
 YAMBO_INT_LIBS= Yio 
-YLIBDRIVER    = interface main options 
-YLIBDRIVER_LD = _Ydriver_options _Ydriver_interface _Ydriver_main 
 YLIBIO        = Ymodules Yio
 YLIBIO_LD     = $(YLIBIO)
 #

diff --git a/config/mk/local/functions.mk b/config/mk/local/functions.mk
@@ -8,21 +8,13 @@
 # Functions
 #===========
 #
-# Driver
-#--------
-define driver
- $(PREFIX)(echo "$(cc) $(cflags) $(precomp_flags) $(lf90include) -L$(libdir) -D_$(target) -c $(srcdir)/lib/yambo/Ydriver/src/driver/driver.c" >> $(STDLOG) )
- $(PREFIX)(eval $(cc) $(cflags) $(precomp_flags) $(lf90include) -L$(libdir) -D_$(target) -c $(srcdir)/lib/yambo/Ydriver/src/driver/driver.c >> $(STDLOG) 2>&1  )
-endef
-#
 # Linking
 #---------
 define link
- $(PREFIX)(echo "$(fc) $(fcflags) $(lf90include) $(lf90libinclude) -o $(target) driver.o $(objs) $(libs)" >> $(STDLOG)  ;\
- eval $(fc) $(fcflags) $(lf90include) $(lf90libinclude) -o $(target) driver.o $(objs) $(libs) >> $(STDLOG) 2>&1;\
+ $(PREFIX)(echo "$(fc) $(fcflags) $(lf90include) $(lf90libinclude) -o $(target) $(objs) $(libs)" >> $(STDLOG)  ;\
+ eval $(fc) $(fcflags) $(lf90include) $(lf90libinclude) -o $(target) $(objs) $(libs) >> $(STDLOG) 2>&1;\
  $(ECHO) "\t[$(wdir)] $(target) (link)";\
  if test -f $(target); then \
-   rm driver.o \
    rm -f $(compdir)/config/stamps_and_lists/compiling_$(target).stamp; \
    touch $(compdir)/config/stamps_and_lists/$(target).stamp; \
  fi )

diff --git a/config/mk/local/makefile b/config/mk/local/makefile
@@ -22,7 +22,7 @@ include $(compdir)/config/setup
 #
 # VARIABLES
 #
-idriver=$(IFLAG)$(libdir)/yambo/Ydriver/include $(IFLAG)$(includedir)/driver $(IFLAG)$(includedir)/version
+idriver=$(IFLAG)$(includedir)/driver $(IFLAG)$(includedir)/version
 lf90include=$(IFLAG)$(includedir) $(IFLAG)$(includedir)/headers/common $(IFLAG)$(includedir)/headers/parser $(idriver)
 lf90libinclude=$(iiotk) $(inetcdff) $(inetcdf) $(ipetsc) $(islepc) $(ihdf5) $(ilibxc) $(idevxlib) $(icudalib) $(ifft) $(ifutile) $(iyaml) $(idriver)
 mfiles=find . -maxdepth 1 -name '*.mod'

diff --git a/config/report.in b/config/report.in
@@ -63,8 +63,6 @@
 #
 # > OTHERs: @DEVXLIB_info@
 #
-# [@Ydriver_check@] Ydriver   : @Ydriver_LIB@
-#
 # [@LIBXC_check@] LibXC     : @LIBXC_LIBS_R@
 #                 @LIBXC_INCS_R@
 # [@DEVXLIB_check@] DevXlib   : @DEVXLIB_LIBS_R@

diff --git a/config/setup.in b/config/setup.in
@@ -99,7 +99,6 @@ lfutile     = @FUTILE_LIBS@
 ifutile     = @FUTILE_INCS@
 letsf       = @ETSF_LIBS@
 ietsf       = @ETSF_INCS@
-idriver     = @DRIVER_INCS@
 mpipath     = @MPI_PATH@
 #
 # VPATH