diff --git a/extensions-builtin/sdnq b/extensions-builtin/sdnq index 27a54aed6..01bc5b460 160000 --- a/extensions-builtin/sdnq +++ b/extensions-builtin/sdnq @@ -1 +1 @@ -Subproject commit 27a54aed657ec583620b76b42c65d907d13290ad +Subproject commit 01bc5b460edf62227bb22bb7363d085e11b2cc84 diff --git a/installer.py b/installer.py index ac2c92411..5fdf607a0 100644 --- a/installer.py +++ b/installer.py @@ -551,16 +551,34 @@ def check_python(supported_minors=None, experimental_minors=None, reason=None): # register sdnq package from github submodule -def register_sdnq(): - t_start = time.time() - fn = os.path.join('extensions-builtin', 'sdnq', 'src', 'sdnq', '__init__.py') - name = "sdnq" - spec = importlib.util.spec_from_file_location(name, fn) - module = importlib.util.module_from_spec(spec) - sys.modules[name] = module - spec.loader.exec_module(module) # this is where actual import happens - import sdnq # pylint: disable=unused-import # test import - ts('sdnq', t_start) +def register_sdnq(skip=False, devices=None, shared=None): + if not skip: + print('HERE1') + t_start = time.time() + fn = os.path.join('extensions-builtin', 'sdnq', 'src', 'sdnq', '__init__.py') + name = "sdnq" + spec = importlib.util.spec_from_file_location(name, fn) + module = importlib.util.module_from_spec(spec) + sys.modules[name] = module + spec.loader.exec_module(module) # this is where actual import happens + import sdnq # pylint: disable=unused-import # test import + ts('sdnq', t_start) + if devices is not None: + import sdnq + sdnq.sdnext.devices = devices + sdnq.quantizer.devices = devices + sdnq.dequantizer.devices = devices + sdnq.quant_utils.devices = devices + sdnq.kernel_wrappers.devices = devices + if shared is not None: + import sdnq + sdnq.sdnext.shared = shared + sdnq.quantizer.shared = shared + sdnq.dequantizer.shared = shared + sdnq.quant_utils.shared = shared + sdnq.kernel_wrappers.shared = shared + sdnq.common.shared = shared + sdnq.loader.shared = shared # check diffusers version diff --git a/webui.py b/webui.py index df48a9d52..cc03b9973 100644 --- a/webui.py +++ b/webui.py @@ -77,6 +77,9 @@ def initialize(): log.debug('Initializing: modules') from concurrent.futures import ThreadPoolExecutor, as_completed + from installer import register_sdnq + register_sdnq(skip=True, devices=modules.devices, shared=shared) # monkey-patch sdnq to use sdnext devices and shared modules + from modules.models_hf import hf_init hf_init()