Merge pull request #101 from intel/device_modes

Device modes

Author: gblong1

README.md

@@ -35,6 +35,7 @@ This plugin is tested on Ubuntu 22.04. Building GIMP from source is recommended.
 For detailed steps and tips please refer to [Linux Installation Guide](./Docs/linux_install_guide.md).
 
 # OpenVINO™ Image Generator Plugin with Stable Diffusion
+#### Power Mode is enabled for int8 SD models and systems that has a "NPU" only 
 #### A. Prompt to Image
 1. Create or choose a layer
 2. Select Stable Diffusion from the drop down list in layers -> OpenVINO-AI-Plugins
@@ -93,9 +94,12 @@ _With Advanced Setting_
 
 ![](gifs/stable-diffusion1.png)
 
+_With Power Mode in Advanced Setting for SD int8 based models_
+
+![](gifs/stable-diffusion2.png)
 
 _Note that the screenshots below are based on the previous UI_
-![](gifs/stable-diffusion.webp)
+
 
 
 ### OpenVINO™ Semantic Segmentation Plugin

gifs/stable-diffusion2.png

@@ -361,15 +361,22 @@ def is_server_running():
 
     return False
 
-def async_load_models(python_path, server_path, model_name, supported_devices, dialog):
+def async_load_models(python_path, server_path, model_name, supported_devices, device_power_mode,dialog):
 
     device_name = "iGPU"
     if "GPU.1" in supported_devices:
         device_name =  "dGPU"
 
+    if "NPU" in supported_devices: # and "GPU.1" not in supported_devices:
+        if device_power_mode == "Balanced":
+            device_name = "Balanced_NPU"
+        if device_power_mode == "Best power efficiency":
+            device_name = "NPU"
+        if device_power_mode == "Best Performance" and "GPU.1" in supported_devices:
+            device_name = "dGPU"
+
+
 
-    if "NPU" in supported_devices and "GPU.1" not in supported_devices:
-        device_name = "NPU"
 
     try:
         s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -463,7 +470,12 @@ def run(procedure, run_mode, image, n_drawables, layer, args, data):
                           list_models(config_path_output["weight_path"],"controlnet_scribble") + 
                           list_models(config_path_output["weight_path"],"controlnet_scribble_int8"))
 
-        model_name_enum = DeviceEnum(model_list)            
+        model_name_enum = DeviceEnum(model_list)  
+        if "NPU" in supported_devices:
+            supported_modes = ["Best power efficiency", "Balanced", "Best performance"]
+        else:
+            supported_modes = ["Best performance"]
+        device_name_enum = DeviceEnum(supported_modes)        
 
         config = procedure.create_config()
         config.begin_run(image, run_mode, args)
@@ -560,6 +572,12 @@ def run(procedure, run_mode, image, n_drawables, layer, args, data):
 
         seed_text = _("Seed")
         seed_label = Gtk.Label(label=seed_text)
