Skip to content

Commit f1f66db

Browse files
iankouls-awsiankouls-aws
committed
Surround verbose commands with blank lines for visibility
1 parent f1d44e2 commit f1f66db

25 files changed

+40
-40
lines changed

‎0-provision/stack-create.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source ../config.properties
55
CMD="aws cloudformation create-stack --stack-name ManagementInstance --template-body file://ManagementInstance.json --capabilities CAPABILITY_IAM"
66

77
if [ ! "$verbose" == "false" ]; then
8-
echo "\n${CMD}\n"
8+
echo -e "\n${CMD}\n"
99
fi
1010
eval "${CMD}"
1111

‎1-build/pull.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fi
1717

1818
CMD="docker pull ${registry}${base_image_name}${base_image_tag}"
1919
if [ ! "$verbose" == "false" ]; then
20-
echo "\n${CMD}\n"
20+
echo -e "\n${CMD}\n"
2121
fi
2222
eval "${CMD}"
2323

‎1-build/push.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ REGISTRY_COUNT=$(aws ecr describe-repositories | grep ${IMAGE} | wc -l)
2222
if [ "$REGISTRY_COUNT" == "0" ]; then
2323
CMD="aws ecr create-repository --repository-name ${IMAGE} --region ${region}"
2424
if [ ! "$verbose" == "false" ]; then
25-
echo "\n${CMD}\n"
25+
echo -e "\n${CMD}\n"
2626
fi
2727
eval "${CMD}"
2828
fi
2929

3030
CMD="docker push ${registry}${base_image_name}${base_image_tag}"
3131
if [ ! "$verbose" == "false" ]; then
32-
echo "\n${CMD}\n"
32+
echo -e "\n${CMD}\n"
3333
fi
3434
eval "${CMD}"
3535

‎3-pack/pull.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fi
1717

1818
CMD="docker pull ${registry}${model_image_name}${model_image_tag}"
1919
if [ ! "$verbose" == "false" ]; then
20-
echo "\n${CMD}\n"
20+
echo -e "\n${CMD}\n"
2121
fi
2222
eval "${CMD}"
2323

‎3-pack/push.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ REGISTRY_COUNT=$(aws ecr describe-repositories | grep ${IMAGE} | wc -l)
2222
if [ "$REGISTRY_COUNT" == "0" ]; then
2323
CMD="aws ecr create-repository --repository-name ${IMAGE} --region ${region}"
2424
if [ ! "$verbose" == "false" ]; then
25-
echo "\n${CMD}\n"
25+
echo -e "\n${CMD}\n"
2626
fi
2727
eval "${CMD}"
2828
fi
2929

3030
CMD="docker push ${registry}${model_image_name}${model_image_tag}"
3131
if [ ! "$verbose" == "false" ]; then
32-
echo "\n${CMD}\n"
32+
echo -e "\n${CMD}\n"
3333
fi
3434
eval "${CMD}"
3535

‎4-deploy/exec.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ echo "Processor: $processor"
2020
if [ "$runtime" == "docker" ]; then
2121
CMD="docker exec -it ${app_name}-0 bash"
2222
if [ ! "$verbose" == "false" ]; then
23-
echo "\n${CMD}\n"
23+
echo -e "\n${CMD}\n"
2424
fi
2525
eval "${CMD}"
2626
elif [ "$runtime" == "kubernetes" ]; then
2727
CMD="kubectl -n ${namespace} exec -it $(kubectl -n ${namespace} get pod | grep ${app_name}-$1 | cut -d ' ' -f 1) -- bash"
2828
if [ ! "$verbose" == "false" ]; then
29-
echo "\n${CMD}\n"
29+
echo -e "\n${CMD}\n"
3030
fi
3131
eval "${CMD}"
3232
else

‎4-deploy/generate-yaml.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ do
3232
echo "Generating ./${app_dir}/${instance_name}.yaml ..."
3333
CMD="cat $template | envsubst > ./${app_dir}/${instance_name}.yaml"
3434
if [ ! "$verbose" == "false" ]; then
35-
echo "\n${CMD}\n"
35+
echo -e "\n${CMD}\n"
3636
fi
3737
eval "${CMD}"
3838
instance=$((instance+1))

