new QDUtil+AD_dnSVM libs

lauvergn · Jan 31, 2023 · e193318 · e193318
1 parent 68d53b3
commit e193318
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/Ext_Lib/Save_AD_dnSVM_devloc.zip b/Ext_Lib/Save_AD_dnSVM_devloc.zip
diff --git a/Ext_Lib/Save_QDUtilLib_devloc.zip b/Ext_Lib/Save_QDUtilLib_devloc.zip
diff --git a/Ext_Lib/get_AD_dnSVM.sh b/Ext_Lib/get_AD_dnSVM.sh
@@ -16,7 +16,7 @@ rm -rf $BaseName* #always remove the link
 
 #latest release
 #latest HEAD version (dev version)
- version=https://github.com/lauvergn/AD_dnSVM/archive/refs/tags/v3.2.zip
+ version=https://github.com/lauvergn/AD_dnSVM/archive/refs/tags/v3.4-dev.zip
 
 
 test -z $EXTLIB_TYPE       &&    curl -LJ $version --output $LOC_version.zip

diff --git a/Ext_Lib/get_QDUtilLib.sh b/Ext_Lib/get_QDUtilLib.sh
@@ -14,7 +14,7 @@ rm -rf $BaseName* #always remove the link
 
 
 #latest release
- version=https://github.com/lauvergn/QDUtilLib/archive/refs/tags/v0.7.zip
+ version=https://github.com/lauvergn/QDUtilLib/archive/refs/tags/v0.10-dev.zip
 #latest HEAD version
 #version=https://github.com/lauvergn/QDUtilLib/archive/refs/heads/main.zip
 

diff --git a/makefile b/makefile
@@ -213,23 +213,6 @@ $(QMLIBA): $(OBJ)
 	ar -cr $(QMLIBA) $(OBJ)
 	@echo "  done Library: "$(QMLIBA)
 #===============================================
-#=== external libraries ========================
-# AD_dnSVM + QDUTIL Lib
-#===============================================
-#
-$(QDLIBA):
-	@test -d $(ExtLibDIR) || (echo $(ExtLibDIR) "does not exist" ; exit 1)
-	@test -d $(QD_DIR) || (cd $(ExtLibDIR) ; ./get_QDUtilLib.sh $(EXTLIB_TYPE))
-	@test -d $(QD_DIR) || (echo $(QD_DIR) "does not exist" ; exit 1)
-	cd $(QD_DIR) ; make lib FC=$(FFC) OPT=$(OOPT) OMP=$(OOMP) LAPACK=$(LLAPACK) ExtLibDIR=$(ExtLibDIR)
-	@echo "  done " $(QDLIBA) " in QML"
-#
-$(ADLIBA):
-	@test -d $(ExtLibDIR) || (echo $(ExtLibDIR) "does not exist" ; exit 1)
-	@test -d $(AD_DIR) || (cd $(ExtLibDIR) ; ./get_AD_dnSVM.sh  $(EXTLIB_TYPE))
-	@test -d $(AD_DIR) || (echo $(AD_DIR) "does not exist" ; exit 1)
-	cd $(AD_DIR) ; make lib FC=$(FFC) OPT=$(OOPT) OMP=$(OOMP) LAPACK=$(LLAPACK) ExtLibDIR=$(ExtLibDIR)
-	@echo "  done " $(AD_DIR) " in QML"
 #===============================================
 #
 #===============================================
@@ -268,6 +251,23 @@ zip: cleanall
 	cd $(ExtLibSAVEDIR) ; zip -r Save_$(BaseName)_devloc.zip $(BaseName)_devloc
 	cd $(ExtLibSAVEDIR) ; rm -rf $(BaseName)_devloc
 	@echo "  done zip"
+#=== external libraries ========================
+# AD_dnSVM + QDUTIL Lib
+#===============================================
+#
+$(QDLIBA):
+	@test -d $(ExtLibDIR) || (echo $(ExtLibDIR) "does not exist" ; exit 1)
+	@test -d $(QD_DIR) || (cd $(ExtLibDIR) ; ./get_QDUtilLib.sh $(EXTLIB_TYPE))
+	@test -d $(QD_DIR) || (echo $(QD_DIR) "does not exist" ; exit 1)
+	cd $(QD_DIR) ; make lib FC=$(FFC) OPT=$(OOPT) OMP=$(OOMP) LAPACK=$(LLAPACK) ExtLibDIR=$(ExtLibDIR)
+	@echo "  done " $(QDLIBA) " in "$(BaseName)
+#
+$(ADLIBA):
+	@test -d $(ExtLibDIR) || (echo $(ExtLibDIR) "does not exist" ; exit 1)
+	@test -d $(AD_DIR) || (cd $(ExtLibDIR) ; ./get_AD_dnSVM.sh  $(EXTLIB_TYPE))
+	@test -d $(AD_DIR) || (echo $(AD_DIR) "does not exist" ; exit 1)
+	cd $(AD_DIR) ; make lib FC=$(FFC) OPT=$(OOPT) OMP=$(OOMP) LAPACK=$(LLAPACK) ExtLibDIR=$(ExtLibDIR)
+	@echo "  done " $(AD_DIR) " in "$(BaseName)
 #===============================================
 #============= module dependencies =============
 #===============================================

diff --git a/version-QML b/version-QML
@@ -1 +1 @@
-QML =  20.0
+QML =  20.2