Skip to content

Fix typos in readme.md #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix typos in readme.md #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb2e5c2
Fix typos in readme.md
liljoon Sep 12, 2023
5a61073
Merge branch 'ChaoningZhang:master' into master
liljoon Dec 7, 2023
cf31040
feat : flask api server 기능 추가
liljoon Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ Whole Pipeline (Enc+Dec) | FastSAM | Mobile
Parameters | 68M | 9.66M
Speed | 64ms |12ms

:muscle: **Does MobileSAM aign better with the original SAM than FastSAM? Yes!**
FastSAM is suggested to work with multiple points, thus we compare the mIoU with two prompt points (with different pixel distances) and show the resutls as follows. Higher mIoU indicates higher alignment.
:muscle: **Does MobileSAM align better with the original SAM than FastSAM? Yes!**
FastSAM is suggested to work with multiple points, thus we compare the mIoU with two prompt points (with different pixel distances) and show the results as follows. Higher mIoU indicates higher alignment.
mIoU | FastSAM | MobileSAM
:-----------------------------------------:|:---------|:-----:
100 | 0.27 | 0.73
Expand Down
54 changes: 54 additions & 0 deletions app/apiserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import base64
import PIL
import re
from io import BytesIO

from flask import Flask, jsonify, request
from flask_cors import CORS
from app import get_points_with_draw, segment_with_points

app = Flask(__name__)
CORS(app)


@app.route('/food_segmentation', methods=['POST'])
def food_segmentation():
imageB64 = re.sub('^data:image/.+;base64,', '', request.json['imageB64'])
x1 = request.json['x1']
y1 = request.json['y1']
x2 = request.json['x2']
y2 = request.json['y2']

if x1 == None or y1 == None or x2 == None or y2 == None:
result = {
"imageB64": request.json['imageB64']
}
return jsonify(result)
image = PIL.Image.open(BytesIO(base64.b64decode(imageB64)))

# print(image)

get_points_with_draw(None, "Add Mask", x1+50, y1+50)
get_points_with_draw(None, "Add Mask", x2-50, y1+50)
get_points_with_draw(None, "Add Mask", x1+50, y2-50)
get_points_with_draw(None, "Add Mask", x2-50, y2-50)

fig, _ = segment_with_points(image)

img_byte_array = BytesIO()
fig.save(img_byte_array, format="PNG")
img_byte_array = img_byte_array.getvalue()

# Bytes를 base64로 인코딩
base64_encoded = "data:image/png;base64," + base64.b64encode(img_byte_array).decode("utf-8")

result = {
"imageB64": base64_encoded
}
return jsonify(result)