+
+
+        adv_power_mode_label = Gtk.Label.new_with_mnemonic(_("_Power Mode"))
+        adv_power_mode_combo = GimpUi.prop_string_combo_box_new(
+            config, "power_mode", device_name_enum.get_tree_model(), 0, 1
+        )
 
 
         adv_checkbox = GimpUi.prop_check_button_new(config, "advanced_setting",
@@ -609,6 +627,11 @@ def remove_all_advanced_widgets():
             grid.remove(seed_label)
             seed_label.hide()
 
+            grid.remove(adv_power_mode_label)
+            adv_power_mode_label.hide()
+            grid.remove(adv_power_mode_combo)
+            adv_power_mode_combo.hide()       
+
             invisible_label4.show()
             invisible_label5.show()
             invisible_label6.show()
@@ -626,6 +649,15 @@ def populate_advanced_settings():
             grid.attach(gscale_spin, 1, 5, 1, 1)
             grid.attach(seed, 1, 6, 1, 1)
             grid.attach(seed_label, 0, 6, 1, 1)
+            model_name = config.get_property("model_name")
+            if "int8" in model_name:
+                grid.attach(adv_power_mode_label, 0, 7, 1, 1)
+                grid.attach(adv_power_mode_combo, 1, 7, 1, 1)
+                adv_power_mode_label.show()
+                adv_power_mode_combo.show()
+
+
+
             steps_label.show()
             steps_spin.show()
             gscale_label.show()
@@ -789,6 +821,7 @@ def initImage_toggled(widget):
 
 
         model_name = config.get_property("model_name")
+        device_power_mode = None
 
         if model_name == "SD_1.5_square_lcm":
             negative_prompt_label.hide()
@@ -798,6 +831,16 @@ def initImage_toggled(widget):
 
         if is_server_running():
             run_button.set_sensitive(True)
+            if adv_checkbox.get_active():
+                if "int8" in model_name:
+                    device_power_mode = config.get_property("power_mode")
+                else:    
+                    device_power_mode = None                
+
+                
+            else:
+                    device_power_mode = None
+
 
 
 
@@ -806,6 +849,7 @@ def initImage_toggled(widget):
         # if model / devices are changed from what is currently loaded.
         def model_sensitive_combo_changed(widget):
             model_name_tmp = config.get_property("model_name")
+            device_power_mode_tmp = None
 
             # LCM model has no negative prompt
             if model_name_tmp == "SD_1.5_square_lcm":
@@ -822,10 +866,19 @@ def model_sensitive_combo_changed(widget):
             else:
                 initialImage_checkbox.set_active(False)
 
+            if adv_checkbox.get_active():
+                if "int8" in model_name:
+                    device_power_mode_tmp = config.get_property("power_mode")
+                
+                else:
+                    device_power_mode_tmp = None
+
+
 
 
 
-            if (model_name_tmp==model_name):
+            if (model_name_tmp==model_name   and
+                device_power_mode_tmp==device_power_mode):
                 run_button.set_sensitive(True)
             else:
                 run_button.set_sensitive(False)
@@ -838,10 +891,8 @@ def model_combo_changed(widget):
 
         model_combo.connect("changed", model_combo_changed)
         model_combo.connect("changed", model_sensitive_combo_changed)
-     
-    
-
         adv_checkbox.connect("toggled", model_sensitive_combo_changed)
+        adv_power_mode_combo.connect("changed", model_sensitive_combo_changed)
 
 
 
@@ -864,9 +915,7 @@ def model_combo_changed(widget):
                 #adv_checkbox.set_sensitive(False)
                 prompt = prompt_text.get_text()
                 negative_prompt = negative_prompt_text.get_text()
-          
-
-                        
+                                  
 
                 if adv_checkbox.get_active():
 
@@ -891,8 +940,6 @@ def model_combo_changed(widget):
 
 
 
-
-
                 if initialImage_checkbox.get_active() and n_layers == 1:
                     if len(file_entry.get_text()) != 0:
                         initial_image = file_entry.get_text()
@@ -931,12 +978,28 @@ def model_combo_changed(widget):
 
                 model_name = config.get_property("model_name")
 
+                if adv_checkbox.get_active():
+                
+                    if "int8" in model_name:
+                        device_power_mode = config.get_property("power_mode")
+                      
+                    else:
+                        device_power_mode = None
+                  
+                else:
+                    
+                    if "int8" in model_name:
+                        device_power_mode = "Best performance"
+                      
+                    else:
+                        device_power_mode = None
+
 
                 server = "stable-diffusion-ov-server.py"
                 server_path = os.path.join(config_path, server)
 
 
-                run_load_model_thread = threading.Thread(target=async_load_models, args=(python_path, server_path, model_name,supported_devices, dialog))
+                run_load_model_thread = threading.Thread(target=async_load_models, args=(python_path, server_path, model_name,supported_devices, device_power_mode,dialog))
                 run_load_model_thread.start()
 
                 continue
@@ -1020,6 +1083,14 @@ class StableDiffusion(Gimp.PlugIn):
             False,
             GObject.ParamFlags.READWRITE,
         ),
+
+        "power_mode": (
+            str,
+            _("Power Mode"),
+            "Power Mode: 'Balanced', 'Best performance'",
+            "Best performance",
+            GObject.ParamFlags.READWRITE,
+        ),        
 
         "use_initial_image": (
             bool,
@@ -1075,6 +1146,7 @@ def do_create_procedure(self, name):
             procedure.add_argument_from_property(self, "model_name")
 
             procedure.add_argument_from_property(self, "advanced_setting")
+            procedure.add_argument_from_property(self, "power_mode")
 
             procedure.add_argument_from_property(self, "use_initial_image")
 

gimpopenvino/plugins/stable-diffusion-ov/stable-diffusion-ov.py

@@ -133,8 +133,10 @@ def run(model_name,device_name):
         device =  ["CPU","GPU.1","GPU.1"]
         device_int8 = ["CPU","GPU.1","GPU.1","GPU.1"]  
 
-    if device_name ==  "NPU":
+    if device_name ==  "Balanced_NPU":
         device_int8 = ["CPU","GPU","NPU","GPU"]  
+    if device_name ==  "NPU":
+        device_int8 = ["CPU","NPU","NPU","GPU"]     
 
 
     if model_name == "SD_1.5_square_int8":