Update dependency versions to those required for larsoft v09_16_00. A…

…dd e20 qualifier.
chenel · Feb 5, 2021 · 228a908 · 228a908
1 parent 099cc23
commit 228a908
Show file tree

Hide file tree

Showing 6 changed files with 160 additions and 33 deletions.
diff --git a/OscLib/ups/osclib.table b/OscLib/ups/osclib.table
@@ -107,9 +107,9 @@ ACTION=SETUP
 
   # for get-directory-name
   setupRequired(cetpkgsupport)
-  setupRequired(root v6_18_04d -qe19:debug)
-  setupRequired(eigen v3_3_5)
-  setupRequired(boost v1_70_0 -qe19:debug)
+  setupRequired(root v6_22_06a -qe19:debug)
+  setupRequired(eigen v3_3_9a)
+  setupRequired(boost v1_73_0 -qe19:debug)
 
   EnvSet(OSCLIB_VERSION, ${UPS_PROD_VERSION} )
   EnvSet(OSCLIB_INC, ${UPS_PROD_DIR}/include )
@@ -129,10 +129,10 @@ ACTION=SETUP
 
   # for get-directory-name
   setupRequired(cetpkgsupport)
-  setupRequired(root v6_18_04d -qe19:debug)
-  setupRequired(eigen v3_3_5)
-  setupRequired(boost v1_70_0 -qe19:debug)
-  setupRequired(stan_math v2_18_0 -qe19:debug)
+  setupRequired(root v6_22_06a -qe19:debug)
+  setupRequired(eigen v3_3_9a)
+  setupRequired(boost v1_73_0 -qe19:debug)
+  setupRequired(stan_math v3_4_0 -qe19:debug)
 
   EnvSet(OSCLIB_VERSION, ${UPS_PROD_VERSION} )
   EnvSet(OSCLIB_INC, ${UPS_PROD_DIR}/include )
@@ -152,9 +152,9 @@ ACTION=SETUP
 
   # for get-directory-name
   setupRequired(cetpkgsupport)
-  setupRequired(root v6_18_04d -qe19:prof)
-  setupRequired(eigen v3_3_5)
-  setupRequired(boost v1_70_0 -qe19:prof)
+  setupRequired(root v6_22_06a -qe19:prof)
+  setupRequired(eigen v3_3_9a)
+  setupRequired(boost v1_73_0 -qe19:prof)
 
   EnvSet(OSCLIB_VERSION, ${UPS_PROD_VERSION} )
   EnvSet(OSCLIB_INC, ${UPS_PROD_DIR}/include )
@@ -174,10 +174,101 @@ ACTION=SETUP
 
   # for get-directory-name
   setupRequired(cetpkgsupport)
