Remove editor module

src/histogram_transfer/apply_histogram.py

@@ -1,4 +1,4 @@
-from editor.histogram_transfer import pdf_transfer_3d
+from histogram_transfer import pdf_transfer_3d
 import numpy as np
 from scipy.ndimage import zoom
 

src/histogram_transfer/pdf_transfer_3d.py

@@ -1,7 +1,7 @@
 import numpy as np
-from editor.utils import generate_rotation_matrices
+from utils import generate_rotation_matrices
-from editor.histogram_transfer import pdf_transfer_1d
+from histogram_transfer import pdf_transfer_1d
-from editor.histogram_transfer import regrain
+from histogram_transfer import regrain
 
 
 EPSILON = 1e-6

src/operations/add_random_colour_spill.py

@@ -1,5 +1,5 @@
 from PIL import Image
-from ..utils import random
+from utils import random
 
 
 def add_random_colour_spill(image: Image, range: float) -> Image:

src/operations/get_colour_lut.ipynb

@@ -22,7 +22,7 @@
     "\n",
     "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
-    "from editor.operations import get_random_saturation_per_hue_lut\n",
+    "from operations import get_random_saturation_per_hue_lut\n",
     "\n",
     "\n",
     "plt.figure(figsize=(5, 3))\n",
@@ -54,7 +54,7 @@
     }
    ],
    "source": [
-    "from editor.operations import get_random_brightness_lut\n",
+    "from operations import get_random_brightness_lut\n",
     "\n",
     "\n",
     "plt.figure(figsize=(5, 3))\n",

src/operations/get_colour_lut.py

@@ -1,6 +1,6 @@
 import numpy as np
 from typing import List
-from ..utils.random import random
+from utils.random import random
 from .interpolate import interpolate, INTERPOLATION_TYPE
 
 

src/training/histogram_dataset.py

@@ -1,6 +1,6 @@
 from torch.utils.data import Dataset
 from typing import List, Optional, Tuple
-from editor.utils import compute_histogram
+from utils import compute_histogram
 from .random_edit import random_edit
 from PIL import Image
 from tqdm import tqdm
@@ -16,9 +16,10 @@ PIL.Image.MAX_IMAGE_PIXELS = None
 class HistogramDataset(Dataset):
     def __init__(
         self,
+        /,
         paths: List[Path],
+        bin_count: int,
         edit_count: int = 5,
-        bin_count: int = 32,
         target_size=(240, 240),
         delete_corrupt_images: bool = False,
         cache_path: Optional[Path] = None,

src/training/random_edit.py

@@ -1,6 +1,6 @@
 from PIL import Image, ImageEnhance
-from ..utils import random
+from utils import random
-from ..operations import (
+from operations import (
     add_noise,
     add_random_colour_spill,
     get_random_gamma,