From d28056e69c58bf882719cb87cfcc185de32ca653 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 7 Jan 2020 22:29:17 +0100 Subject: getting latent search updates working... --- cli/app/commands/biggan/search_class.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cli/app/commands/biggan/search_class.py b/cli/app/commands/biggan/search_class.py index 9757367..0c49257 100644 --- a/cli/app/commands/biggan/search_class.py +++ b/cli/app/commands/biggan/search_class.py @@ -2,12 +2,11 @@ import click import os import time -from app.search.search_class import find_nearest_vector_for_images @click.command('') @click.option('-f', '--folder_id', 'opt_folder_id', type=int, default=0, help='Folder ID to process') -@click.option('-i', '--input', 'opt_fp_in', required=True, +@click.option('-i', '--input', 'opt_fp_in', help='Path to input image') @click.option('-d', '--dims', 'opt_dims', default=512, type=int, help='Dimensions of BigGAN network (128, 256, 512)') @@ -17,8 +16,6 @@ from app.search.search_class import find_nearest_vector_for_images help='Limit the number of images to process') @click.option('-v', '--video', 'opt_video', is_flag=True, help='Export a video for each dataset') -@click.option('-d', '--dims', 'opt_dims', default=512, type=int, - help='Dimensions of BigGAN network (128, 256, 512)') @click.option('-t', '--tag', 'opt_tag', default='inverse_' + str(int(time.time() * 1000)), help='Tag this dataset') @click.option('-sc', '--stochastic_clipping', 'opt_stochastic_clipping', default=0, @@ -38,6 +35,8 @@ def cli(ctx, opt_folder_id, opt_fp_in, opt_dims, opt_steps, opt_video, opt_tag, """ Search for an image (class vector) in BigGAN using gradient descent """ + from app.search.search_class import find_nearest_vector_for_images + if opt_folder_id != 0: folder = cortex_folder(opt_folder_id) files = download_cortex_files(opt_folder_id) @@ -51,8 +50,10 @@ def cli(ctx, opt_folder_id, opt_fp_in, opt_dims, opt_steps, opt_video, opt_tag, paths = glob(os.path.join(opt_fp_in, '*.jpg')) + \ glob(os.path.join(opt_fp_in, '*.jpeg')) + \ glob(os.path.join(opt_fp_in, '*.png')) - else: + elif opt_fp_in is not None: paths = [opt_fp_in] + else: + print("Must provide either a --folder_id or an --input folder") opt_feature_layers = opt_feature_layers.split(',') -- cgit v1.2.3-70-g09d2