-  setupRequired(root v6_18_04d -qe19:prof)
-  setupRequired(eigen v3_3_5)
-  setupRequired(boost v1_70_0 -qe19:prof)
-  setupRequired(stan_math v2_18_0 -qe19:prof)
+  setupRequired(root v6_22_06a -qe19:prof)
+  setupRequired(eigen v3_3_9a)
+  setupRequired(boost v1_73_0 -qe19:prof)
+  setupRequired(stan_math v3_4_0 -qe19:prof)
+
+  EnvSet(OSCLIB_VERSION, ${UPS_PROD_VERSION} )
+  EnvSet(OSCLIB_INC, ${UPS_PROD_DIR}/include )
+  EnvSet(OSCLIB_FQ_DIR, ${OSCLIB_DIR}`get-directory-name subdir`.`echo ${UPS_PROD_QUALIFIERS} | tr ':' '.'` )
+  EnvSet(OSCLIB_LIB, ${OSCLIB_FQ_DIR}/lib )
+  EnvSet(OSCLIB_BIN, ${OSCLIB_FQ_DIR}/bin )
+  pathPrepend(PATH, ${UPS_PROD_DIR}/bin )
+  pathPrepend(LD_LIBRARY_PATH, ${OSCLIB_LIB})
+
+
+
+FLAVOR=ANY
+QUALIFIERS = "debug:e20:stanfree"
+
+ACTION=SETUP
+  setupEnv()
+  proddir()
+
+  # for get-directory-name
+  setupRequired(cetpkgsupport)
+  setupRequired(root v6_22_06a -qe20:debug)
+  setupRequired(eigen v3_3_9a)
+  setupRequired(boost v1_73_0 -qe20:debug)
+
+  EnvSet(OSCLIB_VERSION, ${UPS_PROD_VERSION} )
+  EnvSet(OSCLIB_INC, ${UPS_PROD_DIR}/include )
+  EnvSet(OSCLIB_FQ_DIR, ${OSCLIB_DIR}`get-directory-name subdir`.`echo ${UPS_PROD_QUALIFIERS} | tr ':' '.'` )
+  EnvSet(OSCLIB_LIB, ${OSCLIB_FQ_DIR}/lib )
+  EnvSet(OSCLIB_BIN, ${OSCLIB_FQ_DIR}/bin )
+  pathPrepend(PATH, ${OSCLIB_BIN} )
+  pathPrepend(LD_LIBRARY_PATH, ${OSCLIB_LIB})
+
+
+FLAVOR=ANY
+QUALIFIERS = "e20:debug:stan"
+
+ACTION=SETUP
+  setupEnv()
+  proddir()
+
+  # for get-directory-name
+  setupRequired(cetpkgsupport)
+  setupRequired(root v6_22_06a -qe20:debug)
+  setupRequired(eigen v3_3_9a)
+  setupRequired(boost v1_73_0 -qe20:debug)
+  setupRequired(stan_math v3_4_0 -qe20:debug)
+
+  EnvSet(OSCLIB_VERSION, ${UPS_PROD_VERSION} )
+  EnvSet(OSCLIB_INC, ${UPS_PROD_DIR}/include )
+  EnvSet(OSCLIB_FQ_DIR, ${OSCLIB_DIR}`get-directory-name subdir`.`echo ${UPS_PROD_QUALIFIERS} | tr ':' '.'` )
+  EnvSet(OSCLIB_LIB, ${OSCLIB_FQ_DIR}/lib )
+  EnvSet(OSCLIB_BIN, ${OSCLIB_FQ_DIR}/bin )
+  pathPrepend(PATH, ${UPS_PROD_DIR}/bin )
+  pathPrepend(LD_LIBRARY_PATH, ${OSCLIB_LIB})
+
+
+FLAVOR=ANY
+QUALIFIERS = "prof:e20:stanfree"
+
+ACTION=SETUP
+  setupEnv()
+  proddir()
+
+  # for get-directory-name
+  setupRequired(cetpkgsupport)
+  setupRequired(root v6_22_06a -qe20:prof)
+  setupRequired(eigen v3_3_9a)
+  setupRequired(boost v1_73_0 -qe20:prof)
+
+  EnvSet(OSCLIB_VERSION, ${UPS_PROD_VERSION} )
+  EnvSet(OSCLIB_INC, ${UPS_PROD_DIR}/include )
+  EnvSet(OSCLIB_FQ_DIR, ${OSCLIB_DIR}`get-directory-name subdir`.`echo ${UPS_PROD_QUALIFIERS} | tr ':' '.'` )
+  EnvSet(OSCLIB_LIB, ${OSCLIB_FQ_DIR}/lib )
+  EnvSet(OSCLIB_BIN, ${OSCLIB_FQ_DIR}/bin )
+  pathPrepend(PATH, ${OSCLIB_BIN} )
+  pathPrepend(LD_LIBRARY_PATH, ${OSCLIB_LIB})
+
+
+FLAVOR=ANY
+QUALIFIERS = "e20:prof:stan"
+
+ACTION=SETUP
+  setupEnv()
+  proddir()
+
+  # for get-directory-name
+  setupRequired(cetpkgsupport)
+  setupRequired(root v6_22_06a -qe20:prof)
+  setupRequired(eigen v3_3_9a)
+  setupRequired(boost v1_73_0 -qe20:prof)
+  setupRequired(stan_math v3_4_0 -qe20:prof)
 
   EnvSet(OSCLIB_VERSION, ${UPS_PROD_VERSION} )
   EnvSet(OSCLIB_INC, ${UPS_PROD_DIR}/include )
@@ -198,9 +289,9 @@ ACTION=SETUP
 
   # for get-directory-name
   setupRequired(cetpkgsupport)
-  setupRequired(root v6_18_04d -qc7:debug)
-  setupRequired(eigen v3_3_5)
-  setupRequired(boost v1_70_0 -qc7:debug)
+  setupRequired(root v6_22_06a -qc7:debug)
+  setupRequired(eigen v3_3_9a)
+  setupRequired(boost v1_73_0 -qc7:debug)
 
   EnvSet(OSCLIB_VERSION, ${UPS_PROD_VERSION} )
   EnvSet(OSCLIB_INC, ${UPS_PROD_DIR}/include )
@@ -220,10 +311,10 @@ ACTION=SETUP
 
   # for get-directory-name
   setupRequired(cetpkgsupport)
-  setupRequired(root v6_18_04d -qc7:debug)
-  setupRequired(eigen v3_3_5)
-  setupRequired(boost v1_70_0 -qc7:debug)
-  setupRequired(stan_math v2_18_0 -qc7:debug)
+  setupRequired(root v6_22_06a -qc7:debug)
+  setupRequired(eigen v3_3_9a)
+  setupRequired(boost v1_73_0 -qc7:debug)
+  setupRequired(stan_math v3_4_0 -qc7:debug)
 
   EnvSet(OSCLIB_VERSION, ${UPS_PROD_VERSION} )
   EnvSet(OSCLIB_INC, ${UPS_PROD_DIR}/include )
