From d0fa20d775fe358e6a5d26b475338605829ff681 Mon Sep 17 00:00:00 2001
From: Zilin Jiang <1600292041@qq.com>
Date: Mon, 29 Oct 2018 10:55:59 +0800
Subject: [PATCH] Add image-augmentation and  image-augmentation-3d to pip
 integration (#833)

* add image-augmentation test

* add image-augmentation-3d test

* resolve conflict

* fix bug

* fix typo

* fix typo

* fix typo

* fix file name typo

* remove redundant lines

* fix typo

* update

* #10 dogs-vs-cats: time1 -> time10
---
 ...n-3d.ipynb => image-augmentation-3d.ipynb} |  0
 apps/run-app-tests-pip.sh                     | 75 +++++++++++++++----
 2 files changed, 61 insertions(+), 14 deletions(-)
 rename apps/image-augmentation-3d/{image-augementation-3d.ipynb => image-augmentation-3d.ipynb} (100%)

diff --git a/apps/image-augmentation-3d/image-augementation-3d.ipynb b/apps/image-augmentation-3d/image-augmentation-3d.ipynb
similarity index 100%
rename from apps/image-augmentation-3d/image-augementation-3d.ipynb
rename to apps/image-augmentation-3d/image-augmentation-3d.ipynb
diff --git a/apps/run-app-tests-pip.sh b/apps/run-app-tests-pip.sh
index a7810f99364..e884be848f7 100755
--- a/apps/run-app-tests-pip.sh
+++ b/apps/run-app-tests-pip.sh
@@ -91,7 +91,7 @@ fi
 unset SPARK_DRIVER_MEMORY
 now=$(date "+%s")
 time2=$((now-start))
-echo "object-detection time used:$time2 seconds"
+echo "#2 object-detection time used:$time2 seconds"
 
 echo "#3 start app test for image-similarity"
 start=$(date "+%s")
@@ -173,6 +173,54 @@ now=$(date "+%s")
 time3=$((now-start))
 echo "#3 image-similarity time used:$time3 seconds"
 
+echo "#5 start app test for using_variational_autoencoder_to_generate_digital_numbers"
+#timer
+start=$(date "+%s")
+
+${ANALYTICS_ZOO_HOME}/apps/ipynb2py.sh ${ANALYTICS_ZOO_HOME}/apps/variational-autoencoder/using_variational_autoencoder_to_generate_digital_numbers
+
+sed "s/nb_epoch = 6/nb_epoch=2/g; s/batch_size=batch_size/batch_size=1008/g" ${ANALYTICS_ZOO_HOME}/apps/variational-autoencoder/using_variational_autoencoder_to_generate_digital_numbers.py > ${ANALYTICS_ZOO_HOME}/apps/variational-autoencoder/tmp_test.py
+
+export SPARK_DRIVER_MEMORY=12g
+python ${ANALYTICS_ZOO_HOME}/apps/variational-autoencoder/tmp_test.py
+
+exit_status=$?
+if [ $exit_status -ne 0 ];
+then
+    clear_up
+    echo "using_variational_autoencoder_to_generate_digital_numbers failed"
+    exit $exit_status
+fi
+
+unset SPARK_DRIVER_MEMORY
+now=$(date "+%s")
+time5=$((now-start))
+echo "#5 using_variational_autoencoder_to_generate_digital_numbers time used:$time5 seconds"
+
+echo "#9 start app test for image-augmentation"
+# timer
+start=$(date "+%s")
+
+# Conversion to py file and data preparation
+${ANALYTICS_ZOO_HOME}/apps/ipynb2py.sh ${ANALYTICS_ZOO_HOME}/apps/image-augmentation/image-augmentation
+
+# Run the example
+export SPARK_DRIVER_MEMORY=1g
+python ${ANALYTICS_ZOO_HOME}/apps/image-augmentation/image-augmentation.py
+
+exit_status=$?
+if [ $exit_status -ne 0 ];
+then
+    clear_up
+    echo "image-augmentation failed"
+    exit $exit_status
+fi
+
+unset SPARK_DRIVER_MEMORY
+now=$(date "+%s")
+time9=$((now-start))
+echo "#9 image-augmentation time used:$time9 seconds"
+
 echo "#10 start app test for dogs-vs-cats"
 start=$(date "+%s")
 
@@ -223,33 +271,32 @@ fi
 
 unset SPARK_DRIVER_MEMORY
 now=$(date "+%s")
-time1=$((now-start))
-echo "dogs-vs-cats time used:$time1 seconds"
+time10=$((now-start))
+echo "#10 dogs-vs-cats time used:$time10 seconds"
 
-echo "#5 start app test for using_variational_autoencoder_to_generate_digital_numbers"
-#timer
+echo "#11 start app test for image-augmentation-3d"
+# timer
 start=$(date "+%s")
 
-${ANALYTICS_ZOO_HOME}/apps/ipynb2py.sh ${ANALYTICS_ZOO_HOME}/apps/variational-autoencoder/using_variational_autoencoder_to_generate_digital_numbers
-
-sed "s/nb_epoch = 6/nb_epoch=2/g; s/batch_size=batch_size/batch_size=1008/g" ${ANALYTICS_ZOO_HOME}/apps/variational-autoencoder/using_variational_autoencoder_to_generate_digital_numbers.py > ${ANALYTICS_ZOO_HOME}/apps/variational-autoencoder/tmp_test.py
+# Conversion to py file and data preparation
+${ANALYTICS_ZOO_HOME}/apps/ipynb2py.sh ${ANALYTICS_ZOO_HOME}/apps/image-augmentation-3d/image-augmentation-3d
 
-export SPARK_DRIVER_MEMORY=12g
-python ${ANALYTICS_ZOO_HOME}/apps/variational-autoencoder/tmp_test.py
+# Run the example
+export SPARK_DRIVER_MEMORY=1g
+python ${ANALYTICS_ZOO_HOME}/apps/image-augmentation-3d/image-augmentation-3d.py
 
 exit_status=$?
 if [ $exit_status -ne 0 ];
 then
     clear_up
-    echo "using_variational_autoencoder_to_generate_digital_numbers failed"
+    echo "image-augmentation-3d failed"
     exit $exit_status
 fi
 
 unset SPARK_DRIVER_MEMORY
 now=$(date "+%s")
-time5=$((now-start))
-echo "#5 using_variational_autoencoder_to_generate_digital_numbers time used:$time5 seconds"
-
+time11=$((now-start))
+echo "#11 image-augmentation-3d time used:$time11 seconds"
 
 echo "#12 start app test for image_classification_inference"
 #timer