Align ColorMNet pipeline with training normalization

This commit is contained in:
jonstreeter
2025-11-21 08:53:02 -06:00
parent 85d6ba07e2
commit 644680e9df
7 changed files with 283 additions and 361 deletions
+38 -19
View File
@@ -14,17 +14,30 @@ __version__ = "2.0.0"
__author__ = "ComfyUI Deep Exemplar Contributors"
__license__ = "MIT"
import sys
import subprocess
import importlib
from pathlib import Path
# Add current directory to Python path so submodules can be imported
current_dir = Path(__file__).parent
if str(current_dir) not in sys.path:
sys.path.insert(0, str(current_dir))
print("[ColorMNet] Initializing...")
import sys
import subprocess
import importlib
from pathlib import Path
# Add current directory to Python path so submodules can be imported
current_dir = Path(__file__).parent
if str(current_dir) not in sys.path:
sys.path.insert(0, str(current_dir))
# Import after path is set so relative modules always resolve
from .colormnet.downloader import ensure_dependencies as ensure_git_dependencies
# Backward compatibility: older revisions imported the upstream code as `model.network`
# We vendor that code under `colormnet_model`, so alias it early to avoid ModuleNotFoundError
try:
import colormnet_model
if "model" not in sys.modules:
sys.modules["model"] = colormnet_model
except Exception as alias_error:
print(f"[ColorMNet] WARNING: Couldn't register compatibility alias for 'model': {alias_error}")
print("[ColorMNet] Initializing...")
# Check and install dependencies automatically
def check_and_install_dependencies():
@@ -78,14 +91,20 @@ def check_git_dependencies():
print(f"[ColorMNet] These will be auto-installed on first model run if needed")
return missing
# Auto-install dependencies
try:
check_and_install_dependencies()
missing_git_deps = check_git_dependencies()
except Exception as e:
print(f"[ColorMNet] WARNING: Error checking dependencies: {e}")
missing_git_deps = []
# Auto-install dependencies
try:
check_and_install_dependencies()
try:
# Install git-based deps (py-thin-plate-spline, Pytorch-Correlation-extension) on startup
ensure_git_dependencies()
missing_git_deps = []
except Exception as git_err:
print(f"[ColorMNet] WARNING: Git dependency check failed: {git_err}")
missing_git_deps = ["py-thin-plate-spline", "Pytorch-Correlation-extension"]
except Exception as e:
print(f"[ColorMNet] WARNING: Error checking dependencies: {e}")
missing_git_deps = []
# Import nodes
try: