Skip to content

Commit

Permalink
Update release scripts for rzansel.
Browse files Browse the repository at this point in the history
  • Loading branch information
@KineticTheory
KineticTheory committed Sep 24, 2020
1 parent b808575 commit f51e038
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 159 deletions.
96 changes: 21 additions & 75 deletions tools/ats2-env.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,23 @@ else
fi

# The following toolchains will be used when releasing code
environments="gcc831env xl20200318env"
environments="gcc831env xl20200819env"

# Extra cmake options
export CONFIG_BASE+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
export JSM_JSRUN_NO_WARN_OVERSUBSCRIBE=1
export MAKE_COMMAND="lexec -q make"
export CTEST_COMMAND="lexec -q ctest"

# job launch options
case $siblings in
rzansel) job_launch_options="-q pdebug" ;;
sierra) job_launch_options="-q pbatch" ;;
*) die "*FATAL ERROR* (ats2-env.sh) I only know how to set job_launch_options for rzansel and sierra." ;;
esac
export job_launch_options

# Special setup for ATS-1: replace the 'latest' symlink
#case $siblings in
# rzansel) job_launch_options="-q pdebug" ;;
# sierra) job_launch_options="-q pbatch" ;;
# *) die "*FATAL ERROR* (ats2-env.sh) I only know how to set job_launch_options for rzansel and sierra." ;;
#esac
#export job_launch_options

# Special setup for ATS-2: replace the 'latest' symlink
(cd /usr/gapps/jayenne; if [[ -L draco-latest ]]; then rm draco-latest; fi; ln -s $source_prefix draco-latest)

#--------------------------------------------------------------------------------------------------#
Expand All @@ -49,93 +52,36 @@ fi
case $ddir in

#--------------------------------------------------------------------------------------------------#
draco-7_7*)
draco-7_7*|draco-7_8*)
function gcc831env()
{
run "module purge"
run "module use /usr/gapps/user_contrib/spack.20200402/share/spack/lmod/linux-rhel7-ppc64le/Core"
run "module load StdEnv"
run "module unload cuda spectrum-mpi xl"
run "module use --append /usr/gapps/jayenne/Modules"
unset CMAKE_PREFIX_PATH
unset CPATH
unset LD_LIBRARY_PATH
unset LIBRARY_PATH
run "module load gcc/8.3.1 spectrum-mpi/2019.06.24 cuda"
run "module load python/3.7.2 cmake/3.17.0 git gsl numdiff random123 metis netlib-lapack"
run "module load parmetis superlu-dist trilinos csk"
run "module load eospac/6.4.0 libquo/1.3.1 ndi"
run "module load draco/gcc831-cuda-11.0.2"
run "module list"
run "module avail"
unset MPI_ROOT
export JSM_JSRUN_NO_WARN_OVERSUBSCRIBE=1
CXX=`which g++`
CC=`which gcc`
FC=`which gfortran`
}
function xl20200318env()
{
run "module purge"
run "module use /usr/gapps/user_contrib/spack.20200402/share/spack/lmod/linux-rhel7-ppc64le/Core"
run "module load StdEnv"
run "module unload cuda spectrum-mpi xl"
unset CMAKE_PREFIX_PATH
unset CPATH
unset LD_LIBRARY_PATH
unset LIBRARY_PATH
run "module load xl/2020.03.18 spectrum-mpi/2019.06.24"
run "module load python/3.7.2 cmake/3.17.0 git gsl numdiff random123 metis netlib-lapack"
run "module load parmetis superlu-dist trilinos csk"
run "module load eospac/6.4.0 libquo/1.3.1 ndi"
# trilinos possible non-spack solution at:
# /usr/gapps/jayenne/vendors/trilinos-12.18.1/xl-2019.12.23-spectrum-mpi-2019.06.24
# export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:/usr/gapps/jayenne/vendors/trilinos-12.18.1/xl-2019.12.23-spectrum-mpi-2019.06.24
run "module list"
run "module avail"
unset MPI_ROOT
}
;;

