balthou commited on
Commit
44a561b
·
1 Parent(s): 0ed77e1

make the app much faster

Browse files
__dataset/sample/0000.png CHANGED
__dataset/sample/0001.jpg DELETED
Binary file (59.1 kB)
 
__dataset/sample/0002.png DELETED
Binary file (428 kB)
 
__dataset/sample/0004.png ADDED
__dataset/sample/0008.png ADDED
__dataset/sample/0011.png ADDED
__dataset/sample/0017.png ADDED
__dataset/sample/0107.png ADDED
app.py CHANGED
@@ -31,7 +31,7 @@ def image_loading_batch(input: Path, args: argparse.Namespace) -> dict:
31
  return {"name": input.name, "path": input, "buffer": None}
32
 
33
 
34
- def main(argv):
35
  batch = Batch(argv)
36
  batch.set_io_description(
37
  input_help='input image files',
@@ -40,19 +40,23 @@ def main(argv):
40
  parser = get_parser()
41
  parser.add_argument("-nop", "--disable-preload", action="store_true", help="Disable images preload")
42
  args = batch.parse_args(parser)
43
- # batch.set_multiprocessing_enabled(False)
 
 
44
  img_list = batch.run(image_loading_batch)
45
  if args.keyboard:
46
  image_control = KeyboardControl(0, [0, len(img_list)-1], keydown="3", keyup="9", modulo=True)
47
  else:
48
  image_control = (0, [0, len(img_list)-1])
49
  interactive(image_index=image_control)(image_selector)
50
- plug_crop_selector(num_pad=args.keyboard)
51
- # plug_configure_metrics(key_shortcut="a") # "a" if args.keyboard else None)
52
- # plug_morph_canvas()
 
 
53
  model_dict = get_default_models(args.experiments, Path(args.models_storage), keyboard_control=args.keyboard)
54
  interactive_pipeline(
55
- gui=args.backend,
56
  cache=True,
57
  safe_input_buffer_deepcopy=False
58
  )(natural_inference_pipeline)(
@@ -63,4 +67,4 @@ def main(argv):
63
 
64
  if __name__ == "__main__":
65
  # main(sys.argv[1:])
66
- main(["-e", "6002", "5002", "-i", "__dataset/sample/*.*g", "-b", "gradio"])
 
31
  return {"name": input.name, "path": input, "buffer": None}
32
 
33
 
34
+ def main(argv, low_resource_demo=True):
35
  batch = Batch(argv)
36
  batch.set_io_description(
37
  input_help='input image files',
 
40
  parser = get_parser()
41
  parser.add_argument("-nop", "--disable-preload", action="store_true", help="Disable images preload")
42
  args = batch.parse_args(parser)
43
+ backend = args.backend
44
+ if backend == "qt":
45
+ batch.set_multiprocessing_enabled(False)
46
  img_list = batch.run(image_loading_batch)
47
  if args.keyboard:
48
  image_control = KeyboardControl(0, [0, len(img_list)-1], keydown="3", keyup="9", modulo=True)
49
  else:
50
  image_control = (0, [0, len(img_list)-1])
51
  interactive(image_index=image_control)(image_selector)
52
+ plug_crop_selector(num_pad=args.keyboard, low_resources=low_resource_demo)
53
+ if not low_resource_demo:
54
+ plug_configure_metrics(key_shortcut="a") # "a" if args.keyboard else None)
55
+ if args.backend != "gradio":
56
+ plug_morph_canvas()
57
  model_dict = get_default_models(args.experiments, Path(args.models_storage), keyboard_control=args.keyboard)
58
  interactive_pipeline(
59
+ gui=backend,
60
  cache=True,
61
  safe_input_buffer_deepcopy=False
62
  )(natural_inference_pipeline)(
 
67
 
68
  if __name__ == "__main__":
69
  # main(sys.argv[1:])
70
+ main(["-e", "6002", "5002", "-i", "__dataset/sample/*.*g", "-b", "gradio"], low_resource_demo=True)
src/rstor/analyzis/interactive/crop.py CHANGED
@@ -45,11 +45,15 @@ def crop_selector(image, center_x=0.5, center_y=0.5, size=9., global_params={}):
45
  return
46
 
47
 
48
- def plug_crop_selector(num_pad: bool = False):
 
 
 
 
49
  interactive(
50
  center_x=(0.5, [0., 1.], "cx", ["4" if num_pad else "left", "6" if num_pad else "right"]),
51
  center_y=(0.5, [0., 1.], "cy", ["8" if num_pad else "up", "2" if num_pad else "down"]),
52
- size=(9., [6., 13., 0.3], "crop size", ["+", "-"])
53
  )(crop_selector)
54
 
55
 
 
45
  return
46
 
47
 
48
+ def plug_crop_selector(num_pad: bool = False, low_resources: bool = False):
49
+ if low_resources:
50
+ size_control = (5., [5., 7., 0.3], "crop size", ["+", "-"])
51
+ else:
52
+ size_control = (9., [6., 13., 0.3], "crop size", ["+", "-"])
53
  interactive(
54
  center_x=(0.5, [0., 1.], "cx", ["4" if num_pad else "left", "6" if num_pad else "right"]),
55
  center_y=(0.5, [0., 1.], "cy", ["8" if num_pad else "up", "2" if num_pad else "down"]),
56
+ size=size_control
57
  )(crop_selector)
58
 
59
 
src/rstor/analyzis/interactive/pipelines.py CHANGED
@@ -54,8 +54,9 @@ def natural_inference_pipeline(input_image_list: List[np.ndarray], models_dict:
54
  degraded = degrade_noise(degraded)
55
  blur_kernel = rescale_thumbnail(blur_kernel)
56
  restored = infer(degraded, model)
57
- configure_metrics()
58
- get_metrics_restored(restored, groundtruth)
59
- get_metrics_degraded(degraded, groundtruth)
60
- morph_canvas()
61
- return [[degraded, restored], [blur_kernel, groundtruth]]
 
 
54
  degraded = degrade_noise(degraded)
55
  blur_kernel = rescale_thumbnail(blur_kernel)
56
  restored = infer(degraded, model)
57
+ # configure_metrics()
58
+ # get_metrics_restored(restored, groundtruth)
59
+ # get_metrics_degraded(degraded, groundtruth)
60
+ # morph_canvas()
61
+ # return [[degraded, restored], [blur_kernel, groundtruth]]
62
+ return [degraded, restored, groundtruth, blur_kernel]