@@ -243,9 +334,9 @@ ACTION=SETUP
 
   # for get-directory-name
   setupRequired(cetpkgsupport)
-  setupRequired(root v6_18_04d -qc7:prof)
-  setupRequired(eigen v3_3_5)
-  setupRequired(boost v1_70_0 -qc7:prof)
+  setupRequired(root v6_22_06a -qc7:prof)
+  setupRequired(eigen v3_3_9a)
+  setupRequired(boost v1_73_0 -qc7:prof)
 
   EnvSet(OSCLIB_VERSION, ${UPS_PROD_VERSION} )
   EnvSet(OSCLIB_INC, ${UPS_PROD_DIR}/include )
@@ -265,10 +356,10 @@ ACTION=SETUP
 
   # for get-directory-name
   setupRequired(cetpkgsupport)
-  setupRequired(root v6_18_04d -qc7:prof)
-  setupRequired(eigen v3_3_5)
-  setupRequired(boost v1_70_0 -qc7:prof)
-  setupRequired(stan_math v2_18_0 -qc7:prof)
+  setupRequired(root v6_22_06a -qc7:prof)
+  setupRequired(eigen v3_3_9a)
+  setupRequired(boost v1_73_0 -qc7:prof)
+  setupRequired(stan_math v3_4_0 -qc7:prof)
 
   EnvSet(OSCLIB_VERSION, ${UPS_PROD_VERSION} )
   EnvSet(OSCLIB_INC, ${UPS_PROD_DIR}/include )

diff --git a/jenkins/jenkins_build.sh b/jenkins/jenkins_build.sh
@@ -3,14 +3,14 @@
 set +ex
 env
 
-if [[ $QUALIFIER == *e19* || $QUALIFIER == *c7* ]]
+if [[ $QUALIFIER == *e20* || $QUALIFIER == *e19* || $QUALIFIER == *c7* ]]
 then
     # DUNE lblpwgtools versions
     source /cvmfs/dune.opensciencegrid.org/products/dune/setup_dune.sh || exit 1
-    setup root v6_18_04d -q ${QUALIFIER} || exit 1
-    setup boost v1_70_0 -q $QUALIFIER || exit 1
-    setup eigen v3_3_5 || exit 1
-    if [ $STAN == stan ]; then setup stan_math v2_18_0 -q $QUALIFIER || exit 1; fi
+    setup root v6_22_06a -q ${QUALIFIER} || exit 1
+    setup boost v1_73_0 -q $QUALIFIER || exit 1
+    setup eigen v3_3_9a || exit 1
+    if [ $STAN == stan ]; then setup stan_math v3_4_0 -q $QUALIFIER || exit 1; fi
 else
     # NOvA versions
     source /cvmfs/nova.opensciencegrid.org/externals/setup || exit 1

diff --git a/jenkins/version/Linux64bit+3.10-2.17_debug_e20_stan b/jenkins/version/Linux64bit+3.10-2.17_debug_e20_stan
@@ -0,0 +1,9 @@
+FILE = version
+PRODUCT = osclib
+VERSION = vXX.YY
+
+FLAVOR = Linux64bit+3.10-2.17
+QUALIFIERS = "debug:e20:stan"
+  PROD_DIR = osclib/vXX.YY/
+  UPS_DIR = ups
+  TABLE_FILE = osclib.table
diff --git a/jenkins/version/Linux64bit+3.10-2.17_debug_e20_stanfree b/jenkins/version/Linux64bit+3.10-2.17_debug_e20_stanfree
@@ -0,0 +1,9 @@
+FILE = version
+PRODUCT = osclib
+VERSION = vXX.YY
+
+FLAVOR = Linux64bit+3.10-2.17
+QUALIFIERS = "debug:e20:stanfree"
+  PROD_DIR = osclib/vXX.YY/
+  UPS_DIR = ups
+  TABLE_FILE = osclib.table
diff --git a/jenkins/version/Linux64bit+3.10-2.17_prof_e20_stan b/jenkins/version/Linux64bit+3.10-2.17_prof_e20_stan
@@ -0,0 +1,9 @@
+FILE = version
+PRODUCT = osclib
+VERSION = vXX.YY
+
+FLAVOR = Linux64bit+3.10-2.17
+QUALIFIERS = "prof:e20:stan"
+  PROD_DIR = osclib/vXX.YY/
+  UPS_DIR = ups
+  TABLE_FILE = osclib.table
diff --git a/jenkins/version/Linux64bit+3.10-2.17_prof_e20_stanfree b/jenkins/version/Linux64bit+3.10-2.17_prof_e20_stanfree
@@ -0,0 +1,9 @@
+FILE = version
+PRODUCT = osclib
+VERSION = vXX.YY
+
+FLAVOR = Linux64bit+3.10-2.17
+QUALIFIERS = "prof:e20:stanfree"
+  PROD_DIR = osclib/vXX.YY/
+  UPS_DIR = ups
+  TABLE_FILE = osclib.table