Merge pull request #107 from intel/device_modes

Device modes + OV API 2.0 update

Author: gblong1

Docs/linux_install_guide.md

@@ -1,25 +1,3 @@
-# Install OpenVINO
-1. Download the latest [OpenVINO™](https://github.com/openvinotoolkit/openvino/releases) for your version of Ubuntu.
-
-   https://github.com/gblong1/openvino-ai-plugins-gimp/assets/22227580/79ce7302-4f53-4451-89a2-47d3ef8a29c8
-
-
-3. Extract the archive
-   ```sh
-   tar -xvf <ov-release-name>.tar.gz
-   ```
-4. Create an intel directory under `/opt` and move the extracted files to that directory
-   ```sh
-   sudo mkdir /opt/intel
-   sudo chown <user>:<group> /opt/intel
-   mv <ov-release-name> /opt/intel/.
-   ```
-5. Link the release as `openvino` under `/opt/intel`
-   ```sh
-   cd /opt/intel
-   ln -sf <ov-release-name> openvino
-   ```
-
 # Build GIMP
 1. Create a directory where you will download and build all of the sources for GIMP
     ```sh
@@ -73,25 +51,20 @@
 2. Run install script, and download models. The following steps will create the virtual environment "gimpenv3", install all required packages and will also walk you through models setup.
    ```sh
    chmod +x openvino-ai-plugins-gimp/install.sh
-   source /opt/intel/openvino/setupvars.sh
    ./openvino-ai-plugins-gimp/install.sh
    ```
    At the end of plugin setup, you will be prompted to setup the AI models used with OpenVINO™. Before proceeding, make note of the plugin directory and add that to the plugin path for GIMP before proceeding with model download.
    Start the GIMP application (`gimp-2.99`), and add the gimpenv3 path that was printed when running the above step to the list of plugin folders  [Edit-> Preferences-> Folders-> Plugins].  
 
-https://github.com/gblong1/openvino-ai-plugins-gimp/assets/22227580/1bab09ae-9383-4d53-9615-eb87d2212e82
-
    Choose the models that you would like to setup, keeping in mind that choosing to download all of them may take time and considerable disk space.
 
    *You can re-run "run install script" step later again to install & setup models that you may have missed.*
 
 # Verify Installation
  Start GIMP, ensuring to setup the environment variables correctly,  and you should see 'OpenVINO-AI-Plugins' show up in 'Layer' menu
    ```sh
-   source /opt/intel/openvino/setupvars.sh
    export GI_TYPELIB_PATH=/usr/lib/x86_64-linux-gnu/girepository-1.0:/usr/local/lib/x86_64-linux-gnu/girepository-1.0
    gimp-2.99
    ```
 
-https://github.com/gblong1/openvino-ai-plugins-gimp/assets/22227580/a6222235-2017-45f8-9594-f49ab4107a70
 

Docs/user_guide_for_windos_users.md renamed to Docs/user_guide_for_windows_users.md

@@ -20,30 +20,9 @@
     - Note: This document will use python 3.9.13 as an example.
   - VC runtime
   - [GIMP 2.99.14](https://download.gimp.org/gimp/v2.99/windows/gimp-2.99.14-setup.exe)
-  - [OpenVINO™ 2023.2](https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.2/windows/w_openvino_toolkit_windows_2023.2.0.13089.cfd42bd2cb0_x86_64.zip) or later version
   - [GIMP AI plugins with OpenVINO™ Backend](https://github.com/intel/openvino-ai-plugins-gimp) from Github.
 
 
-### Install OpenVINO™
-
->__Notes:__ Use OpenVINO™ `2023.2` as an example.
-
-Please following below steps to download and install the OpenVINO™ package.
-
-- Check download [page](https://www.intel.com/content/www/us/en/developer/tools/openvino-toolkit/download.html?VERSION=v_2023_2_0&OP_SYSTEM=WINDOWS&DISTRIBUTION=ARCHIVE) of OpenVINO™ website, then click "Download Archives"
-
-    ![](figs/OpenVINO_installation.png)
-
-- Download compressed package [w_openvino_toolkit_windows_2023.2.0.13089.cfd42bd2cb0_x86_64.zip](https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.2/windows/w_openvino_toolkit_windows_2023.2.0.13089.cfd42bd2cb0_x86_64.zip)
-
-    ![](figs/OpenVINO_installation_archives.png)
-
-- Unzip `w_openvino_toolkit_windows_2023.2.0.13089.cfd42bd2cb0_x86_64.zip` to `C:\Users\Public\`
-
-> __Notes:__ Use `C:\Users\Public\` as an example, you can unzip it to anywhere that you want.
-
-
-
 ### Install Python
 
 >__Notes:__ Use Python `3.9.13` as an example.
@@ -114,7 +93,7 @@ Please download [gimp-2.99.14-setup.exe](https://download.gimp.org/gimp/v2.99/wi
 
 
 
-### Install GIMP AI plugins with OpenVINO™ Backend
+### Install GIMP AI plugins 
 
  - Open command prompt and download it from Github by git with below instruction.
 
@@ -127,15 +106,6 @@ Please download [gimp-2.99.14-setup.exe](https://download.gimp.org/gimp/v2.99/wi
     > __Notes__:
     > This is an example that will create a `GIMP` folder in `C:\Users\Public\`, and then download the package to `C:\Users\Public\GIMP`, you still can define where to place this package by yourself.
 
-- Use same command prompt that used in previous step to include OpenVINO™ environment by below command.
-
-    ```sh
-    C:\Users\Public\w_openvino_toolkit_windows_2023.2.0.13089.cfd42bd2cb0_x86_64\setupvars.bat
-    ```
-    > __Notes__:
-    > - Folder name of `w_openvino_toolkit_windows_2023.2.0.13089.cfd42bd2cb0_x86_64` is for OpenVINO™ `2023.2` version and it depends on OpenVINO™ version.
-    > - Please ensure the OpenVINO™ environment is set, otherwise, NPU will not work for GIMP AI plugins with OpenVINO™ Backend.
-
  - Use same command prompt that used in previous steps and follow the command below to install it.
 
     ```sh
@@ -166,7 +136,7 @@ Please download [gimp-2.99.14-setup.exe](https://download.gimp.org/gimp/v2.99/wi
     > - The downloaded models include FP16 and INT8 precision, and INT8 precision can be executed on MTL NPU.
     > - Weights is saved at `C:\Users\\<user_name>\openvino-ai-plugins-gimp\weights`.
 
-## Set up GIMP AI plugins with OpenVINO™ Backend on GIMP
+## Set up GIMP AI plugins 
 
 Please follow below steps to setup plugin at first time and then you can use GIMP to execute GIMP AI plugins with OpenVINO™ Backend to run Stable-Diffusion or other features.
 
@@ -194,34 +164,7 @@ With previous section, the GIMP AI plugins with OpenVINO™ Backend is installed
 
 ## Execute GIMP
 
-To make GIMP AI plugins with OpenVINO™ Backend can work with GIMP, please choose one of below two methods to execute it.
-
-### Execute by commands in cmd prompt
-
-Open command prompt, then follow below command to execute GIMP in command prompt.
-
-```sh
-C:\Users\Public\w_openvino_toolkit_windows_2023.2.0.13089.cfd42bd2cb0_x86_64\setupvars.bat
-cd "C:\Program Files\GIMP 2.99\bin"
-gimp-2.99.exe
-```
-
-### One-click execution by GIMP.bat file
-
-- Create `GIMP.bat` in the directory `C:\Users\Public`.
-
-    ```sh
-    call C:\Users\Public\w_openvino_toolkit_windows_2023.2.0.13089.cfd42bd2cb0_x86_64\setupvars.bat
-    cd "C:\Program Files\GIMP 2.99\bin"
-    .\gimp-2.99.exe 
-    ```
-
- - And then double click `GIMP.bat` or open command prompt executes `GIMP.bat` by below command.
-
-    ```sh
-    C:\Users\Public\GIMP.bat
-    ```
-
+You can now simply open Gimp from the start menu as you would any normal Windows application.
 
 ## Execute Stable-Diffusion – SD1.5_square_int8
 

README.md

@@ -4,10 +4,8 @@
 
 ## Current list of plugins:
 [1] Super-Resolution <br>
-[2] Style-Transfer <br>
-[3] Inpainting <br>
-[4] Semantic-Segmentation <br>
-[5] Stable-Diffusion (Supports - SD 1.4, SD 1.5 (landscape, portrait, and Latent Consistency Model), SD 1.5 Inpainting, SD 1.5 Controlnet-OpenPose, SD 1.5 Controlnet-CannyEdge, SD 1.5 Controlnet-Scribble) <br>
+[2] Semantic-Segmentation <br>
+[3] Stable-Diffusion (Supports - SD 1.4, SD 1.5 (landscape, portrait, and Latent Consistency Model), SD 1.5 Inpainting, SD 1.5 Controlnet-OpenPose, SD 1.5 Controlnet-CannyEdge, SD 1.5 Controlnet-Scribble) <br>
 
 # Objectives
 [1] Provides a set of OpenVINO™ based plugins that add AI features to GIMP. <br>
@@ -22,13 +20,8 @@ Please raise a PR for any new features, modifications, or bug fixes.
 ![gimp-screenshot](gimp-screenshot.PNG)
 
 ## Installation Steps
-
-### Install OpenVINO™
-- Download and install [OpenVINO™](https://github.com/openvinotoolkit/openvino/releases) for your operating system. Please follow the instructions to download and install OpenVINO™ from the archive. **Do not use pypi for installation.**
-- Note that these plugins have been tested with 2023.1.0 and 2023.2.0
-
 ### Windows
-For detailed steps and tips please refer [User guide for Windows](./Docs/user_guide_for_windos_users.md).
+For detailed steps and tips please refer [User guide for Windows](./Docs/user_guide_for_windows_users.md).
 
 ### Linux
 This plugin is tested on Ubuntu 22.04. Building GIMP from source is recommended.<br>
@@ -108,18 +101,7 @@ _Note that the screenshots below are based on the previous UI_
 ### OpenVINO™ Super Resolution Plugin
 ![](gifs/super-res.webp)
 
-### OpenVINO™ Style Transfer Plugin
-![](gifs/style-transfer.webp)
-
-### OpenVINO™ Inpainting Plugin
-1. Open an image in GIMP.
-2. Make sure there is alpha channel added to the image by right clicking on the image from layer section and selecting “Add alpha channel”
-3. Add a new transparent layer of the same size as original image.
-4. Select paint brush with white foreground color and black background color. Choose the thickness of the brush
-10. Now paint the object that you want to remove from the image.
-11. Select the new layer and image at the same. You should see “two items selected in layer section”
 
-![](gifs/inpainting.webp)
 
 
 # Acknowledgements