Merge branch 'main' into iproc

microsoft · Jun 20, 2024 · b0feca4 · b0feca4
2 parents c68b3c6 + 58b5523
commit b0feca4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/include/ort_c_to_cpp.h b/include/ort_c_to_cpp.h
@@ -343,8 +343,8 @@ struct BaseKernel {
   OrtErrorCode GetErrorCodeAndRelease(OrtStatusPtr status) const noexcept;
 
   const OrtApi& api_;
-  OrtW::CustomOpApi ort_;
   const OrtKernelInfo& info_;
+  OrtW::CustomOpApi ort_;
 };
 
 // Deprecated: Use OrtW::CustomOpApi::KernelInfoGetAttribute instead

diff --git a/shared/api/image_processor.cc b/shared/api/image_processor.cc
@@ -97,7 +97,9 @@ OrtxStatus ImageProcessor::Init(std::string_view processor_def) {
   return {};
 }
 
-ImageProcessor::ImageProcessor() : allocator_(&CppAllocator::Instance()), OrtxObjectImpl(kOrtxKindProcessor) {}
+ImageProcessor::ImageProcessor()
+    : OrtxObjectImpl(kOrtxKindProcessor), allocator_(&CppAllocator::Instance()) {
+}
 
 template <typename T>
 static ortc::Tensor<T>* StackTensor(const std::vector<TensorArgs>& arg_lists, int axis, ortc::IAllocator* allocator) {

diff --git a/shared/api/runner.hpp b/shared/api/runner.hpp
@@ -310,8 +310,8 @@ class OrtxRunner {
   }
 
  private:
-  std::vector<Operation*> ops_;
   ortc::IAllocator* allocator_;
+  std::vector<Operation*> ops_;
 };
 
 }  // namespace ort_extensions