mirrors/Fooocus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only load libs when necessary

Browse Source
This commit is contained in:
lllyasviel 2023-11-12 02:16:11 -08:00
parent e7fe1d443a
commit e6aeefd2b4
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fooocus_extras/face_crop.py
View File

@ -1,7 +1,6 @@
import cv2 import cv2
import numpy as np import numpy as np
import modules.config import modules.config
import facexlib.utils.face_restoration_helper as face_restoration_helper
faceRestoreHelper = None faceRestoreHelper = None
@ -26,7 +25,8 @@ def crop_image(img_rgb):
global faceRestoreHelper global faceRestoreHelper
if faceRestoreHelper is None: if faceRestoreHelper is None:
faceRestoreHelper = face_restoration_helper.FaceRestoreHelper( from facexlib.utils.face_restoration_helper import FaceRestoreHelper
faceRestoreHelper = FaceRestoreHelper(
upscale_factor=1, upscale_factor=1,
model_rootpath=modules.config.path_controlnet, model_rootpath=modules.config.path_controlnet,
device='cpu' # use cpu is safer since we are out of fcbh management device='cpu' # use cpu is safer since we are out of fcbh management

2
fooocus_version.py
View File

@ -1 +1 @@
version = '2.1.795' version = '2.1.796'

3
modules/async_worker.py
View File

@ -28,6 +28,7 @@ def worker():
import modules.constants as constants import modules.constants as constants
import modules.advanced_parameters as advanced_parameters import modules.advanced_parameters as advanced_parameters
import fooocus_extras.ip_adapter as ip_adapter import fooocus_extras.ip_adapter as ip_adapter
import fooocus_extras.face_crop
from modules.sdxl_styles import apply_style, apply_wildcards, fooocus_expansion from modules.sdxl_styles import apply_style, apply_wildcards, fooocus_expansion
from modules.private_logger import log from modules.private_logger import log
@ -544,8 +545,6 @@ def worker():
return return
for task in cn_tasks[flags.cn_ip_face]: for task in cn_tasks[flags.cn_ip_face]:
cn_img, cn_stop, cn_weight = task cn_img, cn_stop, cn_weight = task
import fooocus_extras.face_crop
cn_img = fooocus_extras.face_crop.crop_image(HWC3(cn_img)) cn_img = fooocus_extras.face_crop.crop_image(HWC3(cn_img))
# https://github.com/tencent-ailab/IP-Adapter/blob/d580c50a291566bbf9fc7ac0f760506607297e6d/README.md?plain=1#L75 # https://github.com/tencent-ailab/IP-Adapter/blob/d580c50a291566bbf9fc7ac0f760506607297e6d/README.md?plain=1#L75