Skip to content

Commit

Permalink
Merge pull request #358 from ShenYuhan/serving_ma
Browse files Browse the repository at this point in the history
turn i_img on
  • Loading branch information
sjtubinlong authored Feb 19, 2020
2 parents af0ac59 + 8367e97 commit 48db0c9
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions paddlehub/serving/app_single.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def predict_gan(module, input_img, id, batch_size, extra={}):
return results_pack


def predict_mask(module, input_img, id, batch_size, extra=None, r_img=False):
def predict_mask(module, input_img, id, batch_size, extra=None, r_img=True):
output_folder = "detection_result"
global use_gpu
method_name = module.desc.attr.map.data['default_signature'].s
Expand All @@ -147,9 +147,12 @@ def predict_mask(module, input_img, id, batch_size, extra=None, r_img=False):
data.update(input_img)
if extra is not None:
data.update(extra)
r_img = True if "r_img" in extra.keys() else False
r_img = False if "visual_result" in extra.keys() else True
results = predict_method(
data=data, use_gpu=use_gpu, batch_size=batch_size)
data=data,
visualization=r_img,
use_gpu=use_gpu,
batch_size=batch_size)
results = utils.handle_mask_results(results)
except Exception as err:
curr = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time()))
Expand All @@ -160,7 +163,6 @@ def predict_mask(module, input_img, id, batch_size, extra=None, r_img=False):
results_pack = []
if input_img is not None:
if r_img is False:
shutil.rmtree(output_folder)
for index in range(len(results)):
results[index]["path"] = ""
results_pack = results
Expand Down

0 comments on commit 48db0c9

Please # to comment.