first round

Author: fs-eire

include/onnxruntime/ep/adapter/op_kernel.h

@@ -64,7 +64,9 @@ struct OpKernel {
 /// An adapter class partially implementing the facade of `onnxruntime::OpKernelContext`.
 /// </summary>
 struct OpKernelContext {
-  explicit OpKernelContext(OrtKernelContext* context, const OpKernel& op_kernel) : context_{context}, op_kernel_{op_kernel} {
+  explicit OpKernelContext(OrtKernelContext* context, const OpKernel& op_kernel) : context_{context},
+                                                                                   op_kernel_{op_kernel},
+                                                                                   constant_input_tensors_{op_kernel.Info().GetConstantInputTensors()} {
     input_tensors_.resize(InputCount());
     output_tensors_.resize(OutputCount());
   }
@@ -79,6 +81,10 @@ struct OpKernelContext {
       return static_cast<const T*>(input_tensors_[index].get());
     }
 
+    if (index < constant_input_tensors_.size() && constant_input_tensors_[index] != nullptr) {
+      return static_cast<const T*>(constant_input_tensors_[index].get());
+    }
+
     auto input = context_.GetInput(index);
     if (input == nullptr || !input.IsTensor()) {
       return nullptr;
@@ -126,6 +132,7 @@ struct OpKernelContext {
   ORT_DISALLOW_COPY_ASSIGNMENT_AND_MOVE(OpKernelContext);
   Ort::KernelContext context_;
   const OpKernel& op_kernel_;
+  const std::vector<std::unique_ptr<Tensor>>& constant_input_tensors_;
   mutable std::vector<std::unique_ptr<Tensor>> input_tensors_;
   std::vector<std::unique_ptr<Tensor>> output_tensors_;
 };

include/onnxruntime/ep/adapter/op_kernel_info.h

@@ -81,6 +81,10 @@ struct OpKernelInfo {
     return info_.GetInputCount();
   }
 
+  const std::vector<std::unique_ptr<Tensor>>& GetConstantInputTensors() const noexcept {
+    return cache_->constant_input_tensors;
+  }
+
   bool TryGetConstantInput(int input_index, const Tensor** constant_input_value) const {
     if (input_index < 0 || static_cast<size_t>(input_index) >= cache_->constant_input_tensors.size()) {
       return false;

include/onnxruntime/ep/adapter/tensor_helper.h

@@ -23,12 +23,12 @@ inline std::unique_ptr<onnxruntime::Tensor> CreateTensorFromApiValue(const OrtVa
   Ort::ConstValue value{ort_value};
   EP_ENFORCE(value.IsTensor(), "Only tensor OrtValue is supported.");
 
-  auto type_and_shape_info = value.GetTypeInfo().GetTensorTypeAndShapeInfo();
-  auto type = type_and_shape_info.GetElementType();
-  auto shape_vec = type_and_shape_info.GetShape();
+  ONNXTensorElementDataType element_type;
+  Ort::Value::Shape shape{};
+  value.GetTensorElementTypeAndShapeDataReference(element_type, shape);
 
   auto memory_info = value.GetTensorMemoryInfo();
-  MLDataType data_type = DataTypeImpl::TensorTypeFromONNXEnum(type)->GetElementType();
+  MLDataType data_type = DataTypeImpl::TensorTypeFromONNXEnum(element_type)->GetElementType();
 
   OrtMemoryInfo tensor_memory_info{memory_info.GetAllocatorName(),
                                    memory_info.GetAllocatorType(),
@@ -42,7 +42,7 @@ inline std::unique_ptr<onnxruntime::Tensor> CreateTensorFromApiValue(const OrtVa
                                    memory_info.GetMemoryType()};
 
   return std::make_unique<Tensor>(data_type,
-                                  TensorShape{shape_vec},
+                                  TensorShape{shape.shape, shape.shape_len},
                                   const_cast<void*>(value.GetTensorRawData()),
                                   tensor_memory_info);
 }