Merge pull request #198 from intel/development

Development

Author: gblong1

gimpopenvino/plugins/openvino_utils/tools/model_manager.py

@@ -301,8 +301,6 @@
 
 access_token = None
 
-NPU_THRESHOLD = 43000
-
 def does_filename_match_patterns(filename, patterns):
     for pattern in patterns:
         if fnmatch.fnmatch(filename, pattern):
@@ -386,8 +384,9 @@ def get_npu_driver_version(core):
 def get_npu_config(core, architecture):
     try:
         if architecture == NPUArchitecture.ARCH_4000:
-            gops_value = core.get_property("NPU", "DEVICE_GOPS")[ov.Type.i8]
-            return 6 if gops_value > NPU_THRESHOLD else None
+            return core.get_property("NPU", "NPU_MAX_TILES")
+        else:
+            return None
     except Exception as e:
         logging.error(f"Error retrieving NPU configuration: {str(e)}")
         return None
@@ -1219,8 +1218,9 @@ def dl_sd_15_square(self, model_id, only_npu_recompilation=False):
                             config = None
                             logging.info(f"Creating NPU model for {model_name}")
 
-                            if "unet_int8" in model_name or "unet_bs1" in model_name:
-                                config = { "NPU_DPU_GROUPS" : npu_config, "NPU_MAX_TILES": npu_config } if npu_config is not None else None
+                            if "unet" in model_name:
+                                config = { "NPU_COMPILATION_MODE_PARAMS" : "performance-hint-override=latency" } 
+
 
                             if "unet_int8" not in model_name:
                                 model_path_fp16 = os.path.join(install_location, model_fp16, model_name + ".xml")

gimpopenvino/plugins/stable_diffusion_ov/stable_diffusion_ov.py

@@ -1140,13 +1140,13 @@ def do_create_procedure(self, name):
 
             # procedure.add_argument_from_property(self, "initial_image")
             procedure.add_int_argument("num_images",_("_Number of Images (Default:1)"),
-                                       "Number of Images to generate", 1, 50, 1,
+                                       "Number of Images to generate", 1, 200, 1,
                                         GObject.ParamFlags.READWRITE)
             procedure.add_int_argument("num_infer_steps",_("_Number of Inference steps (Default:20)"), 
-                                       "Number of Inference steps (Default:20)", 1, 50, 20,
+                                       "Number of Inference steps (Default:20)", 1, 200, 20,
                                         GObject.ParamFlags.READWRITE)
             procedure.add_int_argument("num_infer_steps_turbo",_("_Number of Inference steps (Default:2)"), 
-                                       "Number of Inference steps (Default:2)", 1, 50, 2,
+                                       "Number of Inference steps (Default:2)", 1, 200, 2,
                                         GObject.ParamFlags.READWRITE)            
             procedure.add_double_argument("guidance_scale",_("_Guidance Scale (Default:7.5)"), 
                                           "Guidance Scale (Default:7.5)", 0.0, 20.0, 7.5,

install.bat

@@ -34,7 +34,7 @@ if /i "%script_dir%"=="%current_dir%" (
 echo **** openvino-ai-plugins-gimp Setup started **** 
 
 REM Create a virtual environment
-python -m venv gimpenv3
+call python -m venv gimpenv3
 
 call "gimpenv3\Scripts\activate"
 

requirements.txt

@@ -1,109 +1,5 @@
-accelerate==0.33.0
-aiohappyeyeballs==2.6.1
-aiohttp==3.11.18
-aiosignal==1.3.2
-altair==5.5.0
-attrs==25.3.0
-beautifulsoup4==4.13.4
-blinker==1.9.0
-cachetools==5.5.2
-certifi==2025.4.26
-charset-normalizer==3.4.2
-click==8.2.0
-colorama==0.4.6
-contourpy==1.3.2
-controlnet-aux==0.0.9
-cycler==0.12.1
-datasets==3.6.0
-diffusers==0.33.1
-dill==0.3.8
-einops==0.8.0
-filelock==3.18.0
-fire==0.6.0
-fonttools==4.58.0
-frozenlist==1.6.0
-fsspec==2025.3.0
-ftfy==6.2.3
-gdown==5.2.0
-gitdb==4.0.12
-GitPython==3.1.44
-huggingface-hub==0.31.4
-idna==3.10
-imageio==2.37.0
-importlib_metadata==8.7.0
-intel-openmp==2021.4.0
-Jinja2==3.1.6
-jsonschema==4.23.0
-jsonschema-specifications==2025.4.1
-kiwisolver==1.4.8
-lazy_loader==0.4
-markdown-it-py==3.0.0
-MarkupSafe==3.0.2
-matplotlib==3.10.3
-mdurl==0.1.2
-mkl==2021.4.0
-mpmath==1.3.0
-multidict==6.4.4
-multiprocess==0.70.16
-narwhals==1.40.0
-networkx==3.4.2
-numpy==1.26.4
-opencv-python==4.11.0.86
-opencv-python-headless==4.11.0.86
-openvino==2025.1.0
-openvino-genai==2025.1.0.0
-openvino-telemetry==2025.1.0
-openvino-tokenizers==2025.1.0.0
+openvino==2025.2.0
+openvino-genai==2025.2.0.0
 optimum==1.25.3
 optimum-intel @ git+https://github.com/huggingface/optimum-intel.git@dba7dced0145b539bb0563e5d5741d00daeb8025
-packaging==24.2
-pandas==2.2.3
-peft==0.12.0
-pillow==10.4.0
-propcache==0.3.1
-protobuf==5.27.3
-psutil==7.0.0
-pyarrow==20.0.0
-pydeck==0.9.1
-Pygments==2.19.1
-pyparsing==3.2.3
-PySocks==1.7.1
-python-dateutil==2.9.0.post0
-pytz==2025.2
-PyYAML==6.0.2
-referencing==0.36.2
-regex==2024.11.6
-requests==2.32.3
-rich==13.9.4
-rpds-py==0.25.0
-safetensors==0.4.4
-scikit-image==0.25.2
-scipy==1.15.3
-sentencepiece==0.2.0
-setuptools==80.7.1
-six==1.17.0
-smmap==5.0.2
-soupsieve==2.7
-streamlit==1.37.1
-sympy==1.14.0
-tbb==2021.13.1
-tenacity==8.5.0
-termcolor==3.1.0
-tifffile==2025.5.10
-timm==0.4.5
-tokenizers==0.21.1
-toml==0.10.2
-torch==2.7.0
-torchvision==0.22.0
-tornado==6.5
-tqdm==4.66.5
-transformers==4.51.3
-typing_extensions==4.13.2
-tzdata==2025.2
-urllib3==2.4.0
-watchdog==4.0.2
-wcwidth==0.2.13
-xxhash==3.5.0
-yarl==1.20.0
-zipp==3.21.0
-
+peft