From f74b6fdf50fb8186ad32e798c436e33355e49f72 Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Thu, 22 Aug 2024 17:18:46 -0700 Subject: [PATCH 1/4] Add matplotlib --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index dafcf42..f1244fb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,3 +22,4 @@ yacs trimesh[easy] albumentations scikit-learn +matplotlib From 2bd304179f77e3b1b45385978bf5c40793f9fd7e Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Thu, 22 Aug 2024 17:21:19 -0700 Subject: [PATCH 2/4] Add matplotlib --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5036906..0d74820 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ name = "comfyui_controlnet_aux" description = "Plug-and-play ComfyUI node sets for making ControlNet hint images" version = "1.0.4-alpha.4" license = "LICENSE" -dependencies = ["torch", "importlib_metadata", "huggingface_hub", "scipy", "opencv-python>=4.7.0.72", "filelock", "numpy", "Pillow", "einops", "torchvision", "pyyaml", "scikit-image", "python-dateutil", "mediapipe", "svglib", "fvcore", "yapf", "omegaconf", "ftfy", "addict", "yacs", "trimesh[easy]", "albumentations", "scikit-learn"] +dependencies = ["torch", "importlib_metadata", "huggingface_hub", "scipy", "opencv-python>=4.7.0.72", "filelock", "numpy", "Pillow", "einops", "torchvision", "pyyaml", "scikit-image", "python-dateutil", "mediapipe", "svglib", "fvcore", "yapf", "omegaconf", "ftfy", "addict", "yacs", "trimesh[easy]", "albumentations", "scikit-learn", "matplotlib"] [project.urls] Repository = "https://github.com/Fannovel16/comfyui_controlnet_aux" From 6739fb1dd732eca5eb7e4a1c9b3412c523b5b5b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=2ED=2ET=C3=A0i?= Date: Wed, 28 Aug 2024 21:54:57 +0700 Subject: [PATCH 3/4] Update version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0d74820..563fed5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "comfyui_controlnet_aux" description = "Plug-and-play ComfyUI node sets for making ControlNet hint images" -version = "1.0.4-alpha.4" +version = "1.0.4-alpha.5" license = "LICENSE" dependencies = ["torch", "importlib_metadata", "huggingface_hub", "scipy", "opencv-python>=4.7.0.72", "filelock", "numpy", "Pillow", "einops", "torchvision", "pyyaml", "scikit-image", "python-dateutil", "mediapipe", "svglib", "fvcore", "yapf", "omegaconf", "ftfy", "addict", "yacs", "trimesh[easy]", "albumentations", "scikit-learn", "matplotlib"] From 2a33cdca572a16bb95246b71d281e4d0e5780ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=2ED=2ET=C3=A0i?= Date: Wed, 28 Aug 2024 21:56:53 +0700 Subject: [PATCH 4/4] Replace timm with custom_timm --- .../metric3d/mono/model/backbones/ConvNeXt.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/custom_controlnet_aux/metric3d/mono/model/backbones/ConvNeXt.py b/src/custom_controlnet_aux/metric3d/mono/model/backbones/ConvNeXt.py index f1c4be0..118f629 100644 --- a/src/custom_controlnet_aux/metric3d/mono/model/backbones/ConvNeXt.py +++ b/src/custom_controlnet_aux/metric3d/mono/model/backbones/ConvNeXt.py @@ -1,8 +1,8 @@ import torch import torch.nn as nn import torch.nn.functional as F -from timm.models.layers import trunc_normal_, DropPath -from timm.models.registry import register_model +from custom_timm.models.layers import trunc_normal_, DropPath +from custom_timm.models.registry import register_model class Block(nn.Module): r""" ConvNeXt Block. There are two equivalent implementations: