fix: removed commented code

dashboard_image2image.py

@@ -7,6 +7,7 @@ import streamlit as st
 from PIL import Image
 from transformers import CLIPProcessor, FlaxCLIPModel
 
+import utils
 
 BASELINE_MODEL = "openai/clip-vit-base-patch32"
 # MODEL_PATH = "/home/shared/models/clip-rsicd/bs128x8-lr5e-6-adam/ckpt-1"
@@ -20,30 +21,6 @@ IMAGE_VECTOR_FILE = "./vectors/test-bs128x8-lr5e-6-adam-ckpt-1.tsv"
 IMAGES_DIR = "./images"
 
 
-@st.cache(allow_output_mutation=True)
-def load_index():
-    filenames, image_vecs = [], []
-    fvec = open(IMAGE_VECTOR_FILE, "r")
-    for line in fvec:
-        cols = line.strip().split('\t')
-        filename = cols[0]
-        image_vec = np.array([float(x) for x in cols[1].split(',')])
-        filenames.append(filename)
-        image_vecs.append(image_vec)
-    V = np.array(image_vecs)
-    index = nmslib.init(method='hnsw', space='cosinesimil')
-    index.addDataPointBatch(V)
-    index.createIndex({'post': 2}, print_progress=True)
-    return filenames, index
-
-
-@st.cache(allow_output_mutation=True)
-def load_model():
-    model = FlaxCLIPModel.from_pretrained(MODEL_PATH)
-    processor = CLIPProcessor.from_pretrained(BASELINE_MODEL)
-    return model, processor
-
-
 @st.cache(allow_output_mutation=True)
 def load_example_images():
     example_images = {}
@@ -60,8 +37,9 @@ def load_example_images():
 
 
 def app():
-    filenames, index = load_index()
-    model, processor = load_model()
+    filenames, index = utils.load_index(IMAGE_VECTOR_FILE)
+    model, processor = utils.load_model(MODEL_PATH, BASELINE_MODEL)
+
     example_images = load_example_images()
     example_image_list = sorted([v[np.random.randint(0, len(v))] 
                                 for k, v in example_images.items()][0:10])

dashboard_text2image.py

@@ -6,6 +6,7 @@ import streamlit as st
 
 from transformers import CLIPProcessor, FlaxCLIPModel
 
+import utils
 
 BASELINE_MODEL = "openai/clip-vit-base-patch32"
 # MODEL_PATH = "/home/shared/models/clip-rsicd/bs128x8-lr5e-6-adam/ckpt-1"
@@ -19,33 +20,9 @@ IMAGE_VECTOR_FILE = "./vectors/test-bs128x8-lr5e-6-adam-ckpt-1.tsv"
 IMAGES_DIR = "./images"
 
 
-@st.cache(allow_output_mutation=True)
-def load_index():
-    filenames, image_vecs = [], []
-    fvec = open(IMAGE_VECTOR_FILE, "r")
-    for line in fvec:
-        cols = line.strip().split('\t')
-        filename = cols[0]
-        image_vec = np.array([float(x) for x in cols[1].split(',')])
-        filenames.append(filename)
-        image_vecs.append(image_vec)
-    V = np.array(image_vecs)
-    index = nmslib.init(method='hnsw', space='cosinesimil')
-    index.addDataPointBatch(V)
-    index.createIndex({'post': 2}, print_progress=True)
-    return filenames, index
-
-
-@st.cache(allow_output_mutation=True)
-def load_model():
-    model = FlaxCLIPModel.from_pretrained(MODEL_PATH)
-    processor = CLIPProcessor.from_pretrained(BASELINE_MODEL)
-    return model, processor
-
-
 def app():
-    filenames, index = load_index()
-    model, processor = load_model()
+    filenames, index = utils.load_index(IMAGE_VECTOR_FILE)
+    model, processor = utils.load_model(MODEL_PATH, BASELINE_MODEL)
 
     st.title("Text to Image Retrieval")
     st.markdown("""

utils.py

@@ -28,5 +28,6 @@ def load_index(image_vector_file):
 @st.cache(allow_output_mutation=True)
 def load_model(model_path, baseline_model):
     model = FlaxCLIPModel.from_pretrained(model_path)
-    processor = CLIPProcessor.from_pretrained(baseline_model)
+    # processor = CLIPProcessor.from_pretrained(baseline_model)
+    processor = CLIPProcessor.from_pretrained(model_path)
     return model, processor