Merge pull request AUTOMATIC1111#883 from Mikubill/lvmin

better module
fjteam · Apr 18, 2023 · c05dd32 · c05dd32
2 parents ec956ed + 57b95a3
commit c05dd32
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 15 deletions.
diff --git a/annotator/clip/__init__.py b/annotator/clip/__init__.py
@@ -1,7 +1,7 @@
 from transformers import CLIPProcessor, CLIPVisionModel
 from modules import devices
 import os
-from ..annotator_path import models_path
+from annotator.annotator_path import models_path
 
 
 remote_model_path = "https://huggingface.co/openai/clip-vit-large-patch14/resolve/main/pytorch_model.bin"

diff --git a/annotator/hed/__init__.py b/annotator/hed/__init__.py
@@ -6,7 +6,7 @@
 
 import os 
 from modules import devices
-from ..annotator_path import models_path
+from annotator.annotator_path import models_path
 from annotator.util import safe_step, nms
 
 class Network(torch.nn.Module):

diff --git a/annotator/informative/__init__.py b/annotator/informative/__init__.py
@@ -6,7 +6,7 @@
 
 import os 
 from modules import devices
-from ..annotator_path import models_path
+from annotator.annotator_path import models_path
 
 class Network(torch.nn.Module):
     def __init__(self, model_path):

diff --git a/annotator/keypose/__init__.py b/annotator/keypose/__init__.py
@@ -4,7 +4,7 @@
 
 import os
 from modules import devices
-from ..annotator_path import models_path
+from annotator.annotator_path import models_path
 
 import mmcv
 from mmdet.apis import inference_detector, init_detector

diff --git a/annotator/leres/__init__.py b/annotator/leres/__init__.py
@@ -3,7 +3,7 @@
 import torch
 import os
 from modules import devices, shared
-from ..annotator_path import models_path
+from annotator.annotator_path import models_path
 from torchvision.transforms import transforms
 
 # AdelaiDepth/LeReS imports

diff --git a/annotator/lineart/__init__.py b/annotator/lineart/__init__.py
@@ -6,7 +6,7 @@
 import torch.nn as nn
 from einops import rearrange
 from modules import devices
-from ..annotator_path import models_path
+from annotator.annotator_path import models_path
 
 
 norm_layer = nn.InstanceNorm2d

diff --git a/annotator/lineart_anime/__init__.py b/annotator/lineart_anime/__init__.py
@@ -7,7 +7,7 @@
 import cv2
 from einops import rearrange
 from modules import devices
-from ..annotator_path import models_path
+from annotator.annotator_path import models_path
 
 
 class UnetGenerator(nn.Module):

diff --git a/annotator/midas/api.py b/annotator/midas/api.py
@@ -4,7 +4,7 @@
 import torch
 import torch.nn as nn
 import os
-from ..annotator_path import models_path
+from annotator.annotator_path import models_path
 
 from torchvision.transforms import Compose
 

diff --git a/annotator/mlsd/__init__.py b/annotator/mlsd/__init__.py
@@ -8,7 +8,7 @@
 from .models.mbv2_mlsd_large import  MobileV2_MLSD_Large
 from .utils import  pred_lines
 from modules import devices
-from ..annotator_path import models_path
+from annotator.annotator_path import models_path
 
 mlsdmodel = None
 remote_model_path = "https://huggingface.co/lllyasviel/ControlNet/resolve/main/annotator/ckpts/mlsd_large_512_fp32.pth"

diff --git a/annotator/normalbae/__init__.py b/annotator/normalbae/__init__.py
@@ -6,7 +6,7 @@
 from einops import rearrange
 from .models.NNET import NNET
 from modules import devices
-from ..annotator_path import models_path
+from annotator.annotator_path import models_path
 import torchvision.transforms as transforms
 
 

diff --git a/annotator/oneformer/__init__.py b/annotator/oneformer/__init__.py
@@ -1,6 +1,6 @@
 import os
 from modules import devices
-from ..annotator_path import models_path
+from annotator.annotator_path import models_path
 from .api import make_detectron2_model, semantic_run
 
 

diff --git a/annotator/openpose/__init__.py b/annotator/openpose/__init__.py
@@ -8,7 +8,7 @@
 from .hand import Hand
 from .face import Face
 from modules import devices
-from ..annotator_path import models_path
+from annotator.annotator_path import models_path
 
 body_model_path = "https://huggingface.co/lllyasviel/Annotators/resolve/main/body_pose_model.pth"
 hand_model_path = "https://huggingface.co/lllyasviel/Annotators/resolve/main/hand_pose_model.pth"

diff --git a/annotator/pidinet/__init__.py b/annotator/pidinet/__init__.py
@@ -5,7 +5,7 @@
 from annotator.pidinet.model import pidinet
 from annotator.util import safe_step
 from modules import devices
-from ..annotator_path import models_path
+from annotator.annotator_path import models_path
 from scripts.utils import load_state_dict
 
 netNetwork = None

diff --git a/annotator/uniformer/__init__.py b/annotator/uniformer/__init__.py
@@ -1,5 +1,5 @@
 import os
-from ..annotator_path import models_path
+from annotator.annotator_path import models_path
 from modules import devices
 from annotator.uniformer.inference import init_segmentor, inference_segmentor, show_result_pyplot
 

diff --git a/annotator/zoe/__init__.py b/annotator/zoe/__init__.py
@@ -7,7 +7,7 @@
 from .zoedepth.models.zoedepth.zoedepth_v1 import ZoeDepth
 from .zoedepth.utils.config import get_config
 from modules import devices
-from ..annotator_path import models_path
+from annotator.annotator_path import models_path
 
 
 class ZoeDetector: