experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Intel Mkl] Fixing MKL test script to accept parameters

Browse Source
This commit is contained in:
Clayne Robison 2020-02-21 08:27:27 -08:00
parent aeddd93b41
commit 0d64b4f59d
1 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
tensorflow/tools/ci_build/linux/cpu/run_mkl.sh
View File

@ -15,16 +15,17 @@
# #
# ============================================================================== # ==============================================================================
# This script accepts only one parameter: either the word "eigen", or an
# integer value greater than 0 that is passed to the bazel test command
# via the OMP_NUM_THREADS action environment variable. If an integer is
# passed, the script assumes it is running in DNNL mode; the
# OMP_NUM_THREADS variable is irrelevant in eigen mode.
set -e set -e
set -x set -x
MODE=${MODE:-"mkl"}
OMP_NUM_THREADS=${OMP_NUM_THREADS:-""}
echo ""
echo "MODE:${MODE}"
echo "OMP_NUM_THREADS:${OMP_NUM_THREADS}"
echo ""
DEFAULT_OMP_NUM_THREADS="10"
DEFAULT_CONFIG="--config=mkl"
N_JOBS=$(grep -c ^processor /proc/cpuinfo) N_JOBS=$(grep -c ^processor /proc/cpuinfo)
@ -36,28 +37,51 @@ echo ""
export TF_NEED_CUDA=0 export TF_NEED_CUDA=0
export PYTHON_BIN_PATH=`which python3` export PYTHON_BIN_PATH=`which python3`
yes "" | $PYTHON_BIN_PATH configure.py yes "" | $PYTHON_BIN_PATH configure.py
if [[ "$MODE" == "eigen" ]]; then
# Get parameters from command-line rather than from env
# Setting OMP_THREADS for low performing benchmarks.
# Default value(=core count) degrades performance of some benchmark cases.
# Optimal thread count is case specific.
RE_DIGITS_ONLY="^[0-9]+$"
MIN_OMP_THREADS=1
if [[ $# -ge 1 ]]; then
if [[ "$1" == "eigen" ]]; then
CONFIG="" CONFIG=""
OMPTHREADS="" OMPTHREADS=""
else elif [[ "$1" =~ ${RE_DIGITS_ONLY} && $1 -ge MIN_OMP_THREADS ]]; then
CONFIG="--config=mkl" CONFIG="${DEFAULT_CONFIG}"
# Setting OMP_THREADS for low performing benchmarks. OMPTHREADS="--action_env=OMP_NUM_THREADS=${1}"
# Default value(=core count) degrades performance of some benchmark cases. else
# Optimal thread count is case specific. echo "${1} isn't a valid configuration or"
# An argument can be passed to script, the value of which is used if given. echo "number of OM_NUM_THREADS. Exiting..."
# Otherwise OMP_NUM_THREADS is set to 10 exit 1
if [[ -z $OMP_NUM_THREADS ]]; then fi
OMPTHREADS="--action_env=OMP_NUM_THREADS=10" else # No parameters were passed in so set default values
else CONFIG="${DEFAULT_CONFIG}"
OMPTHREADS="--action_env=OMP_NUM_THREADS=$OMP_NUM_THREADS" OMPTHREADS="--action_env=OMP_NUM_THREADS=${DEFAULT_OMP_NUM_THREADS}"
fi
fi fi
echo ""
echo "Bazel will test with CONFIG=${CONFIG} and OMPTHREADS=${OMPTHREADS}"
echo ""
# Run bazel test command. Double test timeouts to avoid flakes. # Run bazel test command. Double test timeouts to avoid flakes.
# Setting KMP_BLOCKTIME to 0 lets OpenMP threads to sleep right after parallel execution # Setting KMP_BLOCKTIME to 0 lets OpenMP threads to sleep right after parallel execution
# in an MKL primitive. This reduces the effects of an oversubscription of OpenMP threads # in an MKL primitive. This reduces the effects of an oversubscription of OpenMP threads
# caused by executing multiple tests concurrently. # caused by executing multiple tests concurrently.
bazel test --test_tag_filters=-no_oss,-no_oss_py2,-oss_serial,-gpu,-tpu,-benchmark-test --test_lang_filters=cc,py -k \ bazel test \
--jobs=${N_JOBS} --test_timeout 300,450,1200,3600 --build_tests_only \ --test_tag_filters=-no_oss,-no_oss_py2,-oss_serial,-gpu,-tpu,-benchmark-test,-v1only \
${CONFIG} --test_env=KMP_BLOCKTIME=0 ${OMPTHREADS} --config=opt --test_output=errors -- \ --test_lang_filters=cc,py \
//tensorflow/... -//tensorflow/compiler/... -//tensorflow/contrib/... -//tensorflow/lite/... -k \
--jobs=${N_JOBS} \
--test_timeout 300,450,1200,3600 \
--build_tests_only \
${CONFIG} \
--test_env=KMP_BLOCKTIME=0 \
${OMPTHREADS} \
--config=opt \
--test_output=errors \
-- \
//tensorflow/... \
-//tensorflow/compiler/... \
-//tensorflow/lite/...