[UPDATE] remove prediction_type

infer.py

@@ -1,4 +1,4 @@
-# Last modified: 2024-05-17
+# Last modified: 2024-05-24
 # Copyright 2023 Bingxin Ke, ETH Zurich. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -214,7 +214,7 @@ def check_directory(directory):
 
     pipe = pipe.to(device)
     logging.info(
-        f"{pipe.prediction_type = }, {pipe.scale_invariant = }, {pipe.shift_invariant = }"
+        f"scale_invariant: {pipe.scale_invariant}, shift_invariant: {pipe.shift_invariant}"
     )
 
     # -------------------- Inference and saving --------------------

marigold/marigold_pipeline.py

@@ -97,17 +97,10 @@ def __init__(
         scheduler: Union[DDIMScheduler, LCMScheduler],
         text_encoder: CLIPTextModel,
         tokenizer: CLIPTokenizer,
-        prediction_type: str = None,
         scale_invariant: bool = None,
         shift_invariant: bool = None,
     ):
         super().__init__()
-
-        if prediction_type is None:
-            logging.warn(
-                "`prediction_type` is required but not given, filled with 'depth'"
-            )
-            prediction_type = "depth"
         if scale_invariant is None:
             logging.warn(
                 "`scale_invariant` is required but not given, filled with `True`"
@@ -118,8 +111,6 @@ def __init__(
                 "`shift_invariant` is required but not given, filled with `True`"
             )
             shift_invariant = True
-
-        self.prediction_type = prediction_type
         self.scale_invariant = scale_invariant
         self.shift_invariant = shift_invariant
 
@@ -131,7 +122,6 @@ def __init__(
             tokenizer=tokenizer,
         )
         self.register_to_config(
-            prediction_type=prediction_type,
             scale_invariant=scale_invariant,
             shift_invariant=shift_invariant,
         )

run.py

@@ -221,7 +221,7 @@
 
     pipe = pipe.to(device)
     logging.info(
-        f"{pipe.prediction_type = }, {pipe.scale_invariant = }, {pipe.shift_invariant = }"
+        f"scale_invariant: {pipe.scale_invariant}, shift_invariant: {pipe.shift_invariant}"
     )
 
     # -------------------- Inference and saving --------------------