#--------------------------------------------------------------------------------------------------#
draco-7_4* | draco-7_5* | draco-7_6*)
function gcc731env()
{
run "module purge"
run "module use /usr/gapps/jayenne/vendors-ec/spack.20190616/share/spack/lmod/linux-rhel7-ppc64le/Core"
run "module load StdEnv"
run "module unload cuda spectrum-mpi xl"
unset CMAKE_PREFIX_PATH
unset CPATH
unset LD_LIBRARY_PATH
unset LIBRARY_PATH
run "module load gcc/7.3.1 spectrum-mpi/2019.06.24 cuda"
run "module load python/3.7.2 cmake/3.14.5 git gsl numdiff random123 metis netlib-lapack"
run "module load parmetis superlu-dist trilinos csk"
run "module load eospac/6.4.0 libquo/1.3.1 ndi"
run "module list"
run "module avail"
unset MPI_ROOT
CXX=`which g++`
CC=`which gcc`
FC=`which gfortran`
}
function xl20191223()
function xl20200819env()
{
run "module purge"
run "module use /usr/gapps/jayenne/vendors-ec/spack.20190616/share/spack/lmod/linux-rhel7-ppc64le/Core"
run "module load StdEnv"
run "module unload cuda spectrum-mpi xl"
run "module use /usr/gapps/user_contrib/spack.20200402/share/spack/lmod/linux-rhel7-ppc64le/Core"
run "module use --append /usr/gapps/jayenne/Modules"
unset CMAKE_PREFIX_PATH
unset CPATH
unset LD_LIBRARY_PATH
unset LIBRARY_PATH
run "module load xl/2019.12.23 spectrum-mpi/2019.06.24 cuda"
run "module load python/3.7.2 cmake/3.14.5 git gsl numdiff random123 metis netlib-lapack"
run "module load parmetis superlu-dist trilinos csk"
run "module load eospac/6.4.0 libquo/1.3.1 ndi"
# trilinos possible non-spack solution at:
# /usr/gapps/jayenne/vendors/trilinos-12.18.1/xl-2019.12.23-spectrum-mpi-2019.06.24
# export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:/usr/gapps/jayenne/vendors/trilinos-12.18.1/xl-2019.12.23-spectrum-mpi-2019.06.24
run "module load draco/xl2020.08.19-cuda-11.0.2"
run "module list"
run "module avail"
export JSM_JSRUN_NO_WARN_OVERSUBSCRIBE=1
unset MPI_ROOT
}
;;
Expand Down
83 changes: 3 additions & 80 deletions tools/common.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -532,14 +532,14 @@ function install_versions
|| die "Could not configure in $build_dir from source at $source_dir"
fi
if test $build_step == 1; then
run "make -j $build_pe -l $build_pe install" \
run "${MAKE_COMMAND:-make} -j $build_pe -l $build_pe install" \
|| die "Could not build code/tests in $build_dir"
fi
if test $test_step == 1; then
# run all tests
run "ctest -j $test_pe --output-on-failure"
run "${CTEST_COMMAND:-ctest} -j $test_pe --output-on-failure"
if [[ $? != 0 ]]; then
run "ctest -j $test_pe --output-on-failure --rerun-failed"
run "${CTEST_COMMAND:-ctest} -j $test_pe --output-on-failure --rerun-failed"
fi
fi
wait
Expand Down Expand Up @@ -623,83 +623,6 @@ function allow_file_to_age
done
}

#--------------------------------------------------------------------------------------------------#
# Ensure environment is reasonable
# Called from <machine>-job-launch.sh
# function job_launch_sanity_checks()
# {
# if [[ ! ${regdir} ]]; then
# echo "FATAL ERROR in ${scriptname}: You did not set 'regdir' in the environment!"
# echo "printenv -> "
# printenv
# exit 1
# fi
# if [[ ! ${rscriptdir} ]]; then
# echo "FATAL ERROR in ${scriptname}: You did not set 'rscriptdir' in the environment!"
# echo "printenv -> "
# printenv
# exit 1
# fi
# if [[ ! ${subproj} ]]; then
# echo "FATAL ERROR in ${scriptname}: You did not set 'subproj' in the environment!"
# echo "printenv -> "
# printenv
# exit 1
# fi
# if [[ ! ${build_type} ]]; then
# echo "FATAL ERROR in ${scriptname}: You did not set 'build_type' in the environment!"
# echo "printenv -> "
# printenv
# exit 1
# fi
# if [[ ! ${logdir} ]]; then
# echo "FATAL ERROR in ${scriptname}: You did not set 'logdir' in the environment!"
# echo "printenv -> "
# printenv
# exit 1
# fi
# if [[ ! ${featurebranch} ]]; then
# echo "FATAL ERROR in ${scriptname}: You did not set 'featurebranch' in the environment!"
# echo "printenv -> "
# printenv
# fi
# }

#--------------------------------------------------------------------------------------------------#
# Job Launch Banner
# function print_job_launch_banner()
# {
# echo "==========================================================================="
# echo "$machine_name_long regression job launcher for ${subproj} - ${build_type} flavor."
# echo "==========================================================================="
# echo " "
# echo "Environment:"
# echo " build_autodoc = ${build_autodoc}"
# echo " build_type = ${build_type}"
# echo " dashboard_type = ${dashboard_type}"
# echo " epdash = $epdash"
# if [[ ! ${extra_params} ]]; then
# echo " extra_params = none"
# else
# echo " extra_params = ${extra_params}"
# fi
# if [[ ${featurebranch} ]]; then
# echo " featurebranch = ${featurebranch}"
# fi
# echo " logdir = ${logdir}"
# echo " logfile = ${logfile}"
# echo " machine_name_long = $machine_name_long"
# echo " prdash = $prdash"
# echo " projects = \"${projects}\""
# echo " regdir = ${regdir}"
# echo " regress_mode = ${regress_mode}"
# echo " rscriptdir = ${rscriptdir}"
# echo " scratchdir = ${scratchdir}"
# echo " subproj = ${subproj}"
# echo " "
# echo " ${subproj}: dep_jobids = ${dep_jobids}"
# echo " "
# }

##----------------------------------------------------------------------------##
# Canonicalize_filename:
Expand Down
2 changes: 1 addition & 1 deletion tools/release.msub
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export buildflavor=`flavor`
export build_pe=`npes_build`
export test_pe=`npes_test`
case `uname -n` in
rzansel* | sierra* ) export test_pe=1 ;;
rzansel* | sierra* ) export test_pe=80 ;;
esac


Expand Down
7 changes: 4 additions & 3 deletions tools/release.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,10 @@ export build_permissions
## Generic setup (do not edit)
##---------------------------------------------------------------------------##

draco_script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
draco_script_dir=$(echo "$draco_script_dir" | awk '{ print $1 }')
draco_script_dir=$(readlink -f "$draco_script_dir")
#draco_script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
#draco_script_dir=$(echo "$draco_script_dir" | awk '{ print $1 }')
#draco_script_dir=$(readlink -f "$draco_script_dir")
draco_script_dir="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
export draco_script_dir
if [[ -f "$draco_script_dir/common.sh" ]]; then
echo "source $draco_script_dir/common.sh"
Expand Down

0 comments on commit f51e038

Please sign in to comment.