na

app.py

@@ -5,10 +5,6 @@ from models import efficientnetv2b0_25_arch_styles_Classifier
 
 
 demo = gr.Interface(
-<<<<<<< HEAD
     efficientnetv2b0_25_arch_styles_Classifier, "image", "label")
-=======
-    efficientnetv2b0_25_arch_styles_Classifier, "image", outputs=["text"])
->>>>>>> 6dfb3eb853ff6baf202a3117ebb5b61755454768
 
 demo.launch()

models.py

@@ -41,16 +41,9 @@ def efficientnetv2b0_25_arch_styles_Classifier(image):
         224, 224), interpolation=cv2.INTER_CUBIC)
     img = tf.expand_dims(resized_image, 0)
     efficientnetv2b0 = tf.keras.models.load_model(
-<<<<<<< HEAD
         "models\EfficientNetV2B0.h5")
 
     y = efficientnetv2b0.predict(img).reshape(-1)
     y = (np.round(y, 3)).tolist()
-=======
-        "EfficientNetV2B0.h5")
-
-    y = efficientnetv2b0.predict(img).reshape(-1)
-    y = (np.round(y, 3)*100).tolist()
->>>>>>> 6dfb3eb853ff6baf202a3117ebb5b61755454768
 
     return outputs(y)