From cbd133a0b90d16ccd2e30728a66bdb2a0c56f93b Mon Sep 17 00:00:00 2001
From: rdwrt <84399+rdwrt@users.noreply.github.com>
Date: Fri, 16 Mar 2018 15:36:19 +0100
Subject: [PATCH] updated cnn_classify tutorial

based on remarks from https://github.com/dataversioncontrol/dvc/issues/421
---
 docs/tutorial/cnn_classify.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/tutorial/cnn_classify.sh b/docs/tutorial/cnn_classify.sh
index 91664ff1c..f5eaac334 100755
--- a/docs/tutorial/cnn_classify.sh
+++ b/docs/tutorial/cnn_classify.sh
@@ -44,8 +44,8 @@ git add data/.gitignore train.dvc
 git commit -m 'Unzip files'
 
 mkdir code
-wget -P code https://s3-us-west-2.amazonaws.com/dvc-share/tutorial_cnn_code/common/process_files.py
-wget -P code https://s3-us-west-2.amazonaws.com/dvc-share/tutorial_cnn_code/common/conf.py
+wget -P code https://s3-us-west-2.amazonaws.com/dvc-share/tutorial_cnn_code/process_files.py
+wget -P code https://s3-us-west-2.amazonaws.com/dvc-share/tutorial_cnn_code/conf.py
 dvc run -d code/process_files.py -d data/train -o data/cats_and_dogs_small -f process.dvc python code/process_files.py
 git status
 #On branch master
@@ -68,7 +68,7 @@ echo '*.pyc' >> code/.gitignore
 git add .
 git commit -m 'Process raw data'
 
-wget -P code https://s3-us-west-2.amazonaws.com/dvc-share/tutorial_cnn_code/first-cnn/model.py
+wget -O code/model.py https://s3-us-west-2.amazonaws.com/dvc-share/tutorial_cnn_code/model_first_cnn.py
 
 dvc run -d code/model.py -d code/conf.py -d data/cats_and_dogs_small -o data/model.h5 -o data/history.p python code/model.py
 git status
@@ -90,7 +90,7 @@ git status
 git add .
 git commit -m 'First model'
 
-wget -P code https://s3-us-west-2.amazonaws.com/dvc-share/tutorial_cnn_code/common/plot.py
+wget -P code https://s3-us-west-2.amazonaws.com/dvc-share/tutorial_cnn_code/plot.py
 dvc run -d code/conf.py -d code/plot.py -d data/history.p -o data/plot_loss.jpeg -o data/plot_acc.jpeg python code/plot.py
 
 dvc run -d data/plot_loss.jpeg
@@ -120,7 +120,7 @@ git tag -a v0.1-first-cnn -m 'First CNN model'
 
 ############################################ v2
 rm code/model.py
-wget -P code https://s3-us-west-2.amazonaws.com/dvc-share/tutorial_cnn_code/augm-cnn/model.py
+wget -O code/model.py https://s3-us-west-2.amazonaws.com/dvc-share/tutorial_cnn_code/model_augm.py
 # Actual changes: augmentation, Dropout=0.5, batch_size=20-->32, epochs=30-->100
 dvc repro
 
@@ -146,7 +146,7 @@ git tag -a v0.2-augm-cnn -m 'CNN model with augmentation'
 git checkout v0.1-first-cnn -b pre_trained
 dvc checkout
 rm code/model.py
-wget -P code https://s3-us-west-2.amazonaws.com/dvc-share/tutorial_cnn_code/vgg16_base/model.py
+wget -O code/model.py https://s3-us-west-2.amazonaws.com/dvc-share/tutorial_cnn_code/model_vgg16_base.py
 
 dvc repro
 git status
@@ -164,7 +164,7 @@ git status
 
 git add .
 git commit -m 'Pretrained VGG16'
-git tag -a v0.3-vgg16_base -, 'Pretrained VGG16 tag'
+git tag -a v0.3-vgg16_base -m 'Pretrained VGG16 tag'
 
 
 ############################################### v4
@@ -172,7 +172,7 @@ git tag -a v0.3-vgg16_base -, 'Pretrained VGG16 tag'
 git checkout v0.2-augm-cnn -b vgg16_augm
 dvc checkout
 rm code/model.py
-wget -P code https://s3-us-west-2.amazonaws.com/dvc-share/tutorial_cnn_code/vgg16_augm/model.py
+wget -O code/model.py https://s3-us-west-2.amazonaws.com/dvc-share/tutorial_cnn_code/model_vgg16_augm.py
 
 dvc repro
 git status
@@ -195,7 +195,7 @@ git tag -a v0.4-vgg16_augm -m 'VGG16 with augm tag'
 ################################################# v5
 
 rm code/model.py
-wget -P code https://s3-us-west-2.amazonaws.com/dvc-share/tutorial_cnn_code/vgg_augm_fine/model.py
+wget -O code/model.py https://s3-us-west-2.amazonaws.com/dvc-share/tutorial_cnn_code/model_vgg16_augm_fine.py
 dvc repro
 git status
 #On branch vgg16_augm
@@ -223,5 +223,5 @@ git push -u origin master --tags
 git push -u origin pre_trained
 git push -u origin vgg16_augm
 
-dvc cache push
+dvc push