updates to merge changes from dev to main branch

demo/multi-model-exec/README.md

@@ -34,19 +34,16 @@ This is the demo of showing multiple AI models running concurrently on Ryzen AI.
 
 
 ```
-│  1x4.xclbin
-│  env.yaml
 │  README.md
-│  vaip_config.json
-│  voe-0.1.0-cp39-cp39-win_amd64.whl
-│
-├─.vscode
-│      settings.json
 │
 ├─bin
-│      ipu_multi_models.exe
+│      npu_multi_models.exe
 │      onnxruntime.dll
+│      onnxruntime_providers_shared.dll
+│      onnxruntime_providers_vitisai.dll
 │      onnxruntime_vitisai_ep.dll
+│      DirectML.dll
+│      vaip_config.json
 │
 ├─images
 │      mobilenet_V2.jpg
@@ -56,12 +53,19 @@ This is the demo of showing multiple AI models running concurrently on Ryzen AI.
 │      segmentation.jpg
 │      yolox.jpg
 │
-└─ipu_modelsx4_demo
-    │  generate_script.py
+└─npu_modelsx4_demo
+    │  run_mobile_net_v2.bat
+    │  run_modelx4.bat
+    │  run_modelx4_with_camera_on.bat
+    │  run_resnet50.bat
+    │  run_retinaface.bat
+    │  run_segmentation.bat
+    │  run_yolovx.bat
     │
     └─config
             mobile_net_v2.json
             modelx4.json
+            modelx4_with_camera_on.json
             resnet50.json
             retinaface.json
             segmentation.json
@@ -72,7 +76,7 @@ This is the demo of showing multiple AI models running concurrently on Ryzen AI.
 
 ### 3.1 Environment Setup 
 
-Please note that all the steps mentioned here need to be performed in ***Windows CMD Prompt***. Make sure the IPU driver has been installed by following the instructions on the [Ryzen AI Developer Guide](https://ryzenai.docs.amd.com/en/latest). The IPU driver version >= 10.106.8.62 has been tested. The older version might work but no guaranteed. 
+Please note that all the steps mentioned here need to be performed in ***Windows CMD Prompt***. Make sure the NPU driver has been installed by following the instructions on the [Ryzen AI Developer Guide](https://ryzenai.docs.amd.com/en/latest). The NPU driver version = 32.0.201.204 has been tested. The older version might work but no guaranteed. 
 
 1. Follow these steps to install Anaconda on your system if it has not been installed:
 
@@ -82,27 +86,24 @@ Please note that all the steps mentioned here need to be performed in ***Windows
 
 - **Verify Installation:** After installation, open Anaconda Prompt on Windows and type `conda --version` to verify that Anaconda was installed correctly. You should see the installed Conda version.
 
-2. Create a Conda Environment by using the env.yaml
-    ```bash
-      conda create --name <env_name> --file=env.yaml
-    ```
+2. Install Ryzen AI by following the [documentation](https://ryzenai.docs.amd.com/en/latest/inst.html#) 
 
 3. Activate the Environment
     ```bash
     conda activate <env_name>
     ```
 ### 3.2 Demo Preparation
 
-1. Download the onnx models and test image/video package, and unzip it under **<path_to_RyzenAI-SW>/demo/multi-model-exec/ipu_modelsx4_demo/**. 
+Download the onnx models and test image/video package, and unzip it under **<path_to_RyzenAI-SW>/demo/multi-model-exec/ipu_modelsx4_demo/**. 
 
 
     [Download Package](https://www.xilinx.com/bin/public/openDownload?filename=resource_multi_model_demo.zip)
 
  You should have the directory like this: 
  ```bash
 .
-├── generate_script.py
-├── modelsx4_screenshot.png
+├── ***.bat
+├── config
 ├── resource
 │   ├── RetinaFace_int.onnx
 │   ├── detection
