Merge branch 'draco-7_16_0' into 'develop'

Draco-7_16_0 See merge request draco/draco!301
lanl · Aug 23, 2023 · 5bcea7b · 5bcea7b
2 parents cd67b23 + 6d928f6
commit 5bcea7b
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 31 deletions.
diff --git a/.gitlab/ci/ccscs-jobs.yml b/.gitlab/ci/ccscs-jobs.yml
@@ -247,7 +247,7 @@ ccs5_deb_llvm12_deploy:
   variables:
     DEPLOY: 'TRUE'
     FLAVOR: ${DRACO_ENV}-${CMAKE_BUILD_TYPE}
-    DRACO_INSTALL_DIR: "/scratch/regress/deploy/${CI_COMMIT_BRANCH}/${FLAVOR}"
+    DRACO_INSTALL_DIR: "/scratch/regress/deploy/${CI_COMMIT_TAG}${CI_COMMIT_BRANCH}/${FLAVOR}"
     EXTRA_CMAKE_ARGS: -G Ninja
   script:
     - echo "branch = $CI_COMMIT_BRANCH, tag = $CI_COMMIT_TAG"

diff --git a/.gitlab/ci/darwin-jobs.yml b/.gitlab/ci/darwin-jobs.yml
@@ -94,7 +94,7 @@ dx64_deb_nvhpc231_deploy:
   variables:
     DEPLOY: 'TRUE'
     FLAVOR: ${DRACO_ENV}-${CMAKE_BUILD_TYPE}
-    DRACO_INSTALL_DIR: "/usr/projects/draco/${CI_COMMIT_BRANCH}/${FLAVOR}"
+    DRACO_INSTALL_DIR: "/usr/projects/draco/${CI_COMMIT_TAG}${CI_COMMIT_BRANCH}/${FLAVOR}"
   script:
     - echo "branch = $CI_COMMIT_BRANCH, tag = $CI_COMMIT_TAG"
     - echo "Starting dx64_deploy_release..."

diff --git a/.gitlab/ci/ro-jobs.yml b/.gitlab/ci/ro-jobs.yml
@@ -90,7 +90,7 @@ ro_deb_fulldiag_deploy:
   variables:
     DEPLOY: 'TRUE'
     FLAVOR: ${DRACO_ENV}-${CMAKE_BUILD_TYPE}
-    DRACO_INSTALL_DIR: "/usr/projects/draco/${CI_COMMIT_BRANCH}/${SITE_ID}/${FLAVOR}"
+    DRACO_INSTALL_DIR: "/usr/projects/draco/${CI_COMMIT_TAG}${CI_COMMIT_BRANCH}/${SITE_ID}/${FLAVOR}"
   script:
     - echo "branch = $CI_COMMIT_BRANCH, tag = $CI_COMMIT_TAG"
     - echo "Starting ro_deploy_release..."

diff --git a/.gitlab/ci/rzansel-jobs.yml b/.gitlab/ci/rzansel-jobs.yml
@@ -69,7 +69,7 @@ rzansel_deb_xl1611_deploy:
   variables:
     DEPLOY: 'TRUE'
     FLAVOR: ${DRACO_ENV}-${CMAKE_BUILD_TYPE}
-    DRACO_INSTALL_DIR: "/usr/gapps/jayenne/${CI_COMMIT_BRANCH}/${SITE_ID}/${FLAVOR}"
+    DRACO_INSTALL_DIR: "/usr/gapps/jayenne/${CI_COMMIT_TAG}${CI_COMMIT_BRANCH}/${SITE_ID}/${FLAVOR}"
   script:
     - echo "branch = $CI_COMMIT_BRANCH, tag = $CI_COMMIT_TAG"
     - echo "Starting rzansel_deploy_release..."

diff --git a/.gitlab/ci/snow-jobs.yml b/.gitlab/ci/snow-jobs.yml
@@ -85,7 +85,7 @@ sn_rel_g930_deploy:
   variables:
     DEPLOY: 'TRUE'
     FLAVOR: ${DRACO_ENV}-${CMAKE_BUILD_TYPE}
-    DRACO_INSTALL_DIR: "/usr/projects/draco/${CI_COMMIT_BRANCH}/${SITE_ID}/${FLAVOR}"
+    DRACO_INSTALL_DIR: "/usr/projects/draco/${CI_COMMIT_TAG}${CI_COMMIT_BRANCH}/${SITE_ID}/${FLAVOR}"
   script:
     - echo "branch = $CI_COMMIT_BRANCH, tag = $CI_COMMIT_TAG"
     - echo "Starting sn_deploy_release..."

diff --git a/.gitlab/ci/tt-jobs.yml b/.gitlab/ci/tt-jobs.yml
@@ -72,7 +72,7 @@ tt_deb_i202120_deploy:
   variables:
     DEPLOY: 'TRUE'
     FLAVOR: ${DRACO_ENV}-${CMAKE_BUILD_TYPE}
