From d6c576ae1d3c70de2ea0bb940957215b43565e55 Mon Sep 17 00:00:00 2001 From: chflame163 Date: Thu, 26 Sep 2024 14:07:37 +0800 Subject: [PATCH] rename py/BiRefNet to py/BiRefNet_v2, for avoid module name conflicts --- py/BiRefNet/.gitignore | 142 ------------------ py/{BiRefNet => BiRefNet_v2}/LICENSE | 0 py/{BiRefNet => BiRefNet_v2}/README.md | 0 py/{BiRefNet => BiRefNet_v2}/__init__.py | 0 py/{BiRefNet => BiRefNet_v2}/config.py | 0 py/{BiRefNet => BiRefNet_v2}/dataset.py | 6 +- .../eval_existingOnes.py | 4 +- .../evaluation/metrics.py | 0 py/{BiRefNet => BiRefNet_v2}/gen_best_ep.py | 2 +- py/{BiRefNet => BiRefNet_v2}/image_proc.py | 0 py/{BiRefNet => BiRefNet_v2}/inference.py | 8 +- py/{BiRefNet => BiRefNet_v2}/loss.py | 2 +- py/{BiRefNet => BiRefNet_v2}/make_a_copy.sh | 0 .../models/backbones/build_backbone.py | 6 +- .../models/backbones/pvt_v2.py | 2 +- .../models/backbones/swin_v1.py | 2 +- .../models/birefnet.py | 16 +- .../models/modules/aspp.py | 4 +- .../models/modules/decoder_blocks.py | 4 +- .../models/modules/deform_conv.py | 0 .../models/modules/lateral_blocks.py | 2 +- .../models/modules/mlp.py | 0 .../models/modules/prompt_encoder.py | 0 .../models/modules/utils.py | 0 .../models/refinement/refiner.py | 12 +- .../models/refinement/stem_layer.py | 2 +- py/{BiRefNet => BiRefNet_v2}/requirements.txt | 0 py/{BiRefNet => BiRefNet_v2}/rm_cache.sh | 0 py/{BiRefNet => BiRefNet_v2}/sub.sh | 0 py/{BiRefNet => BiRefNet_v2}/test.sh | 0 py/{BiRefNet => BiRefNet_v2}/train.py | 10 +- py/{BiRefNet => BiRefNet_v2}/train.sh | 0 py/{BiRefNet => BiRefNet_v2}/train_test.sh | 0 .../tutorials/BiRefNet_inference.ipynb | 0 .../tutorials/BiRefNet_pth2onnx.ipynb | 0 py/{BiRefNet => BiRefNet_v2}/utils.py | 0 py/birefnet_ultra_v2.py | 7 +- pyproject.toml | 2 +- 38 files changed, 46 insertions(+), 187 deletions(-) delete mode 100644 py/BiRefNet/.gitignore rename py/{BiRefNet => BiRefNet_v2}/LICENSE (100%) rename py/{BiRefNet => BiRefNet_v2}/README.md (100%) rename py/{BiRefNet => BiRefNet_v2}/__init__.py (100%) rename py/{BiRefNet => BiRefNet_v2}/config.py (100%) rename py/{BiRefNet => BiRefNet_v2}/dataset.py (98%) rename py/{BiRefNet => BiRefNet_v2}/eval_existingOnes.py (98%) rename py/{BiRefNet => BiRefNet_v2}/evaluation/metrics.py (100%) rename py/{BiRefNet => BiRefNet_v2}/gen_best_ep.py (99%) rename py/{BiRefNet => BiRefNet_v2}/image_proc.py (100%) rename py/{BiRefNet => BiRefNet_v2}/inference.py (95%) rename py/{BiRefNet => BiRefNet_v2}/loss.py (99%) rename py/{BiRefNet => BiRefNet_v2}/make_a_copy.sh (100%) rename py/{BiRefNet => BiRefNet_v2}/models/backbones/build_backbone.py (91%) rename py/{BiRefNet => BiRefNet_v2}/models/backbones/pvt_v2.py (99%) rename py/{BiRefNet => BiRefNet_v2}/models/backbones/swin_v1.py (99%) rename py/{BiRefNet => BiRefNet_v2}/models/birefnet.py (96%) rename py/{BiRefNet => BiRefNet_v2}/models/modules/aspp.py (98%) rename py/{BiRefNet => BiRefNet_v2}/models/modules/decoder_blocks.py (96%) rename py/{BiRefNet => BiRefNet_v2}/models/modules/deform_conv.py (100%) rename py/{BiRefNet => BiRefNet_v2}/models/modules/lateral_blocks.py (93%) rename py/{BiRefNet => BiRefNet_v2}/models/modules/mlp.py (100%) rename py/{BiRefNet => BiRefNet_v2}/models/modules/prompt_encoder.py (100%) rename py/{BiRefNet => BiRefNet_v2}/models/modules/utils.py (100%) rename py/{BiRefNet => BiRefNet_v2}/models/refinement/refiner.py (95%) rename py/{BiRefNet => BiRefNet_v2}/models/refinement/stem_layer.py (94%) rename py/{BiRefNet => BiRefNet_v2}/requirements.txt (100%) rename py/{BiRefNet => BiRefNet_v2}/rm_cache.sh (100%) rename py/{BiRefNet => BiRefNet_v2}/sub.sh (100%) rename py/{BiRefNet => BiRefNet_v2}/test.sh (100%) rename py/{BiRefNet => BiRefNet_v2}/train.py (98%) rename py/{BiRefNet => BiRefNet_v2}/train.sh (100%) rename py/{BiRefNet => BiRefNet_v2}/train_test.sh (100%) rename py/{BiRefNet => BiRefNet_v2}/tutorials/BiRefNet_inference.ipynb (100%) rename py/{BiRefNet => BiRefNet_v2}/tutorials/BiRefNet_pth2onnx.ipynb (100%) rename py/{BiRefNet => BiRefNet_v2}/utils.py (100%) diff --git a/py/BiRefNet/.gitignore b/py/BiRefNet/.gitignore deleted file mode 100644 index af0deec..0000000 --- a/py/BiRefNet/.gitignore +++ /dev/null @@ -1,142 +0,0 @@ -# Custom -e_* -.vscode -ckpt -preds -evaluation/eval-* -nohup.out* -tmp* -*.pth -core-*-python-* -.DS_Store -__MACOSX/ - -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -pip-wheel-metadata/ -share/python-wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.nox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ -.pytest_cache/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 -db.sqlite3-journal - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -.python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -.dmypy.json -dmypy.json - -# Pyre type checker -.pyre/ diff --git a/py/BiRefNet/LICENSE b/py/BiRefNet_v2/LICENSE similarity index 100% rename from py/BiRefNet/LICENSE rename to py/BiRefNet_v2/LICENSE diff --git a/py/BiRefNet/README.md b/py/BiRefNet_v2/README.md similarity index 100% rename from py/BiRefNet/README.md rename to py/BiRefNet_v2/README.md diff --git a/py/BiRefNet/__init__.py b/py/BiRefNet_v2/__init__.py similarity index 100% rename from py/BiRefNet/__init__.py rename to py/BiRefNet_v2/__init__.py diff --git a/py/BiRefNet/config.py b/py/BiRefNet_v2/config.py similarity index 100% rename from py/BiRefNet/config.py rename to py/BiRefNet_v2/config.py diff --git a/py/BiRefNet/dataset.py b/py/BiRefNet_v2/dataset.py similarity index 98% rename from py/BiRefNet/dataset.py rename to py/BiRefNet_v2/dataset.py index c332b35..a7d9e13 100644 --- a/py/BiRefNet/dataset.py +++ b/py/BiRefNet_v2/dataset.py @@ -5,9 +5,9 @@ from PIL import Image from torch.utils import data from torchvision import transforms -from BiRefNet.image_proc import preproc -from BiRefNet.config import Config -from BiRefNet.utils import path_to_image +from .image_proc import preproc +from .config import Config +from .utils import path_to_image Image.MAX_IMAGE_PIXELS = None # remove DecompressionBombWarning diff --git a/py/BiRefNet/eval_existingOnes.py b/py/BiRefNet_v2/eval_existingOnes.py similarity index 98% rename from py/BiRefNet/eval_existingOnes.py rename to py/BiRefNet_v2/eval_existingOnes.py index f8d02c2..9a66c93 100644 --- a/py/BiRefNet/eval_existingOnes.py +++ b/py/BiRefNet_v2/eval_existingOnes.py @@ -3,8 +3,8 @@ import argparse from glob import glob import prettytable as pt -from BiRefNet.evaluation.evaluate import evaluator -from BiRefNet.config import Config +from .evaluation.evaluate import evaluator +from .config import Config config = Config() diff --git a/py/BiRefNet/evaluation/metrics.py b/py/BiRefNet_v2/evaluation/metrics.py similarity index 100% rename from py/BiRefNet/evaluation/metrics.py rename to py/BiRefNet_v2/evaluation/metrics.py diff --git a/py/BiRefNet/gen_best_ep.py b/py/BiRefNet_v2/gen_best_ep.py similarity index 99% rename from py/BiRefNet/gen_best_ep.py rename to py/BiRefNet_v2/gen_best_ep.py index 6c2e4bd..8e59868 100644 --- a/py/BiRefNet/gen_best_ep.py +++ b/py/BiRefNet_v2/gen_best_ep.py @@ -2,7 +2,7 @@ import os from glob import glob import numpy as np -from BiRefNet.config import Config +from .config import Config config = Config() diff --git a/py/BiRefNet/image_proc.py b/py/BiRefNet_v2/image_proc.py similarity index 100% rename from py/BiRefNet/image_proc.py rename to py/BiRefNet_v2/image_proc.py diff --git a/py/BiRefNet/inference.py b/py/BiRefNet_v2/inference.py similarity index 95% rename from py/BiRefNet/inference.py rename to py/BiRefNet_v2/inference.py index c56ae1a..21ed88f 100644 --- a/py/BiRefNet/inference.py +++ b/py/BiRefNet_v2/inference.py @@ -5,10 +5,10 @@ from tqdm import tqdm import cv2 import torch -from BiRefNet.dataset import MyData -from BiRefNet.models.birefnet import BiRefNet -from BiRefNet.utils import save_tensor_img, check_state_dict -from BiRefNet.config import Config +from .dataset import MyData +from .models.birefnet import BiRefNet +from .utils import save_tensor_img, check_state_dict +from .config import Config config = Config() diff --git a/py/BiRefNet/loss.py b/py/BiRefNet_v2/loss.py similarity index 99% rename from py/BiRefNet/loss.py rename to py/BiRefNet_v2/loss.py index 02d0cd0..ee0c5a2 100644 --- a/py/BiRefNet/loss.py +++ b/py/BiRefNet_v2/loss.py @@ -4,7 +4,7 @@ import torch.nn.functional as F from torch.autograd import Variable from math import exp -from BiRefNet.config import Config +from .config import Config class Discriminator(nn.Module): diff --git a/py/BiRefNet/make_a_copy.sh b/py/BiRefNet_v2/make_a_copy.sh similarity index 100% rename from py/BiRefNet/make_a_copy.sh rename to py/BiRefNet_v2/make_a_copy.sh diff --git a/py/BiRefNet/models/backbones/build_backbone.py b/py/BiRefNet_v2/models/backbones/build_backbone.py similarity index 91% rename from py/BiRefNet/models/backbones/build_backbone.py rename to py/BiRefNet_v2/models/backbones/build_backbone.py index 699c6a8..65761a1 100644 --- a/py/BiRefNet/models/backbones/build_backbone.py +++ b/py/BiRefNet_v2/models/backbones/build_backbone.py @@ -2,9 +2,9 @@ import torch import torch.nn as nn from collections import OrderedDict from torchvision.models import vgg16, vgg16_bn, VGG16_Weights, VGG16_BN_Weights, resnet50, ResNet50_Weights -from BiRefNet.models.backbones.pvt_v2 import pvt_v2_b0, pvt_v2_b1, pvt_v2_b2, pvt_v2_b5 -from BiRefNet.models.backbones.swin_v1 import swin_v1_t, swin_v1_s, swin_v1_b, swin_v1_l -from BiRefNet.config import Config +from ...models.backbones.pvt_v2 import pvt_v2_b0, pvt_v2_b1, pvt_v2_b2, pvt_v2_b5 +from ...models.backbones.swin_v1 import swin_v1_t, swin_v1_s, swin_v1_b, swin_v1_l +from ...config import Config config = Config() diff --git a/py/BiRefNet/models/backbones/pvt_v2.py b/py/BiRefNet_v2/models/backbones/pvt_v2.py similarity index 99% rename from py/BiRefNet/models/backbones/pvt_v2.py rename to py/BiRefNet_v2/models/backbones/pvt_v2.py index ce6720b..95f6749 100644 --- a/py/BiRefNet/models/backbones/pvt_v2.py +++ b/py/BiRefNet_v2/models/backbones/pvt_v2.py @@ -7,7 +7,7 @@ from timm.models.registry import register_model import math -from BiRefNet.config import Config +from ...config import Config config = Config() diff --git a/py/BiRefNet/models/backbones/swin_v1.py b/py/BiRefNet_v2/models/backbones/swin_v1.py similarity index 99% rename from py/BiRefNet/models/backbones/swin_v1.py rename to py/BiRefNet_v2/models/backbones/swin_v1.py index b3a9396..7739622 100644 --- a/py/BiRefNet/models/backbones/swin_v1.py +++ b/py/BiRefNet_v2/models/backbones/swin_v1.py @@ -12,7 +12,7 @@ import torch.utils.checkpoint as checkpoint import numpy as np from timm.models.layers import DropPath, to_2tuple, trunc_normal_ -from BiRefNet.config import Config +from ...config import Config config = Config() diff --git a/py/BiRefNet/models/birefnet.py b/py/BiRefNet_v2/models/birefnet.py similarity index 96% rename from py/BiRefNet/models/birefnet.py rename to py/BiRefNet_v2/models/birefnet.py index 72e6c40..e3fe196 100644 --- a/py/BiRefNet/models/birefnet.py +++ b/py/BiRefNet_v2/models/birefnet.py @@ -4,14 +4,14 @@ import torch.nn.functional as F from kornia.filters import laplacian from huggingface_hub import PyTorchModelHubMixin -from BiRefNet.config import Config -from BiRefNet.dataset import class_labels_TR_sorted -from BiRefNet.models.backbones.build_backbone import build_backbone -from BiRefNet.models.modules.decoder_blocks import BasicDecBlk, ResBlk -from BiRefNet.models.modules.lateral_blocks import BasicLatBlk -from BiRefNet.models.modules.aspp import ASPP, ASPPDeformable -from BiRefNet.models.refinement.refiner import Refiner, RefinerPVTInChannels4, RefUNet -from BiRefNet.models.refinement.stem_layer import StemLayer +from ..config import Config +from ..dataset import class_labels_TR_sorted +from ..models.backbones.build_backbone import build_backbone +from ..models.modules.decoder_blocks import BasicDecBlk, ResBlk +from ..models.modules.lateral_blocks import BasicLatBlk +from ..models.modules.aspp import ASPP, ASPPDeformable +from ..models.refinement.refiner import Refiner, RefinerPVTInChannels4, RefUNet +from ..models.refinement.stem_layer import StemLayer class BiRefNet( diff --git a/py/BiRefNet/models/modules/aspp.py b/py/BiRefNet_v2/models/modules/aspp.py similarity index 98% rename from py/BiRefNet/models/modules/aspp.py rename to py/BiRefNet_v2/models/modules/aspp.py index 7686db9..3c4f87e 100644 --- a/py/BiRefNet/models/modules/aspp.py +++ b/py/BiRefNet_v2/models/modules/aspp.py @@ -2,8 +2,8 @@ import torch import torch.nn as nn import torch.nn.functional as F -from BiRefNet.models.modules.deform_conv import DeformableConv2d -from BiRefNet.config import Config +from ...models.modules.deform_conv import DeformableConv2d +from ...config import Config config = Config() diff --git a/py/BiRefNet/models/modules/decoder_blocks.py b/py/BiRefNet_v2/models/modules/decoder_blocks.py similarity index 96% rename from py/BiRefNet/models/modules/decoder_blocks.py rename to py/BiRefNet_v2/models/modules/decoder_blocks.py index 9bfbbd8..32a0b6a 100644 --- a/py/BiRefNet/models/modules/decoder_blocks.py +++ b/py/BiRefNet_v2/models/modules/decoder_blocks.py @@ -1,8 +1,8 @@ import torch import torch.nn as nn -from BiRefNet.models.modules.aspp import ASPP, ASPPDeformable -from BiRefNet.config import Config +from ...models.modules.aspp import ASPP, ASPPDeformable +from ...config import Config config = Config() diff --git a/py/BiRefNet/models/modules/deform_conv.py b/py/BiRefNet_v2/models/modules/deform_conv.py similarity index 100% rename from py/BiRefNet/models/modules/deform_conv.py rename to py/BiRefNet_v2/models/modules/deform_conv.py diff --git a/py/BiRefNet/models/modules/lateral_blocks.py b/py/BiRefNet_v2/models/modules/lateral_blocks.py similarity index 93% rename from py/BiRefNet/models/modules/lateral_blocks.py rename to py/BiRefNet_v2/models/modules/lateral_blocks.py index abee527..de907ac 100644 --- a/py/BiRefNet/models/modules/lateral_blocks.py +++ b/py/BiRefNet_v2/models/modules/lateral_blocks.py @@ -4,7 +4,7 @@ import torch.nn as nn import torch.nn.functional as F from functools import partial -from BiRefNet.config import Config +from ...config import Config config = Config() diff --git a/py/BiRefNet/models/modules/mlp.py b/py/BiRefNet_v2/models/modules/mlp.py similarity index 100% rename from py/BiRefNet/models/modules/mlp.py rename to py/BiRefNet_v2/models/modules/mlp.py diff --git a/py/BiRefNet/models/modules/prompt_encoder.py b/py/BiRefNet_v2/models/modules/prompt_encoder.py similarity index 100% rename from py/BiRefNet/models/modules/prompt_encoder.py rename to py/BiRefNet_v2/models/modules/prompt_encoder.py diff --git a/py/BiRefNet/models/modules/utils.py b/py/BiRefNet_v2/models/modules/utils.py similarity index 100% rename from py/BiRefNet/models/modules/utils.py rename to py/BiRefNet_v2/models/modules/utils.py diff --git a/py/BiRefNet/models/refinement/refiner.py b/py/BiRefNet_v2/models/refinement/refiner.py similarity index 95% rename from py/BiRefNet/models/refinement/refiner.py rename to py/BiRefNet_v2/models/refinement/refiner.py index 19f696a..f63ad28 100644 --- a/py/BiRefNet/models/refinement/refiner.py +++ b/py/BiRefNet_v2/models/refinement/refiner.py @@ -7,12 +7,12 @@ import torch.nn.functional as F from torchvision.models import vgg16, vgg16_bn from torchvision.models import resnet50 -from BiRefNet.config import Config -from BiRefNet.dataset import class_labels_TR_sorted -from BiRefNet.models.backbones.build_backbone import build_backbone -from BiRefNet.models.modules.decoder_blocks import BasicDecBlk -from BiRefNet.models.modules.lateral_blocks import BasicLatBlk -from BiRefNet.models.refinement.stem_layer import StemLayer +from ...config import Config +from ...dataset import class_labels_TR_sorted +from ...models.backbones.build_backbone import build_backbone +from ...models.modules.decoder_blocks import BasicDecBlk +from ...models.modules.lateral_blocks import BasicLatBlk +from ...models.refinement.stem_layer import StemLayer class RefinerPVTInChannels4(nn.Module): diff --git a/py/BiRefNet/models/refinement/stem_layer.py b/py/BiRefNet_v2/models/refinement/stem_layer.py similarity index 94% rename from py/BiRefNet/models/refinement/stem_layer.py rename to py/BiRefNet_v2/models/refinement/stem_layer.py index 50d0ac2..8dd0a0d 100644 --- a/py/BiRefNet/models/refinement/stem_layer.py +++ b/py/BiRefNet_v2/models/refinement/stem_layer.py @@ -1,5 +1,5 @@ import torch.nn as nn -from BiRefNet.models.modules.utils import build_act_layer, build_norm_layer +from ...models.modules.utils import build_act_layer, build_norm_layer class StemLayer(nn.Module): diff --git a/py/BiRefNet/requirements.txt b/py/BiRefNet_v2/requirements.txt similarity index 100% rename from py/BiRefNet/requirements.txt rename to py/BiRefNet_v2/requirements.txt diff --git a/py/BiRefNet/rm_cache.sh b/py/BiRefNet_v2/rm_cache.sh similarity index 100% rename from py/BiRefNet/rm_cache.sh rename to py/BiRefNet_v2/rm_cache.sh diff --git a/py/BiRefNet/sub.sh b/py/BiRefNet_v2/sub.sh similarity index 100% rename from py/BiRefNet/sub.sh rename to py/BiRefNet_v2/sub.sh diff --git a/py/BiRefNet/test.sh b/py/BiRefNet_v2/test.sh similarity index 100% rename from py/BiRefNet/test.sh rename to py/BiRefNet_v2/test.sh diff --git a/py/BiRefNet/train.py b/py/BiRefNet_v2/train.py similarity index 98% rename from py/BiRefNet/train.py rename to py/BiRefNet_v2/train.py index 20bd909..8b47b54 100644 --- a/py/BiRefNet/train.py +++ b/py/BiRefNet_v2/train.py @@ -6,11 +6,11 @@ import torch.nn as nn import torch.optim as optim from torch.autograd import Variable -from BiRefNet.config import Config -from BiRefNet.loss import PixLoss, ClsLoss -from BiRefNet.dataset import MyData -from BiRefNet.models.birefnet import BiRefNet -from BiRefNet.utils import Logger, AverageMeter, set_seed, check_state_dict +from .config import Config +from .loss import PixLoss, ClsLoss +from .dataset import MyData +from .models.birefnet import BiRefNet +from .utils import Logger, AverageMeter, set_seed, check_state_dict from torch.utils.data.distributed import DistributedSampler from torch.nn.parallel import DistributedDataParallel as DDP diff --git a/py/BiRefNet/train.sh b/py/BiRefNet_v2/train.sh similarity index 100% rename from py/BiRefNet/train.sh rename to py/BiRefNet_v2/train.sh diff --git a/py/BiRefNet/train_test.sh b/py/BiRefNet_v2/train_test.sh similarity index 100% rename from py/BiRefNet/train_test.sh rename to py/BiRefNet_v2/train_test.sh diff --git a/py/BiRefNet/tutorials/BiRefNet_inference.ipynb b/py/BiRefNet_v2/tutorials/BiRefNet_inference.ipynb similarity index 100% rename from py/BiRefNet/tutorials/BiRefNet_inference.ipynb rename to py/BiRefNet_v2/tutorials/BiRefNet_inference.ipynb diff --git a/py/BiRefNet/tutorials/BiRefNet_pth2onnx.ipynb b/py/BiRefNet_v2/tutorials/BiRefNet_pth2onnx.ipynb similarity index 100% rename from py/BiRefNet/tutorials/BiRefNet_pth2onnx.ipynb rename to py/BiRefNet_v2/tutorials/BiRefNet_pth2onnx.ipynb diff --git a/py/BiRefNet/utils.py b/py/BiRefNet_v2/utils.py similarity index 100% rename from py/BiRefNet/utils.py rename to py/BiRefNet_v2/utils.py diff --git a/py/birefnet_ultra_v2.py b/py/birefnet_ultra_v2.py index 370ede1..68d7e33 100644 --- a/py/birefnet_ultra_v2.py +++ b/py/birefnet_ultra_v2.py @@ -5,8 +5,8 @@ from torchvision import transforms import tqdm from .imagefunc import * from comfy.utils import ProgressBar -# sys.path.append(os.path.join(os.path.dirname(__file__), 'BiRefNet')) -from .BiRefNet.models.birefnet import BiRefNet +sys.path.append(os.path.join(os.path.dirname(__file__), 'BiRefNet_v2')) + def get_models(): model_path = os.path.join(folder_paths.models_dir, 'BiRefNet', 'pth') @@ -42,7 +42,8 @@ class LS_LoadBiRefNetModel: CATEGORY = '😺dzNodes/LayerMask' def load_birefnet_model(self, model): - from .BiRefNet.utils import check_state_dict + from .BiRefNet_v2.models.birefnet import BiRefNet + from .BiRefNet_v2.utils import check_state_dict model_dict = get_models() self.birefnet = BiRefNet(bb_pretrained=False) self.state_dict = torch.load(model_dict[model], map_location='cpu', weights_only=True) diff --git a/pyproject.toml b/pyproject.toml index 15d6954..4c88c00 100644 --- 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.65" +version = "1.0.66" license = "MIT" dependencies = ["numpy", "pillow", "torch", "matplotlib", "Scipy", "scikit_image", "scikit_learn", "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", "inference-cli[yolo-world]", "inference-gpu[yolo-world]", "onnxruntime"]