Eliminate jsonmerge dependency

k_diffusion/config.py

@@ -3,11 +3,19 @@
 import math
 import warnings
 
-from jsonmerge import merge
-
 from . import augmentation, layers, models, utils
 
 
+def merge_config(defaults, config):
+    result = {**defaults}
+    for key, value in config.items():
+        if isinstance(value, dict):
+            result[key] = merge_config(result.get(key, {}), value)
+        else:
+            result[key] = value
+    return result
+
+
 def load_config(file):
     defaults = {
         'model': {
@@ -44,7 +52,7 @@ def load_config(file):
         },
     }
     config = json.load(file)
-    return merge(defaults, config)
+    return merge_config(defaults, config)
 
 
 def make_model(config):

requirements.txt

@@ -2,7 +2,6 @@ accelerate
 clean-fid
 clip-anytorch
 einops
-jsonmerge
 kornia
 Pillow
 resize-right

setup.cfg

@@ -16,7 +16,6 @@ install_requires =
     clean-fid
     clip-anytorch
     einops
-    jsonmerge
     kornia
     Pillow
     resize-right