From 1a810c8fb7ffe97059476fc35e88af4b6a5dc6aa Mon Sep 17 00:00:00 2001
From: Shawn-Shan <shansixioing@uchicago.edu>
Date: Wed, 29 Jul 2020 10:31:34 -0500
Subject: [PATCH] 0.3

---
 fawkes/protection.py | 2 +-
 fawkes/utils.py      | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/fawkes/protection.py b/fawkes/protection.py
index 3e6c209..87a2c26 100644
--- a/fawkes/protection.py
+++ b/fawkes/protection.py
@@ -80,7 +80,7 @@ class Fawkes(object):
             max_step = 1000
             lr = 8
         else:
-            raise Exception("mode must be one of 'low', 'mid', 'high', 'ultra', 'custom'")
+            raise Exception("mode must be one of 'min', 'low', 'mid', 'high', 'ultra', 'custom'")
         return th, max_step, lr
 
     def run_protection(self, image_paths, mode='min', th=0.04, sd=1e9, lr=10, max_step=500, batch_size=1, format='png',
diff --git a/fawkes/utils.py b/fawkes/utils.py
index 843a4d2..7a76914 100644
--- a/fawkes/utils.py
+++ b/fawkes/utils.py
@@ -233,7 +233,6 @@ def load_victim_model(number_classes, teacher_model=None, end2end=False):
 
 def resize(img, sz):
     assert np.min(img) >= 0 and np.max(img) <= 255.0
-
     from keras.preprocessing import image
     im_data = image.array_to_img(img).resize((sz[1], sz[0]))
     im_data = image.img_to_array(im_data)
@@ -431,18 +430,12 @@ def dump_image(x, filename, format="png", scale=False):
 
 def load_embeddings(feature_extractors_names):
     model_dir = os.path.join(os.path.expanduser('~'), '.fawkes')
-    dictionaries = []
     for extractor_name in feature_extractors_names:
         fp = gzip.open(os.path.join(model_dir, "{}_emb.p.gz".format(extractor_name)), 'rb')
         path2emb = pickle.load(fp)
         fp.close()
-        dictionaries.append(path2emb)
 
-    merge_dict = {}
-    for k in dictionaries[0].keys():
-        cur_emb = [dic[k] for dic in dictionaries]
-        merge_dict[k] = np.concatenate(cur_emb)
-    return merge_dict
+    return path2emb
 
 
 def extractor_ls_predict(feature_extractors_ls, X):