@@ -104,7 +104,11 @@ class TensorHybrid : public facebook::jni::HybridClass<TensorHybrid> {
104104 }
105105
106106 static TensorPtr newTensorFromJTensor (
107- facebook::jni::alias_ref<TensorHybrid::javaobject> jtensor) {
107+ facebook::jni::alias_ref<TensorHybrid::javaobject> jtensor);
108+
109+ static TensorPtr newTensorFromJTensor (
110+ facebook::jni::alias_ref<TensorHybrid::javaobject> jtensor,
111+ std::vector<executorch::aten::DimOrderType> dim_order) {
108112 static auto cls = TensorHybrid::javaClassStatic ();
109113 static const auto dtypeMethod = cls->getMethod <jint ()>(" dtypeJniCode" );
110114 jint jdtype = dtypeMethod (jtensor);
@@ -163,14 +167,25 @@ class TensorHybrid : public facebook::jni::HybridClass<TensorHybrid> {
163167 static_cast <uint32_t >(Error::InvalidArgument), ss.str ().c_str ());
164168 return nullptr ;
165169 }
166- return from_blob (
170+ auto tensor = for_blob (
167171 jni->GetDirectBufferAddress (jbuffer.get ()), shape_vec, scalar_type);
172+ if (!dim_order.empty () && dim_order.size () == shape_vec.size ()) {
173+ return std::move (tensor)
174+ .dim_order (std::move (dim_order))
175+ .make_tensor_ptr ();
176+ }
177+ return std::move (tensor).make_tensor_ptr ();
168178 }
169179
170180 private:
171181 friend HybridBase;
172182};
173183
184+ TensorPtr TensorHybrid::newTensorFromJTensor (
185+ facebook::jni::alias_ref<TensorHybrid::javaobject> jtensor) {
186+ return newTensorFromJTensor (jtensor, {});
187+ }
188+
174189class JEValue : public facebook ::jni::JavaClass<JEValue> {
175190 public:
176191 constexpr static const char * kJavaDescriptor =
@@ -227,7 +242,11 @@ class JEValue : public facebook::jni::JavaClass<JEValue> {
227242 }
228243
229244 static TensorPtr JEValueToTensorImpl (
230- facebook::jni::alias_ref<JEValue> JEValue) {
245+ facebook::jni::alias_ref<JEValue> JEValue);
246+
247+ static TensorPtr JEValueToTensorImpl (
248+ facebook::jni::alias_ref<JEValue> JEValue,
249+ std::vector<executorch::aten::DimOrderType> dim_order) {
231250 static const auto typeCodeField =
232251 JEValue::javaClassStatic ()->getField <jint>(" mTypeCode" );
233252 const auto typeCode = JEValue->getFieldValue (typeCodeField);
@@ -237,7 +256,7 @@ class JEValue : public facebook::jni::JavaClass<JEValue> {
237256 ->getMethod <facebook::jni::alias_ref<TensorHybrid::javaobject>()>(
238257 " toTensor" );
239258 auto jtensor = jMethodGetTensor (JEValue);
240- return TensorHybrid::newTensorFromJTensor (jtensor);
259+ return TensorHybrid::newTensorFromJTensor (jtensor, std::move (dim_order) );
241260 }
242261 std::stringstream ss;
243262 ss << " Unknown EValue typeCode: " << typeCode;
@@ -247,6 +266,11 @@ class JEValue : public facebook::jni::JavaClass<JEValue> {
247266 }
248267};
249268
269+ TensorPtr JEValue::JEValueToTensorImpl (
270+ facebook::jni::alias_ref<JEValue> JEValue) {
271+ return JEValueToTensorImpl (JEValue, {});
272+ }
273+
250274class ExecuTorchJni : public facebook ::jni::HybridClass<ExecuTorchJni> {
251275 private:
252276 friend HybridBase;
@@ -458,14 +482,32 @@ class ExecuTorchJni : public facebook::jni::HybridClass<ExecuTorchJni> {
458482 std::vector<EValue> evalues;
459483 std::vector<TensorPtr> tensors;
460484
485+ auto method_meta = module_->method_meta (method);
486+ if (!method_meta.ok ()) {
487+ executorch::jni_helper::throwExecutorchException (
488+ static_cast <uint32_t >(method_meta.error ()),
489+ " Failed to get metadata for method: " + method);
490+ return {};
491+ }
492+
461493 static const auto typeCodeField =
462494 JEValue::javaClassStatic ()->getField <jint>(" mTypeCode" );
463495
464496 for (int i = 0 ; i < jinputs->size (); i++) {
465497 auto jevalue = jinputs->getElement (i);
466498 const auto typeCode = jevalue->getFieldValue (typeCodeField);
467499 if (typeCode == JEValue::kTypeCodeTensor ) {
468- tensors.emplace_back (JEValue::JEValueToTensorImpl (jevalue));
500+ auto tensor_meta = method_meta->input_tensor_meta (i);
501+ if (!tensor_meta.ok ()) {
502+ executorch::jni_helper::throwExecutorchException (
503+ static_cast <uint32_t >(tensor_meta.error ()),
504+ " Failed to get tensor metadata for input " + std::to_string (i) +
505+ " of method: " + method);
506+ return {};
507+ }
508+ const auto expected_dim_order = tensor_meta->dim_order ();
509+ tensors.emplace_back (JEValue::JEValueToTensorImpl (
510+ jevalue, {expected_dim_order.begin (), expected_dim_order.end ()}));
469511 evalues.emplace_back (tensors.back ());
470512 } else if (typeCode == JEValue::kTypeCodeInt ) {
471513 static const auto toIntMethod =
0 commit comments