rawforge 0.0.2__tar.gz → 0.1.0__tar.gz

{rawforge-0.0.2 → rawforge-0.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rawforge
-Version: 0.0.2
+Version: 0.1.0
 Summary: A compute backend/CLI application for using machine learning models on raw images.
 Author: Ryan Mueller
 License: MIT License

{rawforge-0.0.2 → rawforge-0.1.0}/RawForge/application/MODEL_REGISTRY.py

@@ -1,19 +1,23 @@
 MODEL_REGISTRY = {
     "TreeNetDenoise": {
         "url": "https://github.com/rymuelle/RawRefinery/releases/download/v1.2.1-alpha/ShadowWeightedL1.pt",
-        "filename": "ShadowWeightedL1.pt"
+        "filename": "ShadowWeightedL1.pt",
+        "max_iso": 65535,
     },
     "TreeNetDenoiseLight": {
         "url": "    https://github.com/rymuelle/RawRefinery/releases/download/v1.2.1-alpha/ShadowWeightedL1_light.pt",
-        "filename": "ShadowWeightedL1_light.pt"
+        "filename": "ShadowWeightedL1_light.pt",
+        "max_iso": 65535,
     },
     "TreeNetDenoiseSuperLight": {
         "url": "https://github.com/rymuelle/RawRefinery/releases/download/v1.2.1-alpha/ShadowWeightedL1_super_light.pt",
-        "filename": "ShadowWeightedL1_super_light.pt"
+        "filename": "ShadowWeightedL1_super_light.pt",
+        "max_iso": 65535,
     },
     "TreeNetDenoiseHeavy": {
         "url": "https://github.com/rymuelle/RawRefinery/releases/download/v1.2.1-alpha/ShadowWeightedL1_24_deep_500.pt",
-        "filename": "ShadowWeightedL1_24_deep_500.pt"
+        "filename": "ShadowWeightedL1_24_deep_500.pt",
+        "max_iso": 65535,
     },
     "Deblur": {
         "url": "https://github.com/rymuelle/RawRefinery/releases/download/v1.2.1-alpha/realblur_gamma_140.pt",
@@ -25,11 +29,6 @@ MODEL_REGISTRY = {
         "filename": "Deblur_deep_24.pt",
         "affine": True,
     },
-    "test_run_baseline.pt": {
-        "url": None,
-        "filename": "test_run_baseline.pt",
-        "affine": True,
-    },
     "TreeNetDenoiseXTrans": {
         "url": "https://github.com/rymuelle/RawForge/releases/download/xtrans_v1.0.0/xtrans_fixed_exposure_no_conditioning_400.pt",
         "filename": "xtrans_fixed_exposure_no_conditioning_400.pt",

{rawforge-0.0.2 → rawforge-0.1.0}/RawForge/application/ModelHandler.py

@@ -113,6 +113,10 @@ class ModelHandler():
         if not self.model or not self.rh:
             print("Model or Image not loaded.")
             return
+        
+        # Some older models were trained with a lower max iso
+        if "max_iso" in self.model_params:
+            conditioning[0] = min(conditioning[0], self.model_params["max_iso"])
 
         if 'backend' in self.model_params and self.model_params['backend'] == 'rawpy':
             worker = InferenceWorkerRawpy(self.model, self.model_params, self.device, self.rh, conditioning, dims, **inference_kwargs)

{rawforge-0.0.2 → rawforge-0.1.0}/RawForge/main.py

@@ -10,7 +10,7 @@ def main():
     parser.add_argument('model', type=str, help='The name of the model to use.')
     parser.add_argument('in_file', type=str, help='The name of the file to open.')
     parser.add_argument('out_file', type=str, help='The name of the file to save.')
-    parser.add_argument('--conditioning', type=str, help='Conditioning array to feed model.')
+    parser.add_argument('--conditioning', type=str, help='Conditioning array to feed model. Input string of numbers like so: 1,2,3')
     parser.add_argument('--dims', type=int, nargs=4, metavar=("x0", "x1", "y0", "y1"), help='Optional crop dimensions.')
 
     parser.add_argument('--cfa', action='store_true', help='Save the image as a CFA image (default: False).')
@@ -42,10 +42,13 @@ def main():
 
     if not args.conditioning:
         conditioning  = [iso, 0]
+    else: 
+        conditioning = [int(x) for x in args.conditioning.split(',')]
 
     if args.device:
         handler.set_device(args.device)
 
+
     inference_kwargs = {"disable_tqdm": args.disable_tqdm,
                         "tile_size": args.tile_size}
     img, denoised_image = handler.run_inference(conditioning=conditioning, dims=args.dims, inference_kwargs=inference_kwargs)

{rawforge-0.0.2 → rawforge-0.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rawforge" 
-version = "0.0.2"
+version = "0.1.0"
 description = "A compute backend/CLI application for using machine learning models on raw images."
 authors = [
     { name = "Ryan Mueller"},

{rawforge-0.0.2 → rawforge-0.1.0}/rawforge.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rawforge
-Version: 0.0.2
+Version: 0.1.0
 Summary: A compute backend/CLI application for using machine learning models on raw images.
 Author: Ryan Mueller
 License: MIT License