From 3b33ecf8071be641d39c8d2f80c231163fbf6f9a Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 1 Nov 2019 01:05:12 +0000 Subject: [PATCH 1/3] fix doc link and update requirements --- README.md | 4 ++-- requirements.txt | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d22ee02..3f9b017 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # Example: Versioning -Datasets and ML model versioning example -[for Get Started](https://dvc.org/doc/get-started/example-versioning). +Datasets and ML model getting started +[versioning tutorial](https://dvc.org/doc/tutorials/versioning). diff --git a/requirements.txt b/requirements.txt index fc8ee8e..f918141 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -tensorflow==1.13.1 -keras==2.2.4 -pillow==5.3.0 +tensorflow==2 +pillow>=5.3,<6 From dab15433413dc2137f542d3661db412af6979364 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 1 Nov 2019 01:34:27 +0000 Subject: [PATCH 2/3] fix metrics, add missing requirements, neaten progress --- requirements.txt | 5 +++-- train.py | 19 ++++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index f918141..0c193e8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ -tensorflow==2 pillow>=5.3,<6 - +scipy +tensorflow==2 +tqdm==4 diff --git a/train.py b/train.py index d84b2af..397ce53 100644 --- a/train.py +++ b/train.py @@ -42,11 +42,13 @@ import json import sys import os +from tqdm import tqdm from tensorflow.keras.preprocessing.image import ImageDataGenerator from tensorflow.keras.models import Sequential from tensorflow.keras.layers import Dropout, Flatten, Dense from tensorflow.keras import applications +from tensorflow.keras.callbacks import LambdaCallback, CSVLogger pathname = os.path.dirname(sys.argv[0]) path = os.path.abspath(pathname) @@ -111,11 +113,18 @@ def train_top_model(): model.compile(optimizer='rmsprop', loss='binary_crossentropy', metrics=['accuracy']) - history = model.fit(train_data, train_labels, - epochs=epochs, - batch_size=batch_size, - validation_data=(validation_data, validation_labels)) - json.dump(history.history, open("metrics.json", 'w')) + with tqdm(total=epochs, unit='epoch') as t: + def progress_epoch(_, logs=None): + if logs: + t.set_postfix(logs, refresh=False) + t.update() + model.fit(train_data, train_labels, + epochs=epochs, + batch_size=batch_size, + validation_data=(validation_data, validation_labels), + verbose=0, + callbacks=[LambdaCallback(on_epoch_end=progress_epoch), + CSVLogger("metrics.csv")]) model.save_weights(top_model_weights_path) From 3c3596d8c9f996bd36127918455023a912c0efbe Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 1 Nov 2019 01:51:54 +0000 Subject: [PATCH 3/3] refix deps --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0c193e8..d501bff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ pillow>=5.3,<6 -scipy -tensorflow==2 -tqdm==4 +scipy>=1.3,<2 +tensorflow>=2,<3 +tqdm>=4,<5