if __name__ == '__main__':
ip_address = "127.0.0.1"
port_number = 8001
app.run(ip_address, port=int(port_number), debug=True)
270 changes: 135 additions & 135 deletions app/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,11 @@ def segment_with_points(
return fig, image


def get_points_with_draw(image, label, evt: gr.SelectData):
def get_points_with_draw(image, label, x, y):
global global_points
global global_point_label

x, y = evt.index[0], evt.index[1]
# x, y = evt.index[0], evt.index[1]
point_radius, point_color = 15, (255, 255, 0) if label == "Add Mask" else (
255,
0,
Expand All @@ -171,11 +171,11 @@ def get_points_with_draw(image, label, evt: gr.SelectData):
print(x, y, label == "Add Mask")

# 创建一个可以在图像上绘图的对象
draw = ImageDraw.Draw(image)
draw.ellipse(
[(x - point_radius, y - point_radius), (x + point_radius, y + point_radius)],
fill=point_color,
)
# draw = ImageDraw.Draw(image)
# draw.ellipse(
# [(x - point_radius, y - point_radius), (x + point_radius, y + point_radius)],
# fill=point_color,
# )
return image


Expand All @@ -199,131 +199,131 @@ def get_points_with_draw(image, label, evt: gr.SelectData):
info="Our model was trained on a size of 1024",
)

with gr.Blocks(css=css, title="Faster Segment Anything(MobileSAM)") as demo:
with gr.Row():
with gr.Column(scale=1):
# Title
gr.Markdown(title)

# with gr.Tab("Everything mode"):
# # Images
# with gr.Row(variant="panel"):
# with gr.Column(scale=1):
# cond_img_e.render()
#
# with gr.Column(scale=1):
# segm_img_e.render()
#
# # Submit & Clear
# with gr.Row():
# with gr.Column():
# input_size_slider.render()
#
# with gr.Row():
# contour_check = gr.Checkbox(
# value=True,
# label="withContours",
# info="draw the edges of the masks",
# )
#
# with gr.Column():
# segment_btn_e = gr.Button(
# "Segment Everything", variant="primary"
# )
# clear_btn_e = gr.Button("Clear", variant="secondary")
#
# gr.Markdown("Try some of the examples below ⬇️")
# gr.Examples(
# examples=examples,
# inputs=[cond_img_e],
# outputs=segm_img_e,
# fn=segment_everything,
# cache_examples=True,
# examples_per_page=4,
# )
#
# with gr.Column():
# with gr.Accordion("Advanced options", open=False):
# # text_box = gr.Textbox(label="text prompt")
# with gr.Row():
# mor_check = gr.Checkbox(
# value=False,
# label="better_visual_quality",
# info="better quality using morphologyEx",
# )
# with gr.Column():
# retina_check = gr.Checkbox(
# value=True,
# label="use_retina",
# info="draw high-resolution segmentation masks",
# )
# # Description
# gr.Markdown(description_e)
#
with gr.Tab("Point mode"):
# Images
with gr.Row(variant="panel"):
with gr.Column(scale=1):
cond_img_p.render()

with gr.Column(scale=1):
segm_img_p.render()

# Submit & Clear
with gr.Row():
with gr.Column():
with gr.Row():
add_or_remove = gr.Radio(
["Add Mask", "Remove Area"],
value="Add Mask",
)

with gr.Column():
segment_btn_p = gr.Button(
"Start segmenting!", variant="primary"
)
clear_btn_p = gr.Button("Restart", variant="secondary")

gr.Markdown("Try some of the examples below ⬇️")
gr.Examples(
examples=examples,
inputs=[cond_img_p],
# outputs=segm_img_p,
# fn=segment_with_points,
# cache_examples=True,
examples_per_page=4,
)

with gr.Column():
# Description
gr.Markdown(description_p)

cond_img_p.select(get_points_with_draw, [cond_img_p, add_or_remove], cond_img_p)

# segment_btn_e.click(
# segment_everything,
# inputs=[
# cond_img_e,
# input_size_slider,
# mor_check,
# contour_check,
# retina_check,
# ],
# outputs=segm_img_e,
# )

segment_btn_p.click(
segment_with_points, inputs=[cond_img_p], outputs=[segm_img_p, cond_img_p]
)

def clear():
return None, None

def clear_text():
return None, None, None

# clear_btn_e.click(clear, outputs=[cond_img_e, segm_img_e])
clear_btn_p.click(clear, outputs=[cond_img_p, segm_img_p])

demo.queue()
demo.launch()
# with gr.Blocks(css=css, title="Faster Segment Anything(MobileSAM)") as demo:
# with gr.Row():
# with gr.Column(scale=1):
# # Title
# gr.Markdown(title)
#
# # with gr.Tab("Everything mode"):
# # # Images
# # with gr.Row(variant="panel"):
# # with gr.Column(scale=1):
# # cond_img_e.render()
# #
# # with gr.Column(scale=1):
# # segm_img_e.render()
# #
# # # Submit & Clear
# # with gr.Row():
# # with gr.Column():
# # input_size_slider.render()
# #
# # with gr.Row():
# # contour_check = gr.Checkbox(
# # value=True,
# # label="withContours",
# # info="draw the edges of the masks",
# # )
# #
# # with gr.Column():
# # segment_btn_e = gr.Button(
# # "Segment Everything", variant="primary"
# # )
# # clear_btn_e = gr.Button("Clear", variant="secondary")
# #
# # gr.Markdown("Try some of the examples below ⬇️")
# # gr.Examples(
# # examples=examples,
# # inputs=[cond_img_e],
# # outputs=segm_img_e,
# # fn=segment_everything,
# # cache_examples=True,
# # examples_per_page=4,
# # )
# #
# # with gr.Column():
# # with gr.Accordion("Advanced options", open=False):
# # # text_box = gr.Textbox(label="text prompt")
# # with gr.Row():
# # mor_check = gr.Checkbox(
# # value=False,
# # label="better_visual_quality",
# # info="better quality using morphologyEx",
# # )
# # with gr.Column():
# # retina_check = gr.Checkbox(
# # value=True,
# # label="use_retina",
# # info="draw high-resolution segmentation masks",
# # )
# # # Description
# # gr.Markdown(description_e)
# #
# with gr.Tab("Point mode"):
# # Images
# with gr.Row(variant="panel"):
# with gr.Column(scale=1):
# cond_img_p.render()
#
# with gr.Column(scale=1):
# segm_img_p.render()
#
# # Submit & Clear
# with gr.Row():
# with gr.Column():
# with gr.Row():
# add_or_remove = gr.Radio(
# ["Add Mask", "Remove Area"],
# value="Add Mask",
# )
#
# with gr.Column():
# segment_btn_p = gr.Button(
# "Start segmenting!", variant="primary"
# )
# clear_btn_p = gr.Button("Restart", variant="secondary")
#
# gr.Markdown("Try some of the examples below ⬇️")
# gr.Examples(
# examples=examples,
# inputs=[cond_img_p],
# # outputs=segm_img_p,
# # fn=segment_with_points,
# # cache_examples=True,
# examples_per_page=4,
# )
#
# with gr.Column():
# # Description
# gr.Markdown(description_p)
#
# cond_img_p.select(get_points_with_draw, [cond_img_p, add_or_remove], cond_img_p)
#
# # segment_btn_e.click(
# # segment_everything,
# # inputs=[
# # cond_img_e,
# # input_size_slider,
# # mor_check,
# # contour_check,
# # retina_check,
# # ],
# # outputs=segm_img_e,
# # )
#
# segment_btn_p.click(
# segment_with_points, inputs=[cond_img_p], outputs=[segm_img_p, cond_img_p]
# )
#
# def clear():
# return None, None
#
# def clear_text():
# return None, None, None
#
# # clear_btn_e.click(clear, outputs=[cond_img_e, segm_img_e])
# clear_btn_p.click(clear, outputs=[cond_img_p, segm_img_p])

# demo.queue()
# demo.launch()
2 changes: 2 additions & 0 deletions app/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ torchvision
timm
opencv-python
git+https://github.com/dhkim2810/MobileSAM.git
flask
flask_cors