Merge branch 'main' of https://github.com/aimclub/OCEANAI

aimclub · Dec 12, 2023 · 7f7984e · 7f7984e
2 parents 903c763 + d5888bc
commit 7f7984e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 29 deletions.
diff --git a/docs/source/user_guide/notebooks/images/Pipeline_MIA_AVT_ru.svg b/docs/source/user_guide/notebooks/images/Pipeline_MIA_AVT_ru.svg
diff --git a/docs/source/user_guide/notebooks/images/Pipeline_MIA_AV_ru.svg b/docs/source/user_guide/notebooks/images/Pipeline_MIA_AV_ru.svg
diff --git a/oceanai/modules/lab/keras_vggface/utils.py b/oceanai/modules/lab/keras_vggface/utils.py
@@ -7,7 +7,6 @@
 
 import numpy as np
 from keras import backend as K
-from keras.utils.data_utils import get_file
 
 V1_LABELS_PATH = "https://github.com/rcmalli/keras-vggface/releases/download/v2.0/rcmalli_vggface_labels_v1.npy"
 V2_LABELS_PATH = "https://github.com/rcmalli/keras-vggface/releases/download/v2.0/rcmalli_vggface_labels_v2.npy"
@@ -62,29 +61,4 @@ def preprocess_input(x, data_format=None, version=1):
     else:
         raise NotImplementedError
 
-    return x_temp
-
-
-def decode_predictions(preds, top=5):
-    LABELS = None
-    if len(preds.shape) == 2:
-        if preds.shape[1] == 2622:
-            fpath = get_file("rcmalli_vggface_labels_v1.npy", V1_LABELS_PATH, cache_subdir=VGGFACE_DIR)
-            LABELS = np.load(fpath)
-        elif preds.shape[1] == 8631:
-            fpath = get_file("rcmalli_vggface_labels_v2.npy", V2_LABELS_PATH, cache_subdir=VGGFACE_DIR)
-            LABELS = np.load(fpath)
-        else:
-            raise ValueError
-    else:
-        raise ValueError
-
-    results = []
-
-    for pred in preds:
-        top_indices = pred.argsort()[-top:][::-1]
-        result = [[str(LABELS[i].encode("utf8")), pred[i]] for i in top_indices]
-        result.sort(key=lambda x: x[1], reverse=True)
-        results.append(result)
-
-    return results
+    return x_temp