Skip to content

Commit

Permalink
edits to model
Browse files Browse the repository at this point in the history
  • Loading branch information
chami committed Nov 15, 2017
1 parent 93b1fa9 commit 809371c
Show file tree
Hide file tree
Showing 9 changed files with 745 additions and 373 deletions.
2 changes: 1 addition & 1 deletion config.py
Expand Up @@ -125,7 +125,7 @@ def parse_training_args(parser):
help='Number of channels for the upsample module.')
parser.add_argument('--fcnn', action='store_true',
help='Use FCNN with the bilinear upsampling module.')
parser.add_argument('--finetune_cnn', action='store_true',
parser.add_argument('--finetune-cnn', action='store_true',
help='Finetune the pretrained cnn networks.')
# Locations read and written to in the filesystem.
parser.add_argument('--save-dir', type=str, default=None,
Expand Down
209 changes: 193 additions & 16 deletions dataset_statistics.ipynb

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions evaluate.py
Expand Up @@ -20,17 +20,15 @@
args = parse_args(evaluation=True)
models_dir = os.path.dirname(args.model_checkpoint)
params = objdict(json.load(open(os.path.join(models_dir, "args.json"), "r")))
try:
params.baseline_weights
except AttributeError:
params.baseline_weights = None
params.batch_size = args.batch_size
#params.embedding_dim = 1024
params.finetune_cnn = True
params.dropout = 0.
params.discovery = args.discovery
params.shuffle = False
params.subject_droprate = args.subject_droprate
params.object_droprate = args.object_droprate

#params.embedding_dim = 256
# If the dataset does exists, alert the user.
if not os.path.isdir(args.data_dir):
raise ValueError('The directory %s doesn\'t exist. '
Expand Down Expand Up @@ -67,6 +65,7 @@

# Run Evaluation.
steps = len(generator)
print('Total number of steps for batch size = {} : {}'.format(args.batch_size, steps))
outputs = model.evaluate_generator(generator=generator,
steps=steps,
use_multiprocessing=args.multiprocessing,
Expand Down

0 comments on commit 809371c

Please sign in to comment.