summaryrefslogtreecommitdiff
path: root/cli/app
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2020-01-09 01:01:33 +0100
committerJules Laplace <julescarbon@gmail.com>2020-01-09 01:01:33 +0100
commit5ee9167828d2fa405678352b234d5d26b4e453da (patch)
tree089b3204b698b8cd609f7a416d5d54cda9e953b2 /cli/app
parentb9f515173f480a0468fc54d05bf134ebb15b0328 (diff)
folder id :(
Diffstat (limited to 'cli/app')
-rw-r--r--cli/app/search/json.py11
-rw-r--r--cli/app/search/search_dense.py1
2 files changed, 7 insertions, 5 deletions
diff --git a/cli/app/search/json.py b/cli/app/search/json.py
index bf6bcb9..ced84df 100644
--- a/cli/app/search/json.py
+++ b/cli/app/search/json.py
@@ -55,9 +55,10 @@ def save_params_latent(fp_out_dir, tag):
fp_out_fn = os.path.join(fp_out_dir, "params_latent.json")
write_json(data, fp_out_fn)
-def make_params_dense(tag):
+def make_params_dense(tag, folder_id):
return {
"tag": tag,
+ "folder_id": folder_id,
"decay_n": 2,
"features": True,
"clip": 1.0,
@@ -100,10 +101,10 @@ def make_params_dense(tag):
"max_batches": 0,
}
-def params_dense_dict(tag):
- return ParamsDict(make_params_dense(tag))
+def params_dense_dict(tag, folder_id=59):
+ return ParamsDict(make_params_dense(tag, folder_id))
-def save_params_dense(fp_out_dir, tag):
- data = make_params_dense(tag)
+def save_params_dense(fp_out_dir, tag, folder_id=59):
+ data = make_params_dense(tag, folder_id)
fp_out_fn = os.path.join(fp_out_dir, "params_dense.json")
write_json(data, fp_out_fn)
diff --git a/cli/app/search/search_dense.py b/cli/app/search/search_dense.py
index 5bf77fc..e006fdd 100644
--- a/cli/app/search/search_dense.py
+++ b/cli/app/search/search_dense.py
@@ -428,6 +428,7 @@ def find_dense_embedding_for_images(params):
fp_out_pkl = os.path.join(app_cfg.DIR_VECTORS, "file_{}.pkl".format(file_id))
out_data = {
'id': file_id,
+ 'folder_id': params.folder_id,
'sample_fn': sample_fn,
'label': out_labels[out_i],
'latent': out_lat[out_i],