-    DRACO_INSTALL_DIR: "/usr/projects/draco/${CI_COMMIT_BRANCH}/${SITE_ID}/${FLAVOR}"
+    DRACO_INSTALL_DIR: "/usr/projects/draco/${CI_COMMIT_TAG}${CI_COMMIT_BRANCH}/${SITE_ID}/${FLAVOR}"
   script:
     - echo "branch = $CI_COMMIT_BRANCH, tag = $CI_COMMIT_TAG"
     - echo "Starting tt_deploy_release..."

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ string(CONCAT ddesc "An object-oriented component library supporting radiation t
 project(
   Draco
   DESCRIPTION ${ddesc}
-  VERSION 7.15.0
+  VERSION 7.16.0
   LANGUAGES CXX C)
 
 # Export compile commands for compiler tools

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,28 @@
+2023-08-21 Mathew Cleveland <[email protected]>
+	* Draco has been updated to version 7_16_0 and is tied to the release
+	of Jayenne-8_15_0
+      and capsaicin/dert-1_0_0
+        - https://re-git.lanl.gov/draco/draco/-/milestones/6
+        - https://re-git.lanl.gov/jayenne/jayenne/-/milestones/28
+        - https://re-git.lanl.gov/capsaicin/dert/-/milestones/
+
+	Draco-7_16_0, build date 2023 Aug 21, build type: Debug, DBC: 7, DRACO_DIAGNOSTICS: 0
+
+    CCS-2 Draco Team: Kelly G. Thompson, Matt A. Cleveland, Ryan T. Wollaeger, Ben R. Ryan, 
+     Alex R. Long, Kendra P. Long, James S. Warsa, Jae H. Chang, and Jeff R. Haack.
+
+    Prior Contributors: Kent G. Budge, Gabriel M. Rockefeller, Allan B. Wollaber, Tim Kelley, 
+     Rob B. Lowrie, Paul W. Talbot, Katherine J. Wang, Andrew T. Till, Ondrej Certik, Peter Ahrens, 
+     David A. Dixon, Massimiliano Rosa, Todd J. Urbatsch, Daniel Holladay, Howard Pritchard, 
+     Jeff D. Densmore, Jeff Furnish, John McGhee, Kris C. Garrett, Mike Buksas, Nick Myers, 
+     Paul Henning, Randy Roberts, Seth Johnson, Todd Adams, Tom Evans, Lori Pritchett-Sheats, 
+     and Seth D. Cook.
+
+    Copyright (C) 2016-2023 Triad National Security, LLC. (C19028, LA-CC-16-016),
+     Released under a 3-Clause BSD License.
+
+    For information, send e-mail to [email protected].	
+
 2023-02-08 Mathew Cleveland <[email protected]>
 	* Draco has been updated to version 7_15_0 and is tied to the release
 	of Jayenne-8_14_0

diff --git a/README.md b/README.md
@@ -99,15 +99,14 @@ Many thanks go to Draco's [contributors](https://github.com/lanl/Draco/graphs/co
 Draco was originally written by staff from Los Alamos's [CCS-2 Computational Physics and Methods
 Group](http://www.lanl.gov/org/padste/adtsc/computer-computational-statistical-sciences/computational-physics-methods/index.php):
 
-> *CCS-2 Draco Team:* Kelly G. Thompson, Matt A. Cleveland, Ryan T. Wollaeger, Ben R. Ryan,
-> Alex R. Long, Kendra P. Long, James S. Warsa, and Jae H. Chang.
+> *CCS-2 Draco Team:* Kelly G. Thompson, Matt A. Cleveland, Ryan T. Wollaeger,
+> Ben R. Ryan, Alex R. Long, Kendra P. Long, James S. Warsa, Jae H. Chang, and Jeff R. Haack.
 >
-> *Prior Contributors:* Kent. G. Budge, Gabriel M. Rockefeller, Allan B. Wollaber, Tim Kelley,
-> Rob B. Lowrie, Andrew T. Till, Paul W. Talbot, Katherine J. Wang, Ondrej Certik, Peter Ahrens,
-> David A. Dixon, Massimiliano Rosa, Todd J. Urbatsch, Daniel Holladay, Howard Pritchard,
-> Jeff D. Densmore, Jeff Furnish, John McGhee, Kris C. Garrett, Mike Buksas, Nick Myers,
-> Paul Henning, Randy Roberts, Seth Johnson, Todd Adams, Tom Evans, Lori Pritchett-Sheats,
-> and Seth D. Cook.
+> *Prior Contributors:* Kent G. Budge, Gabriel M. Rockefeller, Allan B. Wollaber, Tim Kelley,
+> Rob B. Lowrie, Paul W. Talbot, Katherine J. Wang, Andrew T. Till, Ondrej Certik, Peter Ahrens,
+> David A. Dixon, Massimiliano Rosa, Todd J. Urbatsch, Daniel Holladay, Howard Pritchard, Jeff D.
+> Densmore, Jeff Furnish, John McGhee, Kris C. Garrett, Mike Buksas, Nick Myers, Paul Henning,
+> Randy Roberts, Seth Johnson, Todd Adams, Tom Evans, Lori Pritchett-Sheats, and Seth D. Cook.
 
 ## Release
 

diff --git a/src/ds++/FMA.hh b/src/ds++/FMA.hh
@@ -188,6 +188,7 @@ inline T fma_with_diagnostics(T const a, T const b, T const c, std::string const
 #ifdef FMA_ALWAYS_SOFTWARE
 #undef FMA
 #define FMA(a, b, c) fma((a), (b), (c))
+#undef FMAF
 #define FMAF(a, b, c) fmaf((a), (b), (c))
 #undef FMA_ACCURATE
 #define FMA_ACCURATE(a, b, c) fma((a), (b), (c))
@@ -196,6 +197,7 @@ inline T fma_with_diagnostics(T const a, T const b, T const c, std::string const
 #ifdef FMA_NEVER_SOFTWARE
 #undef FMA
 #define FMA(a, b, c) ((a) * (b) + c)
+#undef FMAF
 #define FMAF(a, b, c) ((a) * (b) + c)
 #undef FMA_ACCURATE
 #define FMA_ACCURATE(a, b, c) ((a) * (b) + c)

diff --git a/src/ds++/Release.cc b/src/ds++/Release.cc
@@ -99,27 +99,28 @@ const std::string author_list(bool const use_doxygen_formatting) {
 
   mmdevs current_developers;
   // not totally fair... KT got credit for LOC when svn repository was converted to git.
-  current_developers.insert(fomdev(178687, "Kelly G. Thompson"));
-  current_developers.insert(fomdev(22763, "Kent G. Budge"));
-  current_developers.insert(fomdev(17033, "Matt A. Cleveland"));
-  current_developers.insert(fomdev(8396, "Ryan T. Wollaeger"));
-  current_developers.insert(fomdev(4044, "Ben R. Ryan"));
-  current_developers.insert(fomdev(3162, "Alex R. Long"));
-  current_developers.insert(fomdev(1614, "Kendra P. Long"));
-  current_developers.insert(fomdev(1263, "James S. Warsa"));
-  current_developers.insert(fomdev(354, "Jae H. Chang"));
-  current_developers.insert(fomdev(152, "Andrew T. Till"));
+  current_developers.insert(fomdev(169484, "Kelly G. Thompson"));
+  current_developers.insert(fomdev(17600, "Matt A. Cleveland"));
+  current_developers.insert(fomdev(8229, "Ryan T. Wollaeger"));
+  current_developers.insert(fomdev(4840, "Ben R. Ryan"));
+  current_developers.insert(fomdev(3063, "Alex R. Long"));
+  current_developers.insert(fomdev(1903, "Kendra P. Long"));
+  current_developers.insert(fomdev(1259, "James S. Warsa"));
+  current_developers.insert(fomdev(358, "Jae H. Chang"));
+  current_developers.insert(fomdev(74, "Jeff R. Haack"));
 
   mmdevs prior_developers;
 
-  prior_developers.insert(fomdev(3602, "Gabriel M. Rockefeller"));
-  prior_developers.insert(fomdev(1711, "Allan B. Wollaber"));
-  prior_developers.insert(fomdev(858, "Tim Kelley"));
-  prior_developers.insert(fomdev(407, "Rob B. Lowrie"));
+  prior_developers.insert(fomdev(22116, "Kent G. Budge"));
+  prior_developers.insert(fomdev(3551, "Gabriel M. Rockefeller"));
+  prior_developers.insert(fomdev(1682, "Allan B. Wollaber"));
+  prior_developers.insert(fomdev(593, "Tim Kelley"));
+  prior_developers.insert(fomdev(394, "Rob B. Lowrie"));
   prior_developers.insert(fomdev(282, "Paul W. Talbot"));
-  prior_developers.insert(fomdev(184, "Katherine J. Wang"));
+  prior_developers.insert(fomdev(166, "Katherine J. Wang"));
+  prior_developers.insert(fomdev(144, "Andrew T. Till"));
   prior_developers.insert(fomdev(90, "Ondrej Certik"));
-  prior_developers.insert(fomdev(64, "Peter Ahrens"));
+  prior_developers.insert(fomdev(63, "Peter Ahrens"));
   prior_developers.insert(fomdev(15, "David A. Dixon"));
 
   // Previous authors with no current LOC attribution (less than 10):