saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-29 20:14:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build break from removing custom ORT onnx protobuf (#4904)

Browse source 
Exclude parsing of json config in model (also excludes json parsing library)
This commit is contained in:
Scott McKay 2020-08-25 18:10:42 +10:00 committed by GitHub
parent 71d8846635
commit 14c691030f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/onnxruntime/core/graph/onnx_protobuf.h
View file

@ -46,6 +46,8 @@ class OpSchema {};
#endif
#include "onnx/onnx_pb.h"
#include "onnx/onnx-operators_pb.h"
#ifdef __GNUC__
#pragma GCC diagnostic pop
#else

4
onnxruntime/core/framework/execution_provider.cc
View file

@ -40,13 +40,13 @@ IExecutionProvider::GetCapability(const onnxruntime::GraphViewer& graph,
}
}
}
return result;
#else
ORT_UNUSED_PARAMETER(graph);
ORT_UNUSED_PARAMETER(kernel_registries);
ORT_NOT_IMPLEMENTED("IExecutionProvider::GetCapability is not supported in this build.");
#endif
return result;
}
common::Status IExecutionProvider::Sync() const { return Status::OK(); };

6
onnxruntime/core/session/inference_session_utils.cc
View file

@ -1,6 +1,8 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
#if !defined(ORT_MINIMAL_BUILD)
#include "core/session/inference_session_utils.h"
namespace onnxruntime {
@ -36,7 +38,7 @@ static Status SetInterOpNumThreads(SessionOptions& session_options,
}
LOGS(logger, INFO) << "Setting inter_op_num_threads to " << value;
session_options.inter_op_param.thread_pool_size= value;
session_options.inter_op_param.thread_pool_size = value;
return Status::OK();
}
@ -220,3 +222,5 @@ Status InferenceSessionUtils::ParseRunOptionsFromModelProto(RunOptions& /*run_op
}
} // namespace onnxruntime
#endif // !defined(ORT_MINIMAL_BUILD)

10
onnxruntime/core/session/inference_session_utils.h
View file

@ -2,10 +2,18 @@
// Licensed under the MIT License.
#pragma once
// Currently everything here is unused in a minimal build.
// Leaving the file included in case there are other InferenceSession utils needed in a minimal build, as this would
// be the best place to add them.
#if !defined(ORT_MINIMAL_BUILD)
#include "core/graph/onnx_protobuf.h"
#include "core/session/inference_session.h"
#include "core/framework/session_options.h"
#include "core/common/common.h"
#ifdef _WIN32
#pragma warning(push)
#pragma warning(disable : 28020)
@ -53,3 +61,5 @@ class InferenceSessionUtils {
};
} // namespace onnxruntime
#endif // !defined(ORT_MINIMAL_BUILD)