Single path tan loading #6
Conversation
keras/utils.py
Outdated
|
|
||
| # Load TFs | ||
| # Assume they are present in config['train_module'] as list called tfs | ||
| tfs = import_module(config['train_module']).tfs |
There was a problem hiding this comment.
This seems like way too strong of an assumption. Any other ideas on how to load in TFs?
There was a problem hiding this comment.
Fixed in latest commit- we just pickle them using the cloud lib (a good logging / reproducibility step regardless), then just load them in; much simpler. And all handled in the train_scripts.py file
keras/utils.py
Outdated
| with open(config_path, 'r') as f: | ||
| def load_pretrained_tan(path): | ||
| # Load config dictionary from run log | ||
| with open(os.path.join(path, 'run_log.json'), 'r') as f: |
There was a problem hiding this comment.
Is this where this file is always located? I think it's usually in logs, just like this for the pretrained dir
keras/tanda_keras.py
Outdated
| @@ -36,7 +37,7 @@ class TANDAImageDataGenerator(ImageDataGenerator): | |||
| """ | |||
|
|
|||
| def __init__(self, | |||
| tan, | |||
| tan_path, | |||
There was a problem hiding this comment.
Definitely need to allow user to pass in TAN object. Can use isinstance(tan, str)
experiments/cifar10/train.py
Outdated
| @@ -45,6 +47,12 @@ | |||
| if FLAGS.n_folds > 0: | |||
| X_train, Y_train = select_fold(X_train, Y_train) | |||
|
|
|||
| # Make sure dims and current module name is included in the run log | |||
| # Note: this is currently kind of hackey, should clean up... | |||
| FLAGS.__flags['train_module'] = re.sub(r'\/', '.', | |||
There was a problem hiding this comment.
Breaks if any experiment subdir contains "tanda" right?
There was a problem hiding this comment.
Also shouldnt this be somewhere in train_scripts.py?
|
@henryre ready for re-review! Can be tested when training new TANs |
|
Ok will look soon! |
experiments/cifar10/train.py
Outdated
| @@ -3,7 +3,10 @@ | |||
| from __future__ import print_function | |||
| from __future__ import unicode_literals | |||
|
|
|||
| from dataset import load_cifar10_data | |||
| import sys | |||
experiments/cifar10/train.py
Outdated
| import sys | ||
| import re | ||
|
|
||
| from .dataset import load_cifar10_data |
experiments/train_scripts.py
Outdated
| @@ -8,6 +8,8 @@ | |||
| import re | |||
| import tensorflow as tf | |||
| import tensorflow.contrib.slim as slim | |||
| import sys | |||
| import cloud | |||
There was a problem hiding this comment.
Needs to be added to package requirement
There was a problem hiding this comment.
Also why this instead of e.g. dill?
keras/utils.py
Outdated
| @@ -4,6 +4,7 @@ | |||
| from __future__ import unicode_literals | |||
|
|
|||
| import json | |||
| import pickle | |||
pretrained/cifar10/logs/run_log.json
Outdated
| @@ -0,0 +1,61 @@ | |||
| { | |||
experiments/train_scripts.py
Outdated
| @@ -8,6 +8,8 @@ | |||
| import re | |||
| import tensorflow as tf | |||
| import tensorflow.contrib.slim as slim | |||
| import sys | |||
|
@henryre Addressed all inline comments |
experiments/cifar10/train.py
Outdated
| @@ -3,6 +3,8 @@ | |||
| from __future__ import print_function | |||
| from __future__ import unicode_literals | |||
|
|
|||
| import re | |||
keras/utils.py
Outdated
| @@ -4,6 +4,7 @@ | |||
| from __future__ import unicode_literals | |||
|
|
|||
| import json | |||
| from six import pickle | |||
python-package-requirement.txt
Outdated
| @@ -6,3 +6,4 @@ scikit-image>=0.13 | |||
| scipy>=0.18 | |||
| six | |||
| tensorflow>=1.2 | |||
| cloud | |||
|
@henryre changes made |
Still needs to be tested