From 18a7fd8e4e4107109750bf6c460928b4e94f7cf8 Mon Sep 17 00:00:00 2001 From: Gabriela Cervantes Date: Mon, 14 Aug 2023 20:36:19 +0000 Subject: [PATCH] metrics: Rename tensorflow scripts This PR renames the tensorflow scripts to include the data format that is being used as we will have multiple tests with different data and model formats for tensorflow so this will help us to distinguish them. Fixes #7645 Signed-off-by: Gabriela Cervantes --- .../{tensorflow.sh => tensorflow_nhwc.sh} | 10 +++++----- .../Dockerfile | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename tests/metrics/machine_learning/{tensorflow.sh => tensorflow_nhwc.sh} (96%) rename tests/metrics/machine_learning/{tensorflow_dockerfile => tensorflow_nhwc_dockerfile}/Dockerfile (100%) diff --git a/tests/metrics/machine_learning/tensorflow.sh b/tests/metrics/machine_learning/tensorflow_nhwc.sh similarity index 96% rename from tests/metrics/machine_learning/tensorflow.sh rename to tests/metrics/machine_learning/tensorflow_nhwc.sh index 7b33f96546..cb5f9ff28b 100755 --- a/tests/metrics/machine_learning/tensorflow.sh +++ b/tests/metrics/machine_learning/tensorflow_nhwc.sh @@ -10,15 +10,15 @@ set -o pipefail SCRIPT_PATH=$(dirname "$(readlink -f "$0")") source "${SCRIPT_PATH}/../lib/common.bash" -IMAGE="docker.io/library/tensorflow:latest" -DOCKERFILE="${SCRIPT_PATH}/tensorflow_dockerfile/Dockerfile" +IMAGE="docker.io/library/tensorflow_nhwc:latest" +DOCKERFILE="${SCRIPT_PATH}/tensorflow_nhwc_dockerfile/Dockerfile" BATCH_SIZE="100" NUM_BATCHES="100" resnet_tensorflow_file=$(mktemp resnettensorflowresults.XXXXXXXXXX) alexnet_tensorflow_file=$(mktemp alexnettensorflowresults.XXXXXXXXXX) NUM_CONTAINERS="$1" TIMEOUT="$2" -TEST_NAME="tensorflow" +TEST_NAME="tensorflow_nhwc" PAYLOAD_ARGS="tail -f /dev/null" # Options to control the start of the workload using a trigger-file dst_dir="/host" @@ -99,7 +99,7 @@ function launch_workload() { done } -function tensorflow_test() { +function tensorflow_nhwc_test() { # Resnet section info "Running TF-Resnet test" launch_workload "${CMD_RESNET}" @@ -191,7 +191,7 @@ function main() { # Get the initial number of pids in a single container before the workload starts INITIAL_NUM_PIDS=$(sudo -E "${CTR_EXE}" t metrics "${containers[-1]}" | grep pids.current | grep pids.current | xargs | cut -d ' ' -f 2) ((INITIAL_NUM_PIDS++)) - tensorflow_test + tensorflow_nhwc_test metrics_json_save } diff --git a/tests/metrics/machine_learning/tensorflow_dockerfile/Dockerfile b/tests/metrics/machine_learning/tensorflow_nhwc_dockerfile/Dockerfile similarity index 100% rename from tests/metrics/machine_learning/tensorflow_dockerfile/Dockerfile rename to tests/metrics/machine_learning/tensorflow_nhwc_dockerfile/Dockerfile