Improve the condition for device=GPU and qdq stripping enabled (#705)

* make the condition stricter for gpu

Signed-off-by: bfilipek <bartlomiej.filipek@intel.com>

* corrected form

* improve the condition, allow int16 types when qdq stripping enabled

Signed-off-by: bfilipek <bartlomiej.filipek@intel.com>

* revert wrongly commited file

Signed-off-by: bfilipek <bartlomiej.filipek@intel.com>

---------

Signed-off-by: bfilipek <bartlomiej.filipek@intel.com>

Author: intbf

onnxruntime/core/providers/openvino/ov_versions/capability.cc

@@ -34,10 +34,13 @@ GetCapability::GetCapability(const EPCtxHandler& ep_ctx_handler,
                                                                 graph_viewer_(graph_viewer_param),
                                                                 device_type_(std::move(device_type_param)) {
   bool npu_qdq_optimizer_enabled = false;
-  if (device_type_.find("NPU") != std::string::npos || device_type_.find("GPU") != std::string::npos) {
+  if (device_type_.find("NPU") != std::string::npos) {
     device_type_ = "CPU";
     if (enable_qdq_optimizer) npu_qdq_optimizer_enabled = true;
+  } else if (enable_qdq_optimizer && device_type_.find("GPU") != std::string::npos) {
+    npu_qdq_optimizer_enabled = true;   // see data_ops.cc ~615 where we check for int16 types for gpu, this may change to a better approach later
   }
+
 #if OPENVINO_VERSION_MAJOR == 2024 && OPENVINO_VERSION_MINOR == 5
   data_ops_ = new DataOps(graph_viewer_, V_2024_5, device_type_, npu_qdq_optimizer_enabled);
 #elif OPENVINO_VERSION_MAJOR == 2024 && OPENVINO_VERSION_MINOR == 6

onnxruntime/core/providers/openvino/ov_versions/data_ops.cc

@@ -612,6 +612,9 @@ bool DataOps::type_is_supported(const NodeArg* node_arg, bool is_initializer) {
             (var.second == dtype)) {
           return true;
         }
+        // experimentally for GPU and qdq stripping mode allow int16 types
+        if (npu_qdq_optimizer_enabled_ && (dtype == ONNX_NAMESPACE::TensorProto_DataType::TensorProto_DataType_INT16 || dtype == ONNX_NAMESPACE::TensorProto_DataType::TensorProto_DataType_UINT16))
+            return true;
       }
 #ifndef NDEBUG
       if (openvino_ep::backend_utils::IsDebugEnabled()) {