‎4-deploy/logs.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ else
4545
fi
4646

4747
if [ ! "$verbose" == "false" ]; then
48-
echo "\n${CMD}\n"
48+
echo -e "\n${CMD}\n"
4949
fi
5050
eval "${CMD}"
5151

‎4-deploy/run.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if [ "$runtime" == "docker" ]; then
2929
fi
3030
CMD="docker run -d ${run_opts} ${registry}${model_image_name}${model_image_tag}"
3131
if [ ! "$verbose" == "false" ]; then
32-
echo "\n${CMD}\n"
32+
echo -e "\n${CMD}\n"
3333
fi
3434
eval "${CMD}"
3535
server=$((server+1))
@@ -39,7 +39,7 @@ elif [ "$runtime" == "kubernetes" ]; then
3939
./generate-yaml.sh
4040
CMD="kubectl apply -f ${app_dir}"
4141
if [ ! "$verbose" == "false" ]; then
42-
echo "\n${CMD}\n"
42+
echo -e "\n${CMD}\n"
4343
fi
4444
eval "${CMD}"
4545
else

‎4-deploy/status.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,36 +20,36 @@ echo "Processor: $processor"
2020
if [ "$runtime" == "docker" ]; then
2121
CMD="docker ps -a | grep ${app_name}"
2222
if [ ! "$verbose" == "false" ]; then
23-
echo "\n${CMD}\n"
23+
echo -e "\n${CMD}\n"
2424
fi
2525
eval "${CMD}"
2626
elif [ "$runtime" == "kubernetes" ]; then
2727
if [ "$1" == "" ]; then
2828
CMD="kubectl -n ${namespace} get pods"
2929
if [ ! "$verbose" == "false" ]; then
30-
echo "\n${CMD}\n"
30+
echo -e "\n${CMD}\n"
3131
fi
3232
echo ""
3333
echo "Pods:"
3434
eval "${CMD}"
3535
CMD="kubectl -n ${namespace} get services"
3636
if [ ! "$verbose" == "false" ]; then
37-
echo "\n${CMD}\n"
37+
echo -e "\n${CMD}\n"
3838
fi
3939
echo ""
4040
echo "Services:"
4141
eval "${CMD}"
4242
else
4343
CMD="kubectl -n ${namespace} get pod $(kubectl -n ${namespace} get pods | grep ${app_name}-$1 | cut -d ' ' -f 1) -o wide"
4444
if [ ! "$verbose" == "false" ]; then
45-
echo "\n${CMD}\n"
45+
echo -e "\n${CMD}\n"
4646
fi
4747
echo ""
4848
echo "Pod:"
4949
eval "${CMD}"
5050
CMD="kubectl -n ${namespace} get service ${app_name}-$1"
5151
if [ ! "$verbose" == "false" ]; then
52-
echo "\n${CMD}\n"
52+
echo -e "\n${CMD}\n"
5353
fi
5454
echo ""
5555
echo "Service:"

‎4-deploy/stop.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ if [ "$runtime" == "docker" ]; then
2222
while [ $server -lt $num_servers ]; do
2323
CMD="docker rm -f ${app_name}-${server}"
2424
if [ ! "$verbose" == "false" ]; then
25-
echo "\n${CMD}\n"
25+
echo -e "\n${CMD}\n"
2626
fi
2727
eval "${CMD}"
2828
server=$((server+1))
2929
done
3030
elif [ "$runtime" == "kubernetes" ]; then
3131
CMD="kubectl delete -f ${app_dir}"
3232
if [ ! "$verbose" == "false" ]; then
33-
echo "\n${CMD}\n"
33+
echo -e "\n${CMD}\n"
3434
fi
3535
eval "${CMD}"
3636
else

‎5-test/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fi
1717
CMD="docker build -t ${registry}${test_image_name}${test_image_tag} --build-arg BASE_IMAGE=${registry}${base_image_name}${base_image_tag} \
1818
-f 5-test/Dockerfile ."
1919
if [ ! "$verbose" == "false" ]; then
20-
echo "\n${CMD}\n"
20+
echo -e "\n${CMD}\n"
2121
fi
2222
eval "${CMD}"
2323

