Merge main again

include/onnxruntime/core/session/onnxruntime_cxx_api.h

@@ -641,12 +641,7 @@ ORT_DEFINE_RELEASE(ThreadingOptions);
 ORT_DEFINE_RELEASE(TypeInfo);
 ORT_DEFINE_RELEASE(Value);
 ORT_DEFINE_RELEASE(ValueInfo);
-ORT_DEFINE_RELEASE(Node);
-ORT_DEFINE_RELEASE(Graph);
-ORT_DEFINE_RELEASE(Model);
-ORT_DEFINE_RELEASE(KeyValuePairs);
-ORT_DEFINE_RELEASE(PrepackedWeightsContainer);
-ORT_DEFINE_RELEASE(ExternalInitializerInfo);
+
 ORT_DEFINE_RELEASE_FROM_API_STRUCT(ModelCompilationOptions, GetCompileApi);
 ORT_DEFINE_RELEASE_FROM_API_STRUCT(EpDevice, GetEpApi);
 

include/onnxruntime/core/session/onnxruntime_cxx_inline.h

@@ -3535,77 +3535,4 @@ inline Model::Model(const std::vector<DomainOpsetPair>& opsets) {
 }
 #endif
 
-inline ValueInfo::ValueInfo(const std::string& name, const ConstTypeInfo& type_info) {
-  ThrowOnError(GetModelEditorApi().CreateValueInfo(name.c_str(), type_info, &p_));
-}
-#endif  // !defined(ORT_MINIMAL_BUILD)
-
-namespace detail {
-template <>
-inline std::string ValueInfoImpl<OrtValueInfo>::Name() const {
-  const char* name = nullptr;
-  ThrowOnError(GetApi().GetValueInfoName(this->p_, &name));
-  return name;
-}
-
-template <>
-inline ConstTypeInfo ValueInfoImpl<OrtValueInfo>::TypeInfo() const {
-  const OrtTypeInfo* type_info = nullptr;
-  ThrowOnError(GetApi().GetValueInfoTypeInfo(this->p_, &type_info));
-  return ConstTypeInfo{type_info};
-}
-
-#if !defined(ORT_MINIMAL_BUILD)
-template <>
-inline void GraphImpl<OrtGraph>::SetInputs(std::vector<ValueInfo>& inputs) {
-  std::vector<OrtValueInfo*> inputs_ptrs;
-  inputs_ptrs.reserve(inputs.size());
-  std::transform(inputs.begin(), inputs.end(), std::back_inserter(inputs_ptrs),
-                 [](ValueInfo& vi) -> OrtValueInfo* { return vi; });
-
-  ThrowOnError(GetModelEditorApi().SetGraphInputs(p_, inputs_ptrs.data(), inputs_ptrs.size()));
-
-  // Graph now owns the inputs
-  std::for_each(inputs.begin(), inputs.end(), [](ValueInfo& vi) { vi.release(); });
-}
-
-template <>
-inline void GraphImpl<OrtGraph>::SetOutputs(std::vector<ValueInfo>& outputs) {
-  std::vector<OrtValueInfo*> outputs_ptrs;
-  outputs_ptrs.reserve(outputs.size());
-  std::transform(outputs.begin(), outputs.end(), std::back_inserter(outputs_ptrs),
-                 [](ValueInfo& vi) -> OrtValueInfo* { return vi; });
-
-  ThrowOnError(GetModelEditorApi().SetGraphOutputs(p_, outputs_ptrs.data(), outputs_ptrs.size()));
-
-  // Graph now owns the outputs
-  std::for_each(outputs.begin(), outputs.end(), [](ValueInfo& vi) { vi.release(); });
-}
-
-template <>
-inline void GraphImpl<OrtGraph>::AddInitializer(const std::string& name, Value& initializer, bool data_is_external) {
-  // Graph takes ownership of `initializer`
-  ThrowOnError(GetModelEditorApi().AddInitializerToGraph(p_, name.c_str(), initializer.release(), data_is_external));
-}
-
-template <>
-inline void GraphImpl<OrtGraph>::AddNode(Node& node) {
-  // Graph takes ownership of `node`
-  ThrowOnError(GetModelEditorApi().AddNodeToGraph(p_, node.release()));
-}
-
-template <typename T>
-inline ModelMetadata GraphImpl<T>::GetModelMetadata() const {
-  OrtModelMetadata* out;
-  ThrowOnError(GetApi().Graph_GetModelMetadata(this->p_, &out));
-  return ModelMetadata{out};
-}
-
-template <>
-inline void ModelImpl<OrtModel>::AddGraph(Graph& graph) {
-  // Model takes ownership of `graph`
-  ThrowOnError(GetModelEditorApi().AddGraphToModel(p_, graph.release()));
-}
-#endif  // !defined(ORT_MINIMAL_BUILD)
-}  // namespace detail
 }  // namespace Ort