merged changes

deoldify/visualize.py

@@ -19,21 +19,12 @@ from .generators import gen_inference_deep, gen_inference_wide
 
 
 
-<<<<<<< HEAD
-=======
 # class LoadedModel
->>>>>>> 878ecf212e9f3f2f6e923e3bfff6ec899dc40143
 class ModelImageVisualizer:
     def __init__(self, filter: IFilter, results_dir: str = None):
         self.filter = filter
         self.results_dir = None if results_dir is None else Path(results_dir)
-<<<<<<< HEAD
-
-        if self.results_dir is not None:
-            self.results_dir.mkdir(parents=True, exist_ok=True)
-=======
         self.results_dir.mkdir(parents=True, exist_ok=True)
->>>>>>> 878ecf212e9f3f2f6e923e3bfff6ec899dc40143
 
     def _clean_mem(self):
         torch.cuda.empty_cache()
@@ -223,42 +214,15 @@ class ModelImageVisualizer:
         return rows, columns
 
 
-<<<<<<< HEAD
-def get_image_colorizer(root_folder: Path = Path('./'), render_factor: int = 35, artistic: bool = True
-                        ) -> ModelImageVisualizer:
-
-=======
 def get_image_colorizer(
     root_folder: Path = Path('./'), render_factor: int = 35, artistic: bool = True
 ) -> ModelImageVisualizer:
->>>>>>> 878ecf212e9f3f2f6e923e3bfff6ec899dc40143
     if artistic:
         return get_artistic_image_colorizer(root_folder=root_folder, render_factor=render_factor)
     else:
         return get_stable_image_colorizer(root_folder=root_folder, render_factor=render_factor)
 
 
-<<<<<<< HEAD
-def get_stable_image_colorizer(root_folder: Path = Path('./'), weights_name: str = 'ColorizeStable_gen',
-                                results_dir='result_images', render_factor: int = 35
-                            ) -> ModelImageVisualizer:
-
-    learn = gen_inference_wide(root_folder=root_folder, weights_name=weights_name)
-    filtr = MasterFilter([ColorizerFilter(learn=learn)], render_factor=render_factor)
-    # vis = ModelImageVisualizer(filtr, results_dir=results_dir)
-    vis = ModelImageVisualizer(filtr)
-    return vis
-
-
-def get_artistic_image_colorizer(root_folder: Path = Path('./'), weights_name: str = 'ColorizeArtistic_gen',
-                                    results_dir='result_images', render_factor: int = 35
-                                ) -> ModelImageVisualizer:
-
-    learn = gen_inference_deep(root_folder=root_folder, weights_name=weights_name)
-    filtr = MasterFilter([ColorizerFilter(learn=learn)], render_factor=render_factor)
-    # vis = ModelImageVisualizer(filtr, results_dir=results_dir)
-    vis = ModelImageVisualizer(filtr)
-=======
 def get_stable_image_colorizer(
     root_folder: Path = Path('./'),
     weights_name: str = 'ColorizeStable_gen',
@@ -280,5 +244,4 @@ def get_artistic_image_colorizer(
     learn = gen_inference_deep(root_folder=root_folder, weights_name=weights_name)
     filtr = MasterFilter([ColorizerFilter(learn=learn)], render_factor=render_factor)
     vis = ModelImageVisualizer(filtr, results_dir=results_dir)
->>>>>>> 878ecf212e9f3f2f6e923e3bfff6ec899dc40143
     return vis