‎5-test/exec.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ else
4343
echo "Runtime $runtime not recognized"
4444
fi
4545
if [ ! "$verbose" == "false" ]; then
46-
echo "\n${CMD}\n"
46+
echo -e "\n${CMD}\n"
4747
fi
4848
eval "${CMD}"
4949

‎5-test/generate-yaml.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ do
3838
echo "Generating ./${test_dir}/${instance_name}.yaml ..."
3939
CMD="cat $template | envsubst > ./${test_dir}/${instance_name}.yaml"
4040
if [ ! "$verbose" == "false" ]; then
41-
echo "\n${CMD}\n"
41+
echo -e "\n${CMD}\n"
4242
fi
4343
eval "${CMD}"
4444
instance=$((instance+1))

‎5-test/logs.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ else
3737
echo "Runtime $runtime not recognized"
3838
fi
3939
if [ ! "$verbose" == "false" ]; then
40-
echo "\n${CMD}\n"
40+
echo -e "\n${CMD}\n"
4141
fi
4242
eval "${CMD}"
4343

‎5-test/pull.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fi
1717

1818
CMD="docker pull ${registry}${test_image_name}${test_image_tag}"
1919
if [ ! "$verbose" == "false" ]; then
20-
echo "\n${CMD}\n"
20+
echo -e "\n${CMD}\n"
2121
fi
2222
eval "${CMD}"
2323

‎5-test/push.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ REGISTRY_COUNT=$(aws ecr describe-repositories | grep ${IMAGE} | wc -l)
2222
if [ "$REGISTRY_COUNT" == "0" ]; then
2323
CMD="aws ecr create-repository --repository-name ${IMAGE} --region ${region}"
2424
if [ ! "$verbose" == "false" ]; then
25-
echo "\n${CMD}\n"
25+
echo -e "\n${CMD}\n"
2626
fi
2727
eval "${CMD}"
2828
fi
2929

3030
CMD="docker push ${registry}${test_image_name}${test_image_tag}"
3131
if [ ! "$verbose" == "false" ]; then
32-
echo "\n${CMD}\n"
32+
echo -e "\n${CMD}\n"
3333
fi
3434
eval "${CMD}"
3535

‎5-test/run.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if [ "$runtime" == "docker" ]; then
2727
echo "Please 'sudo apt-get install -y bc' or 'sudo yum install -y bc', then try again"
2828
else
2929
if [ ! "$verbose" == "false" ]; then
30-
echo "\n${CMD}\n"
30+
echo -e "\n${CMD}\n"
3131
fi
3232
eval "${CMD}"
3333
./aggregate.sh ./bmk-all.log
@@ -53,7 +53,7 @@ if [ "$runtime" == "docker" ]; then
5353
CMD="$CMD bash -c 'pushd /app/tests && ./benchmark.sh'"
5454
fi
5555
if [ ! "$verbose" == "false" ]; then
56-
echo "\n${CMD}\n"
56+
echo -e "\n${CMD}\n"
5757
fi
5858
eval "${CMD}"
5959
test_container=$((test_container+1))
@@ -69,7 +69,7 @@ elif [ "$runtime" == "kubernetes" ]; then
6969
echo "Please 'sudo apt-get install -y bc' or 'sudo yum install -y bc', then try again"
7070
else
7171
if [ ! "$verbose" == "false" ]; then
72-
echo "\n${CMD}\n"
72+
echo -e "\n${CMD}\n"
7373
fi
7474
eval "${CMD}"
7575
./aggregate.sh ./bmk-all.log
@@ -78,7 +78,7 @@ elif [ "$runtime" == "kubernetes" ]; then
7878
else
7979
CMD="kubectl create namespace ${test_namespace} --dry-run=client -o yaml | kubectl apply -f -"
8080
if [ ! "$verbose" == "false" ]; then
81-
echo "\n${CMD}\n"
81+
echo -e "\n${CMD}\n"
8282
fi
8383
eval "${CMD}"
8484
cmd_pod="while true; do date; sleep 10; done"
@@ -98,7 +98,7 @@ elif [ "$runtime" == "kubernetes" ]; then
9898
eval "./generate-yaml.sh"
9999
CMD="kubectl apply -f ${test_dir}"
100100
if [ ! "$verbose" == "false" ]; then
101-
echo "\n${CMD}\n"
101+
echo -e "\n${CMD}\n"
102102
fi
103103
eval "${CMD}"
104104
fi

