From d2a72ca245f36665d350cadbf1470336ba8c5725 Mon Sep 17 00:00:00 2001 From: Abolfazl Shahbazi Date: Thu, 16 Jul 2020 17:04:21 -0700 Subject: [PATCH] Update MKL+Horovod test case --- .../tests/import-onednn-horovod.sh | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/tensorflow/tools/dockerfiles/tests/import-onednn-horovod.sh b/tensorflow/tools/dockerfiles/tests/import-onednn-horovod.sh index 18b3b19d69d..9331b686cb1 100755 --- a/tensorflow/tools/dockerfiles/tests/import-onednn-horovod.sh +++ b/tensorflow/tools/dockerfiles/tests/import-onednn-horovod.sh @@ -15,12 +15,16 @@ # limitations under the License. # ============================================================================ -{ # try - echo `python -c 'from tensorflow.python import _pywrap_util_port; print(_pywrap_util_port.IsMklEnabled()); import horovod.tensorflow as hvd'` - echo "PASS: Horovod with MKL is enabled" -} || { # catch - echo `python -c 'from tensorflow.python import pywrap_tensorflow; print(pywrap_tensorflow.IsMklEnabled()); import horovod.tensorflow as hvd'` - echo "PASS: Horovod with Old MKL is detected" -} || { # finally - die "FAIL: Horovod with MKL is not enabled" -} +python -c 'from tensorflow.python import _pywrap_util_port; print(_pywrap_util_port.IsMklEnabled()); import horovod.tensorflow as hvd' +new_mkl_horovod_enabled=$? + +python -c 'from tensorflow.python import pywrap_tensorflow; print(pywrap_tensorflow.IsMklEnabled()); import horovod.tensorflow as hvd' +old_mkl_horovod_enabled=$? + +if [[ $new_mkl_horovod_enabled -eq 0 ]]; then + echo "PASS: Horovod with MKL is enabled" +elif [[ $old_mkl_horovod_enabled -eq 0]]; then + echo "PASS: Horovod with Old MKL is detected" +else + die "FAIL: Horovod with MKL is not enabled" +fi