diff --git a/CMakeLists.txt b/CMakeLists.txt index 5cb89e3fe3..0d37a54c7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ # All rights reserved. #------------------------------------------------------------------------------# -# Build notes: +# Build notes: # https://rtt.lanl.gov/redmine/projects/draco/wiki/ # https://rtt.lanl.gov/redmine/projects/draco/wiki/Common_Configure_Options @@ -42,7 +42,7 @@ set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/config ) # The Draco version number. # set(DRACO_VERSION_MAJOR 6) -set(DRACO_VERSION_MINOR 22) +set(DRACO_VERSION_MINOR 23) # set(DRACO_VERSION_PATCH 0) # only set this for a release include(dracoVersion) set_ccs2_software_version( DRACO ) diff --git a/ChangeLog b/ChangeLog index 8549f1fa55..632d30f4b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,248 @@ +2017-10-16 Kelly (KT) Thompson + + * "Release draco-6_23_0":https://rtt.lanl.gov/redmine/versions/55. + This is a minor Draco release. + + * This release was required by Jayenne and Capsaicin. It is + linked to: + - "Jayenne-7_16_0":https://rtt.lanl.gov/redmine/versions/56 + - "Capsaicin-4_12_0":https://rtt.lanl.gov/redmine/projects/capsaicin + + * Platforms: + PI/ML/LU Intel 17.0.1 OpenMPI-1.10.5 + Intel 17.0.4 OpenMPI-2.1.2 + (GCC 6.4.0) (OpenMPI-2.1.2) + SN/FI/IC Intel 17.0.1 OpenMPI-1.10.5 + Intel 17.0.4 OpenMPI-2.1.2 + (GCC 6.4.0) (OpenMPI-2.1.2) + TT/TR Intel 17.0.1 Cray_MPICH2-7.5.2 + Intel 17.0.4 Cray_MPICH2-7.6.2 + + * Summary of changes: + - 314 files changed, added or removed in 111 commits. + - Eliminate direct comparison of floating point types, #251, #252, + #253, #254. + - Begin requiring CMake 3.9.0 or later, #272. + - Added more MPI functions to c4 including, #280 + . Added non-blocking sends and receives with custom MPI datatypes + . Added no-blocking allreduce call with the standard of send_is test + now includes example of a custom MPI datatype and a send/receive with + that type. + - Provide prefix sum for arrays, #320. + - Provide a thread_wrapper, #327. + + * Developer Environment: + - Improved bash function `selectscratchdir`, #250. + - Provide some bash functions that provide information about slurm, + #324. Try `slurmhelp`. + - Begin using newer tools, vendors on HPC machines, #324. + . Intel/17.0.4, openmpi/2.1.2. + . superlu-dist/5.1.3, trilinos/12.10.1, etc. + + * Build system + - Fix inconsistent use of case for the special string RELWITHDEBINFO, + #250. + - On Cray systems, test registration fixed to use correct srun options, + #257. + - Begin requiring CMake 3.9.0 or later, #272. + - Allow tstSuperludist.cc to link to superlu-dist-5+, #278. + - Upgrade how the Compton TPL is discovered, presented and used. #292. + - Fix compilation against MKL when using GNU compilers, #330 + - Cray regressions now run from /ccs/codes/ccsrad to eliminate 'bus + error' issues seen when running from lustre. + + * c4: + - Global_Timer was updated to be more useful for parallel runs. The new + implementation provides mean time plus deviations per rank, #256. + - Provide a C++ version of the xthi tool. This tool shows thread + assignmetns to hardware, #269. + - Added more MPI functions to c4 including, #280 + . Added non-blocking sends and receives with custom MPI datatypes + . Added no-blocking allreduce call with the standard of send_is test + now includes example of a custom MPI datatype and a send/receive with + that type. + - Restore ability to compile Draco when DRACO_C4=SCALAR, #315. + - Provide prefix sum for arrays, #320. + + * compton: + - Updated Compton test to use input files found in the source + directory, #246. + - Upgrade how the Compton TPL is discovered, presented and used. #292 + - Compton interface updates for v0.3, #296 + - Begin testing CSK via draco on LANL HPC, #313. + + * ds++ + - Begin using `std::enable_if` to simplify the definition of + `soft_equiv`. It is no longer defined for integral types, #255. + - Provide new CPP macros for unit tests: `FAIL_IF(c)` and + `FAIL_IF_NOT(c)`, #271. + - Provide common string functions in a single file, #285: + New functions: + . trim - remove whitespace (or any specified characters) from + beginning and end of a string. + . prune - remove specified characters from a string. + . parse_number - Convert a string into a floating-point or integral + type (int, long, unsigned, float, double, etc.) + . string_to_numvec - Convert a string into a vector where T is a + numeric type. String entries are separated by + specified delimiter. Optional beginning and ending + range symbols may also be provided. For example, + string = "{ 1.3, 2.3 }" --> vector = {1,3, + 2.3}; + Relocated functions: + + . to_string - convert a number into a string preserving + precision. Previously found at ds++/to_string.hh + . tokenize - convert a string into a vector based on the + specified delimiter. Previously found at + UnitTest.hh. + . get_word_count - convert a stringstream or fstream into a + map where the number of occurrences + of each word is reported. Previously found at + UnitTest.hh. Often used to check text output from + unit tests. + - Provide a thread_wrapper, #327. + + * norms: + - Provide code to compute the norm of the difference of two vectors, + #262. + + * parser: + - Improve efficiency of Parallel_File_Token_Stream's open function, + #290 + - Tweak the parser package, #291, #299 + . Remove unneeded global_barrier from + Parallel_File_Token_Stream::fill_character_buffer_. Processors + should be synchronized by the preceding broadcast, with intervening + code such that there should be no danger of processors getting out + of synch. + . Replace use of NULL with nullptr in Parse_Table.cc. This is the + more modern syntax. + . Add a move-aware version of the basic constructor for + String_Token_Stream, since calling this constructor with a c-string + (implicitly converted to std::string rvalue) is a common practice. + . Strengthen DBC checks in Text_Token_Stream.cc + . Clean up Parse_Table by spelling out null pointer comparisons and + using auto judiciously. + . Remove difficult to test branches through use of check_syntax and + check_semantics in place of if-tests. + - Tighten up the parser code, #326. + + * plot2d: + - Fixed plot2d tests that were failing on snow, #247. + + * quadrature: + - Provided azimuthal order accessor for Chebyshev-Legendre quadrature, + #284. + - Only add starting-directions when required, #286. + + * units: + - Added the classical electron radius to the PhysicalConstants file, + #268. + + * Details for defects and features can be found at + https://rtt.lanl.gov/redmine/isues/#. + + Corrected defects: + + * Bug #906 All gitlab pipelines are failing + * Bug #954 plot2D test are failing on snow + * Bug #956 snow: Not finding MKL as suitable provider of LAPACK + * Bug #959 Force rebuild of serrano when running 'make' from test + directory + * Bug #960 Add ccscs2 Release CI build for every PR. + * Bug #961 Trinitite CIs are not running + * Bug #964 metrics_report.sh should not report package + sub-sub-directories + * Bug #966 Totalview and DDT encounter 'pipe error' + * Bug #972 ApplicationUnitTest is missing options for srun + * Bug #1005 Make TPL compton a full vendor + * Bug #1011 clang-format no longer works + * Bug #1012 Build out new vendors + * Bug #1018 Nightly regressions not running correctly on ccscs7 + * Bug #1024 Fix gcc-6.4.0 + mkl builds on snow + + New Features: + * None + + Known Defects: + * Bug #1010 Review, reset file permissions + * Bug #1025 Add common build options to "Enabled features" list in + build summary + + * Statistics: + +Contributers (updated Release.cc and README.md with this ordering). + +CCS-2 Draco Team: Kelly G. Thompson, Kent G. Budge, James S. Warsa, + Alex R. Long, Rob B. Lowrie, Kendra P. Keady, Jae H. Chang, + Matt A. Cleveland, Ryan T. Wollaeger, Andrew T. Till, Daniel Holladay, + Massimiliano Rosa and Kris C. Garrett. +Prior Contributers: Jeff D. Densmore, Gabriel M. Rockefeller, + Allan B. Wollaber, Lori A. Pritchett-Sheats, Paul W. Talbot, + and Katherine J. Wang. + +Lines of code +------------- + +-------------------------------------------------------------------------------- +Language files blank comment code +-------------------------------------------------------------------------------- +C++ 423 12364 22105 51054 +C/C++ Header 331 6695 20707 16176 +Lisp 17 2027 2897 13059 +CMake 120 2153 5705 9005 +Bourne Shell 33 663 1507 2945 +Bourne Again Shell 14 282 553 1543 +Python 13 387 654 1315 +CSS 1 113 37 395 +Fortran 90 8 113 218 380 +C 4 48 114 244 +C Shell 2 32 36 167 +DOS Batch 4 53 71 93 +YAML 2 18 98 77 +HTML 2 6 47 65 +CUDA 3 17 61 40 +make 2 22 14 39 +-------------------------------------------------------------------------------- +SUM: 979 24993 54824 96597 +-------------------------------------------------------------------------------- + +Code coverage +------------- + +Directory Function Coverage C/D Coverage +-------------------------------- --------------------- --------------------- +FortranChecks/ 1 / 1 = 100% 7 / 14 = 50% +RTT_Format_Reader/ 323 / 323 = 100% 373 / 434 = 85% +c4/ 157 / 166 = 94% 380 / 429 = 88% +cdi/ 46 / 46 = 100% 63 / 76 = 82% +cdi_analytic/ 146 / 165 = 88% 172 / 224 = 76% +cdi_eospac/ 52 / 52 = 100% 65 / 127 = 51% +cdi_ipcress/ 106 / 106 = 100% 188 / 247 = 76% +compton/ 10 / 10 = 100% 0 / 0 +diagnostics/ 15 / 20 = 75% 28 / 42 = 66% +ds++/ 317 / 321 = 98% 457 / 522 = 87% +fit/ 1 / 1 = 100% 15 / 16 = 93% +lapack_wrap/ 12 / 12 = 100% 0 / 0 +linear/ 16 / 16 = 100% 334 / 392 = 85% +memory/ 4 / 6 = 66% 0 / 2 = 0% +meshReaders/ 15 / 15 = 100% 127 / 172 = 73% +mesh_element/ 23 / 24 = 95% 154 / 201 = 76% +min/ 9 / 9 = 100% 137 / 154 = 88% +norms/ 25 / 26 = 96% 21 / 34 = 61% +ode/ 5 / 5 = 100% 29 / 32 = 90% +parser/ 293 / 298 = 98% 1184 / 1512 = 78% +quadrature/ 221 / 227 = 97% 580 / 738 = 78% +rng/ 57 / 57 = 100% 23 / 24 = 95% +roots/ 8 / 8 = 100% 259 / 312 = 83% +special_functions/ 30 / 32 = 93% 192 / 216 = 88% +timestep/ 62 / 63 = 98% 104 / 178 = 58% +units/ 80 / 80 = 100% 58 / 58 = 100% +viz/ 32 / 32 = 100% 131 / 174 = 75% +-------------------------------- --------------------- --------------------- +Total 2066 / 2121 = 97% 5081 / 6330 = 80% + 2017-07-03 Kelly (KT) Thompson * "Release draco-6_22_0":https://rtt.lanl.gov/redmine/versions/52. @@ -24,6 +269,8 @@ * Developer Environment: + * Build system: + - Make setup of lmod modulefiles run faster for setup scripts. - Automate selection of scratch directory. - Improve robustness of CI scripting. diff --git a/README.md b/README.md index 04e6c3e03d..151814d2b0 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Draco was originally written by staff from Los Alamos's [CCS-2 Computational Phy > Kelly G. Thompson, Kent G. Budge, James S. Warsa, Alex R. Long, > Rob B. Lowrie, Kendra P. Keady, Jae H. Chang, Mathew A. Cleveland, -> Andrew T. Till, Daniel Holladay, Ryan T. Wollaeger, +> Ryan T. Wollaeger, Andrew T. Till, Daniel Holladay, > Massimiliano Rosa and Kris C. Garrett. > Jeff D. Densmore, Gabriel M. Rockefeller, Allan B. Wollaber, diff --git a/regression/alist.sh b/regression/alist.sh index 1b556908da..002394d870 100755 --- a/regression/alist.sh +++ b/regression/alist.sh @@ -54,7 +54,8 @@ for file in $tmp; do *mesh | *output.in | *png | *ps | *xs4 ) # drop these files from the count. ;; - *) projectfiles="$projectfiles $file" ;; + *) + if [[ -f $file ]]; then projectfiles="$projectfiles $file"; fi ;; esac done @@ -96,7 +97,7 @@ for entry in "${entries[@]}"; do pahrens) current_author="Peter Ahrens" ;; talbotp) current_author="Paul Talbot" ;; tmonster) current_author="Todd J. Urbatsch" ;; - warsa) current_author="James S. Warsa" ;; + warsa | *Warsa) current_author="James S. Warsa" ;; wollaber) current_author="Allan B. Wollaber" ;; wollaege | *Wollaeger) current_author="Ryan T. Wollaeger" ;; esac diff --git a/regression/scripts/common.sh b/regression/scripts/common.sh index 807c2390a7..8d8443cb74 100755 --- a/regression/scripts/common.sh +++ b/regression/scripts/common.sh @@ -79,8 +79,8 @@ function establish_permissions install_group="dacodes" install_permissions="g+rwX,o-rwX" else - install_group="jayenne" - install_permissions="g+rwX,o-rwX" + install_group="draco" + install_permissions="g-rwX,o-rwX" fi ;; esac diff --git a/regression/scripts/release_cray.msub b/regression/scripts/release.msub similarity index 88% rename from regression/scripts/release_cray.msub rename to regression/scripts/release.msub index 4a33c5eb64..081d5c693c 100755 --- a/regression/scripts/release_cray.msub +++ b/regression/scripts/release.msub @@ -1,11 +1,8 @@ #!/bin/bash -# -l - # For config and build steps, this file is run as a bash script on the -# front-end. For the test step, this file is submitted to the batch -# system. This file is designed to be called from -# scripts/release_cray.sh. +# front-end. For the test step, this file is submitted to the batch system. +# This file is designed to be called from scripts/release_cray.sh. ##---------------------------------------------------------------------------## ## Generic setup @@ -30,15 +27,15 @@ if test $verbose == 1; then echo "make command = make -j $build_pe -l $build_pe" echo "test command = ctest -j $test_pe" echo "steps = ${steps}" + echo "queue = $access_queue" echo echo fi -#dry_run=1 +# dry_run=1 install_versions -echo -e "\nAll done with release_cray.msub\n" - +echo -e "\nAll done with $0\n" ##---------------------------------------------------------------------------## ## End diff --git a/regression/scripts/release_cray.sh b/regression/scripts/release_cray.sh index 16e9b543e3..77f63a98e8 100755 --- a/regression/scripts/release_cray.sh +++ b/regression/scripts/release_cray.sh @@ -1,4 +1,4 @@ -#!/bin/bash -l +#!/bin/bash ##---------------------------------------------------------------------------## ## Assumptions: @@ -26,7 +26,7 @@ # Draco install directory name (/usr/projects/draco/draco-NN_NN_NN) export package=draco -ddir=draco-6_22_0 +ddir=draco-6_23_0 pdir=$ddir # environment (use draco modules) @@ -40,19 +40,20 @@ esac function intel17env() { run "module load user_contrib friendly-testing" -run "module unload ndi metis parmetis superlu-dist trilinos" +run "module unload ndi metis parmetis superlu-dist trilinos csk" run "module unload lapack gsl intel" run "module unload cmake" run "module unload intel gcc" run "module unload PrgEnv-intel PrgEnv-cray PrgEnv-gnu" run "module unload papi perftools" run "module load PrgEnv-intel" -run "module unload xt-libsci xt-totalview intel" -run "module load intel/17.0.1 craype-hugepages4M" -run "module load gsl/2.1" -run "module load cmake/3.7.1 numdiff" -run "module load trilinos/12.8.1 superlu-dist/4.3 metis/5.1.0 parmetis/4.0.3" -run "module load ndi random123 eospac/6.2.4" +run "module unload xt-libsci xt-totalview" +# run module unload intel" +# run "module load intel/17.0.1 craype-hugepages4M" +run "module load gsl" +run "module load cmake/3.9.0 numdiff" +run "module load trilinos superlu-dist metis parmetis" +run "module load ndi random123 eospac/6.2.4 csk" run "module list" CC=`which cc` CXX=`which CC` @@ -65,20 +66,21 @@ export TARGET=haswell function intel17env-knl() { run "module load user_contrib friendly-testing" -run "module unload ndi metis parmetis superlu-dist trilinos" +run "module unload ndi metis parmetis superlu-dist trilinos csk" run "module unload lapack gsl intel" run "module unload cmake" run "module unload intel gcc" run "module unload PrgEnv-intel PrgEnv-cray PrgEnv-gnu" run "module unload papi perftools" run "module load PrgEnv-intel" -run "module unload xt-libsci xt-totalview intel" -run "module load intel/17.0.1 craype-hugepages4M" +run "module unload xt-libsci xt-totalview" +# run "module unload intel" +#run "module load intel/17.0.1 craype-hugepages4M" run "module swap craype-haswell craype-mic-knl" -run "module load gsl/2.1" -run "module load cmake/3.6.2 numdiff" -run "module load trilinos/12.8.1 superlu-dist/4.3 metis/5.1.0 parmetis/4.0.3" -run "module load ndi random123 eospac/6.2.4" +run "module load gsl" +run "module load cmake/3.9.0 numdiff" +run "module load trilinos superlu-dist metis parmetis" +run "module load ndi random123 eospac/6.2.4 csk" run "module list" CC=`which cc` CXX=`which CC` @@ -95,12 +97,11 @@ export TARGET=knl ##---------------------------------------------------------------------------## ## Generic setup ##---------------------------------------------------------------------------## -initial_working_dir=`pwd` -cd `dirname $0` -export script_dir=`pwd` -export draco_script_dir=$script_dir -cd $initial_working_dir -source $draco_script_dir/common.sh + +export script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +export draco_script_dir=`readlink -f $script_dir | head -n 1` +echo "source ${draco_script_dir}/common.sh" +source ${draco_script_dir}/common.sh # CMake options that will be included in the configuration step export CONFIG_BASE="-DDRACO_VERSION_PATCH=`echo $ddir | sed -e 's/.*_//'`" @@ -110,7 +111,8 @@ export CONFIG_BASE="-DDRACO_VERSION_PATCH=`echo $ddir | sed -e 's/.*_//'`" establish_permissions export source_prefix="/usr/projects/$package/$pdir" -scratchdir=`selectscratchdir` +# scratchdir=`selectscratchdir` +scratchdir=/usr/projects/ccsrad/scratch ppn=`lookupppn` # ============================================================================= @@ -199,13 +201,13 @@ for env in $environments; do echo export steps="config build" logfile="$source_prefix/logs/release-$buildflavor-$version-cb${knlext}.log" - run "$draco_script_dir/release_cray.msub &> $logfile" + run "$draco_script_dir/release.msub &> $logfile" # Run the tests on the back-end. export steps="test" logfile="$source_prefix/logs/release-$buildflavor-$version-t${knlext}.log" cmd="sbatch -J release_draco -t 8:00:00 -N 1 $partition \ --o $logfile $draco_script_dir/release_cray.msub" + --gres=craynetwork:0 -o $logfile $draco_script_dir/release.msub" echo -e "\nTest $package for $buildflavor-$version." echo "$cmd" jobid=`eval ${cmd}` diff --git a/regression/scripts/release_toss2.sh b/regression/scripts/release_toss.sh similarity index 83% rename from regression/scripts/release_toss2.sh rename to regression/scripts/release_toss.sh index cf44e776ca..54a2919d48 100755 --- a/regression/scripts/release_toss2.sh +++ b/regression/scripts/release_toss.sh @@ -5,7 +5,7 @@ ##---------------------------------------------------------------------------## ## 1. Directory layout: ## /usr/projects/draco/draco-NN_NN_NN/ -## scripts/release_toss2.sh # this script +## scripts/release_toss.sh # this script ## logs/ # build/test logs ## source/draco-NN_NN_NN # svn checkout of release branch ## flavor/opt|debug # released libraries/headers @@ -18,7 +18,7 @@ ## 1. Set modulefiles to be loaded in named environment functions. ## 2. Update variables that control the build: ## - $ddir -## 3. Run this script: ./release_toss2.sh &> ../logs/relase_moonlight.log +## 3. Run this script: ./release_toss.sh &> ../logs/relase_moonlight.log #----------------------------------------------------------------------# # Per release settings go here (edits go here) @@ -26,32 +26,43 @@ # Draco install directory name (/usr/projects/draco/draco-NN_NN_NN) export package=draco -ddir=draco-6_22_0 +ddir=draco-6_23_0 pdir=$ddir # environment (use draco modules) # release for each module set -environments="intel17env gcc610env" -function intel17env() +environments="intel1701env intel1704env gcc640env" +function intel1701env() { run "module purge" run "module load friendly-testing user_contrib" - run "module load cmake/3.7.1 git numdiff" + run "module load cmake/3.9.0 git numdiff" run "module load intel/17.0.1 openmpi/1.10.5" - run "module load random123 eospac/6.2.4 gsl/2.1" - run "module load mkl metis/5.1.0 ndi" - run "module load parmetis/4.0.3 superlu-dist/4.3 trilinos/12.8.1" + run "module load random123 eospac/6.2.4 gsl" + run "module load mkl metis ndi csk" + run "module load parmetis superlu-dist trilinos" run "module list" } -function gcc610env() +function intel1704env() { run "module purge" run "module load friendly-testing user_contrib" - run "module load cmake/3.7.1 git numdiff" - run "module load gcc/6.1.0 openmpi/1.10.5" - run "module load random123 eospac/6.2.4 gsl/2.3" - run "module load lapack/3.6.1 metis/5.1.0 ndi" - run "module load parmetis/4.0.3 superlu-dist/4.3 trilinos/12.8.1" + run "module load cmake/3.9.0 git numdiff" + run "module load intel/17.0.4 openmpi/2.1.2" + run "module load random123 eospac/6.2.4 gsl" + run "module load mkl metis ndi csk" + run "module load parmetis superlu-dist trilinos" + run "module list" +} +function gcc640env() +{ + run "module purge" + run "module load friendly-testing user_contrib" + run "module load cmake/3.9.0 git numdiff" + run "module load gcc/6.4.0 openmpi/2.1.2" + run "module load random123 eospac/6.2.4 gsl" + run "module load mkl metis ndi" + run "module load parmetis superlu-dist trilinos" run "module list" } @@ -62,11 +73,9 @@ function gcc610env() ##---------------------------------------------------------------------------## ## Generic setup (do not edit) ##---------------------------------------------------------------------------## -initial_working_dir=`pwd` -cd $`dirname $0` -export script_dir=`pwd` -export draco_script_dir=$script_dir -cd $initial_working_dir + +export script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +export draco_script_dir=`readlink -f $script_dir` source $draco_script_dir/common.sh # CMake options that will be included in the configuration step @@ -123,6 +132,8 @@ OPTIONS=(\ "$OPTIMIZE_ON $LOGGING_OFF" \ "$OPTIMIZE_RWDI $LOGGING_OFF" \ ) +#VERSIONS=( "debug") +#OPTIONS=( "$OPTIMIZE_OFF $LOGGING_OFF" ) ##---------------------------------------------------------------------------## ## Environment review @@ -177,7 +188,7 @@ for env in $environments; do export steps="config build test" cmd="sbatch -J release_draco $access_queue -t 1:00:00 -N 1 \ -o $source_prefix/logs/release-$buildflavor-$version.log \ -$script_dir/release_toss2.msub" +$script_dir/release.msub" echo -e "\nConfigure, Build and Test $buildflavor-$version version of $package." echo "$cmd" jobid=`eval ${cmd} &` diff --git a/regression/scripts/release_toss2.msub b/regression/scripts/release_toss2.msub deleted file mode 100644 index a1859aa596..0000000000 --- a/regression/scripts/release_toss2.msub +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -l - -# called from release_toss2.sh with the following command: -#run "sbatch -v [--qos=dev] -t 4:00:00 -N \ -#-o $source_prefix/logs/release_$flavor.log $script_dir/release_toss3.msub" - -source $draco_script_dir/common.sh -export buildflavor=`flavor` -export build_pe=`npes_build` -export test_pe=`npes_test` - -##---------------------------------------------------------------------------## -## Print a summary of this build -##---------------------------------------------------------------------------## - -verbose=1 -if test $verbose == 1; then - echo - echo "Starting release build for $package - $version - $buildflavor:" - echo "================================================================================" - echo "install_prefix = $install_prefix/$version" - echo "build_prefix = $build_prefix/$version" - echo - echo "make command = make -j $build_pe -l $build_pe" - echo "test command = ctest -j $test_pe" - echo "steps = ${steps}" - echo "queue = $access_queue" - echo - echo -fi - -# dry_run=1 -install_versions - -echo -e "\nAll done with release_toss.msub\n" - -##---------------------------------------------------------------------------## -## End -##---------------------------------------------------------------------------## diff --git a/src/ds++/Release.cc b/src/ds++/Release.cc index 3a858b7c5b..6346139414 100644 --- a/src/ds++/Release.cc +++ b/src/ds++/Release.cc @@ -100,34 +100,36 @@ const std::string author_list() { mmdevs current_developers; // not totally fair... KT got credit for LOC when svn repository was converted // to git. - current_developers.insert(fomdev(223334, "Kelly G. Thompson")); - current_developers.insert(fomdev(11393, "Kent G. Budge")); - current_developers.insert(fomdev(3350, "James S. Warsa")); - current_developers.insert(fomdev(2074, "Alex R. Long")); - current_developers.insert(fomdev(1473, "Rob B. Lowrie")); - current_developers.insert(fomdev(1101, "Kendra P. Keady")); - current_developers.insert(fomdev(403, "Jae H. Chang")); - current_developers.insert(fomdev(248, "Matt A. Cleveland")); - current_developers.insert(fomdev(54, "Andrew T. Till")); - current_developers.insert(fomdev(36, "Daniel Holladay")); - current_developers.insert(fomdev(32, "Ryan T. Wollaeger")); + current_developers.insert(fomdev(224492, "Kelly G. Thompson")); + current_developers.insert(fomdev(11403, "Kent G. Budge")); + current_developers.insert(fomdev(3299, "James S. Warsa")); + current_developers.insert(fomdev(2791, "Alex R. Long")); + current_developers.insert(fomdev(1464, "Rob B. Lowrie")); + current_developers.insert(fomdev(995, "Kendra P. Keady")); + current_developers.insert(fomdev(402, "Jae H. Chang")); + current_developers.insert(fomdev(245, "Matt A. Cleveland")); + current_developers.insert(fomdev(86, "Ryan T. Wollaeger")); + current_developers.insert(fomdev(85, "Andrew T. Till")); + current_developers.insert(fomdev(25, "Daniel Holladay")); current_developers.insert(fomdev(9, "Massimiliano Rosa")); current_developers.insert(fomdev(1, "Kris C. Garrett")); mmdevs prior_developers; prior_developers.insert(fomdev(4886, "Jeff D. Densmore")); - prior_developers.insert(fomdev(4426, "Gabriel M. Rockefeller")); - prior_developers.insert(fomdev(2432, "Allan B. Wollaber")); + prior_developers.insert(fomdev(4413, "Gabriel M. Rockefeller")); + prior_developers.insert(fomdev(2424, "Allan B. Wollaber")); prior_developers.insert(fomdev(995, "Lori A. Pritchett-Sheats")); - prior_developers.insert(fomdev(333, "Paul W. Talbot")); + prior_developers.insert(fomdev(315, "Paul W. Talbot")); prior_developers.insert(fomdev(265, "Katherine J. Wang")); // < 100 lines // prior_developers.insert(fomdev(82, "Peter Ahrens")); // prior_developers.insert(fomdev(44, "Nick Myers")); + // prior_developers.insert(fomdev(7, "Todd J. Urbatsch")); - // Tom Evans, Todd Adams, John McGhee, Mike Buksas, Randy Roberts, Seth - // Johnson, Jeff Furnish, Paul Henning + // Previous authors with no current LOC attribution: Tom Evans, Todd Adams, + // John McGhee, Mike Buksas, Randy Roberts, Seth Johnson, Jeff Furnish, Paul + // Henning size_t const maxlinelen(80); std::string line_name("CCS-2 Draco Team: ");