Get value or default value in case of std::optional

Signed-off-by: Bogdan Pereanu <bogdan.pereanu@intel.com>

Author: pereanub

src/plugins/intel_npu/src/backend/src/zero_infer_request.cpp

@@ -793,7 +793,7 @@ void ZeroInferRequest::add_state(const IODescriptor& descriptor, size_t tensorIn
                                                                   descriptor.nameFromCompiler,
                                                                   get_user_input(tensorIndex),
                                                                   tensorIndex,
-                                                                  *descriptor.relatedDescriptorIndex,
+                                                                  descriptor.relatedDescriptorIndex.value(),
                                                                   _config));
 }
 

src/plugins/intel_npu/src/plugin/src/remote_context.cpp

@@ -62,13 +62,13 @@ ov::SoPtr<ov::IRemoteTensor> RemoteContextImpl::create_tensor(const ov::element:
     }
 
     // Merge local remote properties with global remote properties.
-    if (!mem_type_object.has_value()) {
+    if (!mem_type_object.has_value() && _mem_type_object.has_value()) {
         mem_type_object = _mem_type_object;
     }
-    if (!tensor_type_object.has_value()) {
+    if (!tensor_type_object.has_value() && _tensor_type_object.has_value()) {
         tensor_type_object = _tensor_type_object;
     }
-    if (!mem_handle_object.has_value()) {
+    if (!mem_handle_object.has_value() && _mem_handle_object.has_value()) {
         mem_handle_object = _mem_handle_object;
     }
 
@@ -82,27 +82,25 @@ ov::SoPtr<ov::IRemoteTensor> RemoteContextImpl::create_tensor(const ov::element:
     }
 
     // Mem_handle shall be set if mem_type is a shared memory type.
-    if (*mem_type_object == MemType::SHARED_BUF && !mem_handle_object.has_value()) {
+    if (mem_type_object.value() == MemType::SHARED_BUF && !mem_handle_object.has_value()) {
         OPENVINO_THROW("No parameter ", mem_handle.name(), " found in parameters map");
     }
 
-    return _device->createRemoteTensor(
-        get_this_shared_ptr(),
-        type,
-        shape,
-        _config,
-        tensor_type_object.has_value() ? *tensor_type_object : ov::intel_npu::TensorType::BINDED,
-        *mem_type_object,
-        *mem_handle_object);
+    return _device->createRemoteTensor(get_this_shared_ptr(),
+                                       type,
+                                       shape,
+                                       _config,
+                                       tensor_type_object.value_or(ov::intel_npu::TensorType::BINDED),
+                                       mem_type_object.value_or(ov::intel_npu::MemType::L0_INTERNAL_BUF),
+                                       mem_handle_object.value_or(nullptr));
 }
 
 ov::SoPtr<ov::ITensor> RemoteContextImpl::create_host_tensor(const ov::element::Type type, const ov::Shape& shape) {
-    return _device->createHostTensor(
-        get_this_shared_ptr(),
-        type,
-        shape,
-        _config,
-        _tensor_type_object.has_value() ? *_tensor_type_object : ov::intel_npu::TensorType::BINDED);
+    return _device->createHostTensor(get_this_shared_ptr(),
+                                     type,
+                                     shape,
+                                     _config,
+                                     _tensor_type_object.value_or(ov::intel_npu::TensorType::BINDED));
 }
 
 const std::string& RemoteContextImpl::get_device_name() const {