fix EVF-SAMUltra moudle name

chflame163 · Aug 29, 2024 · 5218591 · 5218591
1 parent 2c5c515
commit 5218591
Show file tree

Hide file tree

Showing 75 changed files with 5 additions and 5 deletions.
diff --git a/py/evf_sam/evf_sam_inference.py b/py/evf_sam/evf_sam_inference.py
@@ -8,7 +8,7 @@
 from torchvision import transforms
 from torchvision.transforms.functional import InterpolationMode
 from transformers import AutoTokenizer, BitsAndBytesConfig
-from .model.segment_anything.utils.transforms import ResizeLongestSide
+from evf_sam_model.segment_anything.utils.transforms import ResizeLongestSide
 
 def sam_preprocess(
     x: np.ndarray,
@@ -93,17 +93,17 @@ def init_models(model_path:str, model_type:str, precision:str, load_in_bit:int=1
         )
 
     if model_type=="ori":
-        from model.evf_sam import EvfSamModel
+        from evf_sam_model.evf_sam import EvfSamModel
         model = EvfSamModel.from_pretrained(
             model_path, low_cpu_mem_usage=True, **kwargs
         )
     elif model_type=="effi":
-        from model.evf_effisam import EvfEffiSamModel
+        from evf_sam_model.evf_effisam import EvfEffiSamModel
         model = EvfEffiSamModel.from_pretrained(
             model_path, low_cpu_mem_usage=True, **kwargs
         )
     elif model_type=="sam2":
-        from model.evf_sam2 import EvfSam2Model
+        from evf_sam_model.evf_sam2 import EvfSam2Model
         model = EvfSam2Model.from_pretrained(
             model_path, low_cpu_mem_usage=True, **kwargs
         )

diff --git a/...el/EfficientSAM/efficient_sam/__init__.py → ...el/EfficientSAM/efficient_sam/__init__.py b/...el/EfficientSAM/efficient_sam/__init__.py → ...el/EfficientSAM/efficient_sam/__init__.py
diff --git a/...tSAM/efficient_sam/build_efficient_sam.py → ...tSAM/efficient_sam/build_efficient_sam.py b/...tSAM/efficient_sam/build_efficient_sam.py → ...tSAM/efficient_sam/build_efficient_sam.py
diff --git a/...ficientSAM/efficient_sam/efficient_sam.py → ...ficientSAM/efficient_sam/efficient_sam.py b/...ficientSAM/efficient_sam/efficient_sam.py → ...ficientSAM/efficient_sam/efficient_sam.py
diff --git a/...AM/efficient_sam/efficient_sam_decoder.py → ...AM/efficient_sam/efficient_sam_decoder.py b/...AM/efficient_sam/efficient_sam_decoder.py → ...AM/efficient_sam/efficient_sam_decoder.py
diff --git a/...AM/efficient_sam/efficient_sam_encoder.py → ...AM/efficient_sam/efficient_sam_encoder.py b/...AM/efficient_sam/efficient_sam_encoder.py → ...AM/efficient_sam/efficient_sam_encoder.py
diff --git a/...m/model/EfficientSAM/efficient_sam/mlp.py → ...m_model/EfficientSAM/efficient_sam/mlp.py b/...m/model/EfficientSAM/efficient_sam/mlp.py → ...m_model/EfficientSAM/efficient_sam/mlp.py
diff --git a/...tSAM/efficient_sam/two_way_transformer.py → ...tSAM/efficient_sam/two_way_transformer.py b/...tSAM/efficient_sam/two_way_transformer.py → ...tSAM/efficient_sam/two_way_transformer.py
diff --git a/py/evf_sam/model/configuration_evf.py → ...vf_sam/evf_sam_model/configuration_evf.py b/py/evf_sam/model/configuration_evf.py → ...vf_sam/evf_sam_model/configuration_evf.py
diff --git a/py/evf_sam/model/evf_effisam.py → py/evf_sam/evf_sam_model/evf_effisam.py b/py/evf_sam/model/evf_effisam.py → py/evf_sam/evf_sam_model/evf_effisam.py
diff --git a/py/evf_sam/model/evf_sam.py → py/evf_sam/evf_sam_model/evf_sam.py b/py/evf_sam/model/evf_sam.py → py/evf_sam/evf_sam_model/evf_sam.py
diff --git a/py/evf_sam/model/evf_sam2.py → py/evf_sam/evf_sam_model/evf_sam2.py b/py/evf_sam/model/evf_sam2.py → py/evf_sam/evf_sam_model/evf_sam2.py
diff --git a/py/evf_sam/model/evf_sam2_video.py → py/evf_sam/evf_sam_model/evf_sam2_video.py b/py/evf_sam/model/evf_sam2_video.py → py/evf_sam/evf_sam_model/evf_sam2_video.py
diff --git a/...vf_sam/model/segment_anything/__init__.py → ...vf_sam_model/segment_anything/__init__.py b/...vf_sam/model/segment_anything/__init__.py → ...vf_sam_model/segment_anything/__init__.py
diff --git a/...ment_anything/automatic_mask_generator.py → ...ment_anything/automatic_mask_generator.py b/...ment_anything/automatic_mask_generator.py → ...ment_anything/automatic_mask_generator.py
diff --git a/...f_sam/model/segment_anything/build_sam.py → ...f_sam_model/segment_anything/build_sam.py b/...f_sam/model/segment_anything/build_sam.py → ...f_sam_model/segment_anything/build_sam.py
diff --git a/...del/segment_anything/modeling/__init__.py → ...del/segment_anything/modeling/__init__.py b/...del/segment_anything/modeling/__init__.py → ...del/segment_anything/modeling/__init__.py
diff --git a/...model/segment_anything/modeling/common.py → ...model/segment_anything/modeling/common.py b/...model/segment_anything/modeling/common.py → ...model/segment_anything/modeling/common.py
diff --git a/...egment_anything/modeling/image_encoder.py → ...egment_anything/modeling/image_encoder.py b/...egment_anything/modeling/image_encoder.py → ...egment_anything/modeling/image_encoder.py
diff --git a/...segment_anything/modeling/mask_decoder.py → ...segment_anything/modeling/mask_decoder.py b/...segment_anything/modeling/mask_decoder.py → ...segment_anything/modeling/mask_decoder.py
diff --git a/...gment_anything/modeling/prompt_encoder.py → ...gment_anything/modeling/prompt_encoder.py b/...gment_anything/modeling/prompt_encoder.py → ...gment_anything/modeling/prompt_encoder.py
diff --git a/...am/model/segment_anything/modeling/sam.py → ...am_model/segment_anything/modeling/sam.py b/...am/model/segment_anything/modeling/sam.py → ...am_model/segment_anything/modeling/sam.py
diff --git a/.../segment_anything/modeling/transformer.py → .../segment_anything/modeling/transformer.py b/.../segment_anything/modeling/transformer.py → .../segment_anything/modeling/transformer.py
diff --git a/...f_sam/model/segment_anything/predictor.py → ...f_sam_model/segment_anything/predictor.py b/...f_sam/model/segment_anything/predictor.py → ...f_sam_model/segment_anything/predictor.py
diff --git a/.../model/segment_anything/utils/__init__.py → ..._model/segment_anything/utils/__init__.py b/.../model/segment_anything/utils/__init__.py → ..._model/segment_anything/utils/__init__.py
diff --git a/...f_sam/model/segment_anything/utils/amg.py → ...f_sam_model/segment_anything/utils/amg.py b/...f_sam/model/segment_anything/utils/amg.py → ...f_sam_model/segment_anything/utils/amg.py
diff --git a/..._sam/model/segment_anything/utils/onnx.py → ..._sam_model/segment_anything/utils/onnx.py b/..._sam/model/segment_anything/utils/onnx.py → ..._sam_model/segment_anything/utils/onnx.py
diff --git a/...odel/segment_anything/utils/transforms.py → ...odel/segment_anything/utils/transforms.py b/...odel/segment_anything/utils/transforms.py → ...odel/segment_anything/utils/transforms.py
diff --git a/...model/segment_anything_2/sam2/__init__.py → ...model/segment_anything_2/sam2/__init__.py b/...model/segment_anything_2/sam2/__init__.py → ...model/segment_anything_2/sam2/__init__.py
diff --git a/...ything_2/sam2/automatic_mask_generator.py → ...ything_2/sam2/automatic_mask_generator.py b/...ything_2/sam2/automatic_mask_generator.py → ...ything_2/sam2/automatic_mask_generator.py
diff --git a/...odel/segment_anything_2/sam2/build_sam.py → ...odel/segment_anything_2/sam2/build_sam.py b/...odel/segment_anything_2/sam2/build_sam.py → ...odel/segment_anything_2/sam2/build_sam.py
diff --git a/...thing_2/sam2/csrc/connected_components.cu → ...thing_2/sam2/csrc/connected_components.cu b/...thing_2/sam2/csrc/connected_components.cu → ...thing_2/sam2/csrc/connected_components.cu
diff --git a/...ment_anything_2/sam2/modeling/__init__.py → ...ment_anything_2/sam2/modeling/__init__.py b/...ment_anything_2/sam2/modeling/__init__.py → ...ment_anything_2/sam2/modeling/__init__.py
diff --git a/...ing_2/sam2/modeling/backbones/__init__.py → ...ing_2/sam2/modeling/backbones/__init__.py b/...ing_2/sam2/modeling/backbones/__init__.py → ...ing_2/sam2/modeling/backbones/__init__.py
diff --git a/...ing_2/sam2/modeling/backbones/hieradet.py → ...ing_2/sam2/modeling/backbones/hieradet.py b/...ing_2/sam2/modeling/backbones/hieradet.py → ...ing_2/sam2/modeling/backbones/hieradet.py
diff --git a/.../sam2/modeling/backbones/image_encoder.py → .../sam2/modeling/backbones/image_encoder.py b/.../sam2/modeling/backbones/image_encoder.py → .../sam2/modeling/backbones/image_encoder.py
diff --git a/...ything_2/sam2/modeling/backbones/utils.py → ...ything_2/sam2/modeling/backbones/utils.py b/...ything_2/sam2/modeling/backbones/utils.py → ...ything_2/sam2/modeling/backbones/utils.py
diff --git a/...thing_2/sam2/modeling/memory_attention.py → ...thing_2/sam2/modeling/memory_attention.py b/...thing_2/sam2/modeling/memory_attention.py → ...thing_2/sam2/modeling/memory_attention.py
diff --git a/...nything_2/sam2/modeling/memory_encoder.py → ...nything_2/sam2/modeling/memory_encoder.py b/...nything_2/sam2/modeling/memory_encoder.py → ...nything_2/sam2/modeling/memory_encoder.py
diff --git a/...hing_2/sam2/modeling/position_encoding.py → ...hing_2/sam2/modeling/position_encoding.py b/...hing_2/sam2/modeling/position_encoding.py → ...hing_2/sam2/modeling/position_encoding.py
diff --git a/..._anything_2/sam2/modeling/sam/__init__.py → ..._anything_2/sam2/modeling/sam/__init__.py b/..._anything_2/sam2/modeling/sam/__init__.py → ..._anything_2/sam2/modeling/sam/__init__.py
diff --git a/...thing_2/sam2/modeling/sam/mask_decoder.py → ...thing_2/sam2/modeling/sam/mask_decoder.py b/...thing_2/sam2/modeling/sam/mask_decoder.py → ...thing_2/sam2/modeling/sam/mask_decoder.py
diff --git a/...ing_2/sam2/modeling/sam/prompt_encoder.py → ...ing_2/sam2/modeling/sam/prompt_encoder.py b/...ing_2/sam2/modeling/sam/prompt_encoder.py → ...ing_2/sam2/modeling/sam/prompt_encoder.py
diff --git a/...ything_2/sam2/modeling/sam/transformer.py → ...ything_2/sam2/modeling/sam/transformer.py b/...ything_2/sam2/modeling/sam/transformer.py → ...ything_2/sam2/modeling/sam/transformer.py
diff --git a/...ent_anything_2/sam2/modeling/sam2_base.py → ...ent_anything_2/sam2/modeling/sam2_base.py b/...ent_anything_2/sam2/modeling/sam2_base.py → ...ent_anything_2/sam2/modeling/sam2_base.py
diff --git a/...nt_anything_2/sam2/modeling/sam2_utils.py → ...nt_anything_2/sam2/modeling/sam2_utils.py b/...nt_anything_2/sam2/modeling/sam2_utils.py → ...nt_anything_2/sam2/modeling/sam2_utils.py
diff --git a/...t_anything_2/sam2/sam2_image_predictor.py → ...t_anything_2/sam2/sam2_image_predictor.py b/...t_anything_2/sam2/sam2_image_predictor.py → ...t_anything_2/sam2/sam2_image_predictor.py
diff --git a/...t_anything_2/sam2/sam2_video_predictor.py → ...t_anything_2/sam2/sam2_video_predictor.py b/...t_anything_2/sam2/sam2_video_predictor.py → ...t_anything_2/sam2/sam2_video_predictor.py
diff --git a/...segment_anything_2/sam2/utils/__init__.py → ...segment_anything_2/sam2/utils/__init__.py b/...segment_anything_2/sam2/utils/__init__.py → ...segment_anything_2/sam2/utils/__init__.py
diff --git a/...odel/segment_anything_2/sam2/utils/amg.py → ...odel/segment_anything_2/sam2/utils/amg.py b/...odel/segment_anything_2/sam2/utils/amg.py → ...odel/segment_anything_2/sam2/utils/amg.py
diff --git a/...del/segment_anything_2/sam2/utils/misc.py → ...del/segment_anything_2/sam2/utils/misc.py b/...del/segment_anything_2/sam2/utils/misc.py → ...del/segment_anything_2/sam2/utils/misc.py
diff --git a/...gment_anything_2/sam2/utils/transforms.py → ...gment_anything_2/sam2/utils/transforms.py b/...gment_anything_2/sam2/utils/transforms.py → ...gment_anything_2/sam2/utils/transforms.py
diff --git a/...gment_anything_2/sam2_configs/__init__.py → ...gment_anything_2/sam2_configs/__init__.py b/...gment_anything_2/sam2_configs/__init__.py → ...gment_anything_2/sam2_configs/__init__.py
diff --git a/...nything_2/sam2_configs/sam2_hiera_b+.yaml → ...nything_2/sam2_configs/sam2_hiera_b+.yaml b/...nything_2/sam2_configs/sam2_hiera_b+.yaml → ...nything_2/sam2_configs/sam2_hiera_b+.yaml
diff --git a/...anything_2/sam2_configs/sam2_hiera_l.yaml → ...anything_2/sam2_configs/sam2_hiera_l.yaml b/...anything_2/sam2_configs/sam2_hiera_l.yaml → ...anything_2/sam2_configs/sam2_hiera_l.yaml
diff --git a/...anything_2/sam2_configs/sam2_hiera_s.yaml → ...anything_2/sam2_configs/sam2_hiera_s.yaml b/...anything_2/sam2_configs/sam2_hiera_s.yaml → ...anything_2/sam2_configs/sam2_hiera_s.yaml
diff --git a/...anything_2/sam2_configs/sam2_hiera_t.yaml → ...anything_2/sam2_configs/sam2_hiera_t.yaml b/...anything_2/sam2_configs/sam2_hiera_t.yaml → ...anything_2/sam2_configs/sam2_hiera_t.yaml
diff --git a/py/evf_sam/model/segment_anything_2/setup.py → ...evf_sam_model/segment_anything_2/setup.py b/py/evf_sam/model/segment_anything_2/setup.py → ...evf_sam_model/segment_anything_2/setup.py
diff --git a/py/evf_sam/model/unilm/beit3/README.md → ...f_sam/evf_sam_model/unilm/beit3/README.md b/py/evf_sam/model/unilm/beit3/README.md → ...f_sam/evf_sam_model/unilm/beit3/README.md
diff --git a/py/evf_sam/model/unilm/beit3/datasets.py → ...sam/evf_sam_model/unilm/beit3/datasets.py b/py/evf_sam/model/unilm/beit3/datasets.py → ...sam/evf_sam_model/unilm/beit3/datasets.py
diff --git a/...odel/unilm/beit3/engine_for_finetuning.py → ...odel/unilm/beit3/engine_for_finetuning.py b/...odel/unilm/beit3/engine_for_finetuning.py → ...odel/unilm/beit3/engine_for_finetuning.py
diff --git a/...get_started/get_started_for_captioning.md → ...get_started/get_started_for_captioning.md b/...get_started/get_started_for_captioning.md → ...get_started/get_started_for_captioning.md
diff --git a/...d/get_started_for_image_classification.md → ...d/get_started_for_image_classification.md b/...d/get_started_for_image_classification.md → ...d/get_started_for_image_classification.md
diff --git a/...eit3/get_started/get_started_for_nlvr2.md → ...eit3/get_started/get_started_for_nlvr2.md b/...eit3/get_started/get_started_for_nlvr2.md → ...eit3/get_started/get_started_for_nlvr2.md
diff --git a/.../get_started/get_started_for_retrieval.md → .../get_started/get_started_for_retrieval.md b/.../get_started/get_started_for_retrieval.md → .../get_started/get_started_for_retrieval.md
diff --git a/...eit3/get_started/get_started_for_vqav2.md → ...eit3/get_started/get_started_for_vqav2.md b/...eit3/get_started/get_started_for_vqav2.md → ...eit3/get_started/get_started_for_vqav2.md
diff --git a/py/evf_sam/model/unilm/beit3/glossary.py → ...sam/evf_sam_model/unilm/beit3/glossary.py b/py/evf_sam/model/unilm/beit3/glossary.py → ...sam/evf_sam_model/unilm/beit3/glossary.py
diff --git a/...am/model/unilm/beit3/modeling_finetune.py → ...am_model/unilm/beit3/modeling_finetune.py b/...am/model/unilm/beit3/modeling_finetune.py → ...am_model/unilm/beit3/modeling_finetune.py
diff --git a/...f_sam/model/unilm/beit3/modeling_utils.py → ...f_sam_model/unilm/beit3/modeling_utils.py b/...f_sam/model/unilm/beit3/modeling_utils.py → ...f_sam_model/unilm/beit3/modeling_utils.py
diff --git a/...vf_sam/model/unilm/beit3/optim_factory.py → ...vf_sam_model/unilm/beit3/optim_factory.py b/...vf_sam/model/unilm/beit3/optim_factory.py → ...vf_sam_model/unilm/beit3/optim_factory.py
diff --git a/py/evf_sam/model/unilm/beit3/randaug.py → ..._sam/evf_sam_model/unilm/beit3/randaug.py b/py/evf_sam/model/unilm/beit3/randaug.py → ..._sam/evf_sam_model/unilm/beit3/randaug.py
diff --git a/...vf_sam/model/unilm/beit3/requirements.txt → ...vf_sam_model/unilm/beit3/requirements.txt b/...vf_sam/model/unilm/beit3/requirements.txt → ...vf_sam_model/unilm/beit3/requirements.txt
diff --git a/...model/unilm/beit3/run_beit3_finetuning.py → ...model/unilm/beit3/run_beit3_finetuning.py b/...model/unilm/beit3/run_beit3_finetuning.py → ...model/unilm/beit3/run_beit3_finetuning.py
diff --git a/py/evf_sam/model/unilm/beit3/utils.py → ...vf_sam/evf_sam_model/unilm/beit3/utils.py b/py/evf_sam/model/unilm/beit3/utils.py → ...vf_sam/evf_sam_model/unilm/beit3/utils.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "comfyui_layerstyle"
 description = "A set of nodes for ComfyUI it generate image like Adobe Photoshop's Layer Style. the Drop Shadow is first completed node, and follow-up work is in progress."
-version = "1.0.35"
+version = "1.0.36"
 license = "MIT"
 dependencies = ["numpy", "pillow", "torch", "matplotlib", "Scipy", "scikit_image", "opencv-contrib-python", "pymatting", "segment_anything", "timm", "addict", "yapf", "colour-science", "wget", "mediapipe", "loguru", "typer_config", "fastapi", "rich", "google-generativeai", "diffusers", "omegaconf", "tqdm", "transformers", "kornia", "image-reward", "ultralytics", "blend_modes", "blind-watermark", "qrcode", "pyzbar", "transparent-background", "huggingface_hub", "accelerate", "bitsandbytes", "torchscale", "wandb", "hydra-core", "psd-tools"]