‎5-test/status.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ else
3333
echo "Runtime $runtime not recognized"
3434
fi
3535
if [ ! "$verbose" == "false" ]; then
36-
echo "\n${CMD}\n"
36+
echo -e "\n${CMD}\n"
3737
fi
3838
eval "${CMD}"
3939

‎5-test/stop.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if [ "$runtime" == "docker" ]; then
2323
while [ $test_container -lt $num_test_containers ]; do
2424
CMD="docker rm -f ${test_image_name}-${test_container}"
2525
if [ ! "$verbose" == "false" ]; then
26-
echo "\n${CMD}\n"
26+
echo -e "\n${CMD}\n"
2727
fi
2828
eval "${CMD}"
2929
test_container=$((test_container+1))
@@ -37,7 +37,7 @@ elif [ "$runtime" == "kubernetes" ]; then
3737
pushd ./5-test > /dev/null
3838
CMD="kubectl delete -f ${test_dir}"
3939
if [ ! "$verbose" == "false" ]; then
40-
echo "\n${CMD}\n"
40+
echo -e "\n${CMD}\n"
4141
fi
4242
eval "${CMD}"
4343
popd > /dev/null

‎build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if [ "$action" == "" ]; then
3333
echo " ... base-${processor} ..."
3434
CMD="docker build -t ${registry}${base_image_name}${base_image_tag} -f $dockerfile ."
3535
if [ ! "$verbose" == "false" ]; then
36-
echo "\n${CMD}\n"
36+
echo -e "\n${CMD}\n"
3737
fi
3838
eval "${CMD}"
3939
else

‎config.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ print_help() {
1818
if [ "$1" == "" ]; then
1919
CMD="vi ./config.properties"
2020
if [ ! "$verbose" == "false" ]; then
21-
echo "\n${CMD}\n"
21+
echo -e "\n${CMD}\n"
2222
fi
2323
eval "${CMD}"
2424
else

‎login.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if [ "$1" == "" ]; then
3232
echo "Logging in to $registry_type $registry ..."
3333
CMD="aws ecr get-login-password --region $region | docker login --username AWS --password-stdin $registry"
3434
if [ ! "$verbose" == "false" ]; then
35-
echo "\n${CMD}\n"
35+
echo -e "\n${CMD}\n"
3636
fi
3737
eval "${CMD}"
3838
;;

‎pack.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if [ "$action" == "" ]; then
3131
--build-arg MODEL_NAME=${huggingface_model_name} --build-arg MODEL_FILE_NAME=${model_file_name} --build-arg PROCESSOR=${processor} \
3232
-f 3-pack/Dockerfile ."
3333
if [ ! "$verbose" == "false" ]; then
34-
echo "\n${CMD}\n"
34+
echo -e "\n${CMD}\n"
3535
fi
3636
eval "${CMD}"
3737
elif [ "$action" == "push" ]; then

‎trace.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if [ "$1" == "" ]; then
2828
trace_opts=trace_opts_${processor}
2929
CMD="docker run ${!trace_opts} -it --rm -v $(pwd)/2-trace:/app/trace -v $(pwd)/config.properties:/app/config.properties ${registry}${base_image_name}${base_image_tag} bash -c 'cd /app/trace; python --version; python model-tracer.py'"
3030
if [ ! "$verbose" == "false" ]; then
31-
echo "\n${CMD}\n"
31+
echo -e "\n${CMD}\n"
3232
fi
3333
eval "${CMD}"
3434
else

0 commit comments

Comments
 (0)