Merge branch 'dev' into gradio4

2024-03-02 08:27:22 +03:00
parent 3ee79332b1 bb24c13ed7
commit f7a3067d2a
59 changed files with 1129 additions and 388 deletions
@@ -142,13 +142,14 @@ def initialize_rest(*, reload_script_modules=False):
        its optimization may be None because the list of optimizaers has neet been filled
        by that time, so we apply optimization again.
        """
+        from modules import devices
+        devices.torch_npu_set_device()

        shared.sd_model  # noqa: B018

        if sd_hijack.current_optimizer is None:
            sd_hijack.apply_optimizations()

-        from modules import devices
        devices.first_time_calculation()
    if not shared.cmd_opts.skip_load_model_at_start:
        Thread(target=load_model).start()