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

Merge fixes

Browse source
This commit is contained in:
Jeff Bloomfield 2020-01-13 17:58:02 -08:00
parent 36bc7c2b3e
commit 3e8768d1b8
6 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
onnxruntime/core/providers/dml/DmlExecutionProvider/src/ExecutionProvider.h
View file

@ -170,7 +170,7 @@ namespace Dml
std::shared_ptr<CPUAllocator> m_cpuInputAllocator;
std::shared_ptr<CPUAllocator> m_cpuOutputAllocator;
std::shared_ptr<onnxruntime::KernelRegistry> m_kernelRegistry;
std::shared_ptr<const winrt::Windows::AI::MachineLearning::implementation::InternalRegistrationInfoMap> m_internalRegInfoMap;
std::shared_ptr<const Windows::AI::MachineLearning::Adapter::InternalRegistrationInfoMap> m_internalRegInfoMap;
mutable uint64_t m_partitionKernelPrefixVal = 0;
bool m_closed = false;

2
onnxruntime/core/providers/dml/DmlExecutionProvider/src/GraphDescBuilder.h
View file

@ -9,7 +9,7 @@ namespace Dml
{
struct GraphNodeProperties
{
std::shared_ptr<const winrt::Windows::AI::MachineLearning::implementation::InternalRegistrationInfo>
std::shared_ptr<const Windows::AI::MachineLearning::Adapter::InternalRegistrationInfo>
internalRegInfo;
// These are currently passed from the partitioning step since the only DML operators current

4
onnxruntime/core/providers/dml/DmlExecutionProvider/src/GraphPartitioner.h
View file

@ -43,7 +43,7 @@ namespace Dml
std::vector<std::unique_ptr<GraphPartition>>
BuildPartitions(
const onnxruntime::GraphViewer& graph,
const winrt::Windows::AI::MachineLearning::implementation::InternalRegistrationInfoMap& internalRegInfoMap,
const Windows::AI::MachineLearning::Adapter::InternalRegistrationInfoMap& internalRegInfoMap,
const std::vector<const onnxruntime::KernelRegistry*>& registries,
uint32_t supportedDeviceDataTypeMask, // Each bit corresponds to each DML_TENSOR_DATA_TYPE.
std::unordered_map<const onnxruntime::Node*, GraphNodeProperties>& graphNodePropertyMap,
@ -53,7 +53,7 @@ namespace Dml
std::vector<std::unique_ptr<onnxruntime::ComputeCapability>>
PartitionGraph(
const onnxruntime::GraphViewer& graph,
const winrt::Windows::AI::MachineLearning::implementation::InternalRegistrationInfoMap& internalRegInfoMap,
const Windows::AI::MachineLearning::Adapter::InternalRegistrationInfoMap& internalRegInfoMap,
const std::vector<const onnxruntime::KernelRegistry*>& registries,
uint32_t supportedDeviceDataTypeMask, // Each bit corresponds to each DML_TENSOR_DATA_TYPE.
onnxruntime::KernelRegistry* registryForPartitionKernels,

2
onnxruntime/core/providers/dml/OperatorAuthorHelper/SchemaInferenceOverrider.h
View file

@ -80,7 +80,7 @@ OverrideSchemaInferenceFunction<OperatorHelper::ShapeInferenceHelper_##shapeInfe
OVERRIDE_SCHEMA( 7, true, Crop);
OVERRIDE_SCHEMA( 7, false, Upsample);
OVERRIDE_SCHEMA_EX( 9, true, Upsample, Resize, 1); // Upsample v9 uses Resize's shape inference function.
OVERRIDE_SCHEMA( 7, true, Slice);
OVERRIDE_SCHEMA_EX( 7, true, Slice, Slice7);
OVERRIDE_SCHEMA( 7, true, Split);
OVERRIDE_SCHEMA_EX( 7, true, Tile, Tile, 1);
OVERRIDE_SCHEMA_EX( 8, true, Expand, Expand, 1);

4
winml/adapter/AbiCustomRegistryImpl.cpp
View file

@ -43,13 +43,14 @@ HRESULT STDMETHODCALLTYPE AbiCustomRegistryImpl::RegisterOperatorKernel(
const MLOperatorKernelDescription* opKernel,
IMLOperatorKernelFactory* operatorKernelFactory,
_In_opt_ IMLOperatorShapeInferrer* shapeInferrer) const noexcept {
return RegisterOperatorKernel(opKernel, operatorKernelFactory, shapeInferrer, false, false, false);
return RegisterOperatorKernel(opKernel, operatorKernelFactory, shapeInferrer, nullptr, false, false, false);
}
HRESULT STDMETHODCALLTYPE AbiCustomRegistryImpl::RegisterOperatorKernel(
const MLOperatorKernelDescription* opKernel,
IMLOperatorKernelFactory* operatorKernelFactory,
_In_opt_ IMLOperatorShapeInferrer* shapeInferrer,
_In_opt_ IMLOperatorSupportQueryPrivate* supportQuery,
bool isInternalOperator,
bool canAliasFirstInput,
bool supportsGraph,
@ -72,6 +73,7 @@ HRESULT STDMETHODCALLTYPE AbiCustomRegistryImpl::RegisterOperatorKernel(
opKernel,
operatorKernelFactory,
shapeInferrer,
supportQuery,
isInternalOperator,
canAliasFirstInput,
supportsGraph,

1
winml/adapter/AbiCustomRegistryImpl.h
View file

@ -23,6 +23,7 @@ class AbiCustomRegistryImpl : public AbiCustomRegistry {
const MLOperatorKernelDescription* operator_kernel,
IMLOperatorKernelFactory* operator_kernel_factory,
_In_opt_ IMLOperatorShapeInferrer* shape_inferrer,
_In_opt_ IMLOperatorSupportQueryPrivate* supportQuery,
bool is_internal_operator,
bool can_alias_first_input,
bool supports_graph,