fix testTensorFlow and test TensorBoard script

Author: Yadan Wei

test/dlc_tests/container_tests/bin/testTensorBoard

@@ -8,9 +8,9 @@ BIN_DIR=${HOME_DIR}/bin
 # Use this to conditionally check TF version
 pip install packaging
 if [[ $(python -c "import tensorflow as tf; from packaging.version import Version; is_tf27_or_greater_not_tf218 = Version(tf.__version__) >= Version('2.7') and Version(tf.__version__) != Version('2.18.0'); print(is_tf27_or_greater_not_tf218)") == 'True' ]]; then
-    PROFILER_LOG_DIR="/logs/plugins/profile"
+    LOG_DIR="/logs/plugins/profile"
 else
-    PROFILER_LOG_DIR="/logs/train/plugins/profile"
+    LOG_DIR="/logs/train/plugins/profile"
 fi
 
 [ -d $LOG_DIR ] && echo "Cleanning existing logs" && rm -rf $LOG_DIR
@@ -19,15 +19,15 @@ python ${BIN_DIR}/testTensorBoard.py || exit 1
 
 # profiler: tf > 2.* and < 2.2 generates local.trace where as tf > 2.2 generates *.pb and tf2.18 generate timestamp folder under /logs/train/plugins/profile
 if [[ $(python -c "import tensorflow as tf; from packaging.version import Version; is_less_than_tf22 = Version(tf.__version__) < Version('2.2'); print(is_less_than_tf22)") == 'True' ]]; then
-    LOG_RESULT=$(find $PROFILER_LOG_DIR -name "local.trace")
-else if [[ $(python -c "import tensorflow as tf; from packaging.version import Version; is_equal_tf218 = Version(tf.__version__) == Version('2.18'); print(is_equal_tf218)") == 'True' ]]; then
-    LOG_RESULT=$(find $PROFILER_LOG_DIR -wholename "**/*.pb")
+    LOG_RESULT=$(find $LOG_DIR -name "local.trace")
+elif [[ $(python -c "import tensorflow as tf; from packaging.version import Version; is_equal_tf218 = Version(tf.__version__) == Version('2.18'); print(is_equal_tf218)") == 'True' ]]; then
+    LOG_RESULT=$(find $LOG_DIR -wholename "**/*.pb")
 else
-    LOG_RESULT=$(find $PROFILER_LOG_DIR -name "*.pb")
+    LOG_RESULT=$(find $LOG_DIR -name "*.pb")
 fi
 
 echo "Checking the logs result: $LOG_RESULT"
 
 [ -z "$LOG_RESULT" ] && echo "Cannot find Profiler logs!" && exit 1
 
-exit 0
+exit 0

test/dlc_tests/container_tests/bin/testTensorFlow

@@ -50,7 +50,7 @@ echo "Verify tensorflow profiler can generate logs."
 # profiler: tf > 2.* and < 2.2 generates local.trace where as tf > 2.2 generates *.pb and tf2.18 generate timestamp folder under /logs/train/plugins/profile
 if [[ $(python -c "import tensorflow as tf; from packaging.version import Version; is_less_than_tf22 = Version(tf.__version__) < Version('2.2'); print(is_less_than_tf22)") == 'True' ]]; then
     LOG_RESULT=$(find $PROFILER_LOG_DIR -name "local.trace")
-else if [[ $(python -c "import tensorflow as tf; from packaging.version import Version; is_equal_tf218 = Version(tf.__version__) == Version('2.18'); print(is_equal_tf218)") == 'True' ]]; then
+elif [[ $(python -c "import tensorflow as tf; from packaging.version import Version; is_equal_tf218 = Version(tf.__version__) == Version('2.18'); print(is_equal_tf218)") == 'True' ]]; then
     LOG_RESULT=$(find $PROFILER_LOG_DIR -wholename "**/*.pb")
 else
     LOG_RESULT=$(find $PROFILER_LOG_DIR -name "*.pb")