@@ -117,13 +118,6 @@ Please note that all the steps mentioned here need to be performed in ***Windows
 │   └── to_video.py
 ```
 
-2. Generate the config files by running the comand:
-
-    ```bash
-    python generate_script.py
-    ```
-
-
 
 ## 4 Run The Demo
 
@@ -149,6 +143,6 @@ run_modelx4.bat
 
 ## 5 Know Issues
 
-- Python version version 3.9 is required if not "The code execution cannot proceed because python39.dll was not found. Reinstalling he programm may fix this problem"
-- If you find an exclamation mark on the icon of the AMD IPU device in the System Devices list in your Device Manager, it indicates that there is an issue with your driver installation, and the program may not function correctly.
+- Python version version 3.10 is required if not "The code execution cannot proceed because python39.dll was not found. Reinstalling he programm may fix this problem"
+- If you find an exclamation mark on the icon of the AMD NPU device in the System Devices list in your Device Manager, it indicates that there is an issue with your driver installation, and the program may not function correctly.
 - If this demo aborted with the 'glog.dll cannot be found' error, you need to use the command 'set PATH=C:<path-to-conda-glog>;%PATH%' to explicitly export the path to 'glog.dll'. 'glog.dll' is installed along with ANACONDA3. The recommended ANACONDA3 installer is 'Anaconda3-2023.07-2-Windows-x86_64'.

demo/multi-model-exec/bin/vaip_config.json

@@ -0,0 +1,173 @@
+{
+    "passes": [
+        {
+            "name": "init",
+            "plugin": "vaip-pass_init"
+        },
+        {
+            "name": "fuse_DPU",
+            "plugin": "vaip-pass_level1_dpu",
+            "passDpuParam": {
+                "subPass": [
+                    {
+                        "name": "convert_ending_blacklist_ops_to_unknown_op",
+                        "plugin": "vaip-pass_convert_ending_blacklist_ops_to_unknown_op",
+                        "disabled": false
+                    },
+                    {
+                        "name": "dynamic_input_batch",
+                        "plugin": "vaip-pass_dynamic_input_batch"
+                    },
+                    {
+                        "name": "create_const_op",
+                        "plugin": "vaip-pass_create_const_op"
+                    },
+                    {
+                        "name": "convert_split_to_xir",
+                        "plugin": "vaip-pass_convert_split_to_xir_op"
+                    },
+                    {
+                        "name": "to_xir",
+                        "plugin": "vaip-pass_to_xir_ops"
+                    },
+                    {
+                        "name": "convert_pad",
+                        "plugin": "vaip-pass_convert_pad",
+                        "enableGc": true
+                    },
+                    {
+                        "name": "convert_in_to_gn",
+                        "plugin": "vaip-pass_convert_instancenorm_to_groupnorm",
+                        "enableGc": true
+                    },
+                    {
+                        "name": "remove_extra_q_dq",
+                        "plugin": "vaip-pass_remove_extra_q_dq"
+                    },
+                    {
+                        "name": "merge_add_into_conv_bias",
+                        "plugin": "vaip-pass_merge_add_into_conv_bias"
+                    },
+                    {
+                        "name": "merge_fix",
+                        "plugin": "vaip-pass_merge_fix",
+                        "enableGc": true
+                    },
+                    {
+                        "name": "layoutransform",
+                        "plugin": "vaip-pass_layout_transform_via_adding_transpose"
+                    },
+                    {
+                        "name": "gc_after_layout_transform",
+                        "plugin": "vaip-pass_remove_isolated_node"
+                    },
+                    {
+                        "name": "fuse_transpose",
+                        "plugin": "vaip-pass_fuse_transpose",
+                        "enableGc": true
+                    },
+                    {
+                        "name": "gc_after_fuse_transpose",
+                        "plugin": "vaip-pass_remove_isolated_node"
+                    },
+                    {
+                        "name": "remove_identity",
+                        "plugin": "vaip-pass_remove_identity",
+                        "logVerbosity": 1
+                    },
+                    {
+                        "name": "add_fix_after_const",
+                        "plugin": "vaip-pass_const_add_fix"
+                    },
+                    {
+                        "name": "remove_reshape_fix",
+                        "plugin": "vaip-pass_py_ext",
+                        "disabled": true,
+                        "pyExt": {
+                            "moduleName": "voe.passes.remove_reshape_fix",
+                            "methodName": "rules"
+                        }
+                    },
+                    {
+                        "name": "const_fold_batchnorm_to_scale",
+                        "plugin": "vaip-pass_const_fold_batchnorm_to_scale"
+                    },
+                    {
+                        "name": "const_fold_transpose",
+                        "plugin": "vaip-pass_const_fold_transpose"
+                    },
+                    {
+                        "name": "merge_pad",
+                        "plugin": "vaip-pass_merge_pad"
+                    },
+                    {
+                        "name": "merge_hard_sigmoid",
+                        "plugin": "vaip-pass_merge_hard_sigmoid"
+                    },
+                    {
+                        "name": "merge_mul",
+                        "plugin": "vaip-pass_merge_mul",
+                        "enableGc": true
+                    },
+                    {
+                        "name": "merge_consecutive_fix",
+                        "plugin": "vaip-pass_merge_consecutive_fix",
+                        "disabled": true,
+                        "enableLog": true,
+                        "logVerbosity": 1
+                    },
+                    {
+                        "_comment": "test case 110",
+                        "name": "convert_softmax_to_hard_softmax",
+                        "plugin": "vaip-pass_convert_softmax_to_hard_softmax",
+                        "disabled": true
+                    },
+                    {
+                        "name": "merge_fix_fix_transpose",
+                        "plugin": "vaip-pass_merge_fix_fix_transpose",
+                        "enableGc": true,
+                        "disabled": true
+                    },
+                    {
+                        "name": "final_gc",
+                        "plugin": "vaip-pass_remove_isolated_node"
+                    }
+                ],
+                "xcompilerAttrs": {
+                    "debug_mode": {
+                        "stringValue": "performance"
+                    },
+                    "dpu_subgraph_num": {
+                        "uintValue": 32
+                    },
+                    "opt_level": {
+                        "uintValue": 0
+                    },
+                    "dump_subgraph_ops": {
+                        "boolValue": false
+                    },
+                    "profile": {
+                        "uintValue": 0
+                    },
+                    "disable_std_quant": {
+                        "boolValue": false
+                    },
+                    "enable_fast_pm": {
+                        "boolValue": true
+                    }
+                },
+                "minimum_num_of_conv": 2
+            }
+        }
+    ],
+    "target": "RyzenAI_vision_config_1",
+    "targets": [
+        {
+            "name": "RyzenAI_vision_config_1",
+            "pass": [
+                "init",
+                "fuse_DPU"
+            ]
+        }
+    ]
+}