From 301d407b39daf87bbf17334c08018caac8763805 Mon Sep 17 00:00:00 2001 From: Paul McDaniel Date: Wed, 27 Nov 2019 15:50:49 -0800 Subject: [PATCH] Layer dev paulm (#2507) * commetns for dml graph transformer fixed ort value passing using the allocatir info * fixed and coded maps and sequences across the abi * cleaned up w4's cleaned up the model info ABI delayload directml.dll from winml * cleaned up namepsace aliases. renamed _winmla to winmla this was good PR feedback from tiago a while back. --- winml/dll/module.cpp | 2 +- winml/lib/Api.Core/CpuOrtSessionBuilder.cpp | 8 ++--- winml/lib/Api.Core/CpuOrtSessionBuilder.h | 6 ++-- winml/lib/Api.Core/DmlOrtSessionBuilder.cpp | 8 ++--- winml/lib/Api.Core/DmlOrtSessionBuilder.h | 6 ++-- .../lib/Api.Core/FeatureDescriptorFactory.cpp | 2 +- winml/lib/Api.Core/LotusEnvironment.cpp | 14 ++++---- winml/lib/Api.Core/inc/WinMLAdapter.h | 23 ------------- winml/lib/Api/ImageFeatureValue.cpp | 6 ++-- winml/lib/Api/LearningModel.cpp | 10 +++--- winml/lib/Api/LearningModel.h | 33 ++++++------------- winml/lib/Api/LearningModelBinding.cpp | 3 +- winml/lib/Api/LearningModelBinding.h | 2 +- winml/lib/Api/LearningModelSession.cpp | 20 +++++------ winml/lib/Api/LearningModelSession.h | 8 ++--- winml/lib/Api/impl/MapBase.h | 2 +- winml/lib/Api/impl/SequenceBase.h | 4 +-- winml/lib/Api/impl/Tensor.h | 8 ++--- winml/lib/Api/impl/TensorBase.h | 2 +- .../Api/impl/TensorMemoryBufferReference.h | 4 +-- winml/lib/Common/inc/NamespaceAliases.h | 6 ++-- 21 files changed, 71 insertions(+), 106 deletions(-) diff --git a/winml/dll/module.cpp b/winml/dll/module.cpp index a4203a2530..b00483d2f5 100644 --- a/winml/dll/module.cpp +++ b/winml/dll/module.cpp @@ -67,7 +67,7 @@ extern "C" BOOL WINAPI DllMain(_In_ HINSTANCE hInstance, DWORD dwReason, _In_ vo extern "C" HRESULT WINAPI MLCreateOperatorRegistry(_COM_Outptr_ IMLOperatorRegistry** registry) try { *registry = nullptr; - winrt::com_ptr<_winmla::IWinMLAdapter> adapter; + winrt::com_ptr adapter; WINML_THROW_IF_FAILED(OrtGetWinMLAdapter(adapter.put())); return adapter->GetCustomRegistry(registry); } diff --git a/winml/lib/Api.Core/CpuOrtSessionBuilder.cpp b/winml/lib/Api.Core/CpuOrtSessionBuilder.cpp index 0e691aabce..5b12eaf920 100644 --- a/winml/lib/Api.Core/CpuOrtSessionBuilder.cpp +++ b/winml/lib/Api.Core/CpuOrtSessionBuilder.cpp @@ -56,7 +56,7 @@ CpuOrtSessionBuilder::CreateSessionOptions( HRESULT CpuOrtSessionBuilder::CreateSession( OrtSessionOptions* options, - _winmla::IInferenceSession** p_session, + winmla::IInferenceSession** p_session, onnxruntime::IExecutionProvider** pp_provider) { RETURN_HR_IF_NULL(E_POINTER, p_session); RETURN_HR_IF_NULL(E_POINTER, pp_provider); @@ -79,15 +79,15 @@ CpuOrtSessionBuilder::CreateSession( ORT_THROW_IF_ERROR(session->RegisterExecutionProvider(std::move(cpu_provider))); // assign the session to the out parameter - auto sessionptr = wil::MakeOrThrow<_winmla::InferenceSession>(session.release()); - RETURN_IF_FAILED(sessionptr.CopyTo(_uuidof(_winmla::IInferenceSession), (void**)p_session)); + auto sessionptr = wil::MakeOrThrow(session.release()); + RETURN_IF_FAILED(sessionptr.CopyTo(_uuidof(winmla::IInferenceSession), (void**)p_session)); return S_OK; } HRESULT CpuOrtSessionBuilder::Initialize( - _winmla::IInferenceSession* p_session, + winmla::IInferenceSession* p_session, onnxruntime::IExecutionProvider* /*p_provider*/ ) { ORT_THROW_IF_ERROR(p_session->get()->Initialize()); diff --git a/winml/lib/Api.Core/CpuOrtSessionBuilder.h b/winml/lib/Api.Core/CpuOrtSessionBuilder.h index 4151867638..51f52ba2ed 100644 --- a/winml/lib/Api.Core/CpuOrtSessionBuilder.h +++ b/winml/lib/Api.Core/CpuOrtSessionBuilder.h @@ -9,7 +9,7 @@ namespace Windows::AI::MachineLearning::Adapter { class CpuOrtSessionBuilder : public Microsoft::WRL::RuntimeClass < Microsoft::WRL::RuntimeClassFlags, - _winmla::IOrtSessionBuilder> { + winmla::IOrtSessionBuilder> { public: CpuOrtSessionBuilder(); @@ -19,11 +19,11 @@ class CpuOrtSessionBuilder : public Microsoft::WRL::RuntimeClass < HRESULT STDMETHODCALLTYPE CreateSession( OrtSessionOptions* options, - _winmla::IInferenceSession** p_session, + winmla::IInferenceSession** p_session, onnxruntime::IExecutionProvider** pp_provider) override; HRESULT STDMETHODCALLTYPE Initialize( - _winmla::IInferenceSession* p_session, + winmla::IInferenceSession* p_session, onnxruntime::IExecutionProvider* p_provider) override; }; diff --git a/winml/lib/Api.Core/DmlOrtSessionBuilder.cpp b/winml/lib/Api.Core/DmlOrtSessionBuilder.cpp index daf58d1609..24fa2cf8a8 100644 --- a/winml/lib/Api.Core/DmlOrtSessionBuilder.cpp +++ b/winml/lib/Api.Core/DmlOrtSessionBuilder.cpp @@ -106,7 +106,7 @@ Microsoft::WRL::ComPtr CreateDmlDevice(ID3D12Device* d3d12Device) { HRESULT DmlOrtSessionBuilder::CreateSession( OrtSessionOptions* options, - _winmla::IInferenceSession** p_session, + winmla::IInferenceSession** p_session, onnxruntime::IExecutionProvider** pp_provider) { RETURN_HR_IF_NULL(E_POINTER, p_session); RETURN_HR_IF_NULL(E_POINTER, pp_provider); @@ -126,14 +126,14 @@ HRESULT DmlOrtSessionBuilder::CreateSession( ORT_THROW_IF_ERROR(session->RegisterExecutionProvider(std::move(gpu_provider))); // assign the session to the out parameter - auto sessionptr = wil::MakeOrThrow<_winmla::InferenceSession>(session.release()); - RETURN_IF_FAILED(sessionptr.CopyTo(_uuidof(_winmla::IInferenceSession), (void**)p_session)); + auto sessionptr = wil::MakeOrThrow(session.release()); + RETURN_IF_FAILED(sessionptr.CopyTo(_uuidof(winmla::IInferenceSession), (void**)p_session)); return S_OK; } HRESULT DmlOrtSessionBuilder::Initialize( - _winmla::IInferenceSession* p_session, + winmla::IInferenceSession* p_session, onnxruntime::IExecutionProvider* p_provider) { RETURN_HR_IF_NULL(E_INVALIDARG, p_session); RETURN_HR_IF_NULL(E_INVALIDARG, p_provider); diff --git a/winml/lib/Api.Core/DmlOrtSessionBuilder.h b/winml/lib/Api.Core/DmlOrtSessionBuilder.h index ae3e04e04f..2dca9d4544 100644 --- a/winml/lib/Api.Core/DmlOrtSessionBuilder.h +++ b/winml/lib/Api.Core/DmlOrtSessionBuilder.h @@ -9,7 +9,7 @@ namespace Windows::AI::MachineLearning::Adapter { class DmlOrtSessionBuilder : public Microsoft::WRL::RuntimeClass < Microsoft::WRL::RuntimeClassFlags, - _winmla::IOrtSessionBuilder> { + winmla::IOrtSessionBuilder> { public: DmlOrtSessionBuilder(ID3D12Device* device, ID3D12CommandQueue* queue); @@ -19,11 +19,11 @@ class DmlOrtSessionBuilder : public Microsoft::WRL::RuntimeClass < HRESULT STDMETHODCALLTYPE CreateSession( OrtSessionOptions* options, - _winmla::IInferenceSession** p_session, + winmla::IInferenceSession** p_session, onnxruntime::IExecutionProvider** pp_provider) override; HRESULT STDMETHODCALLTYPE Initialize( - _winmla::IInferenceSession* p_session, + winmla::IInferenceSession* p_session, onnxruntime::IExecutionProvider* p_provider) override; private: diff --git a/winml/lib/Api.Core/FeatureDescriptorFactory.cpp b/winml/lib/Api.Core/FeatureDescriptorFactory.cpp index 9dbb0beb96..523314099d 100644 --- a/winml/lib/Api.Core/FeatureDescriptorFactory.cpp +++ b/winml/lib/Api.Core/FeatureDescriptorFactory.cpp @@ -473,7 +473,7 @@ GetTensorType( has_unsupported_image_metadata); if (is_tensor_improperly_annotated_as_image) { - TraceLoggingWrite(_winmla::winml_trace_logging_provider, + TraceLoggingWrite(winmla::winml_trace_logging_provider, "WinMLInputValidation", TraceLoggingKeyword(WINML_PROVIDER_KEYWORD_DEFAULT), TraceLoggingLevel(WINEVENT_LEVEL_WARNING), diff --git a/winml/lib/Api.Core/LotusEnvironment.cpp b/winml/lib/Api.Core/LotusEnvironment.cpp index 90d9c070c7..8c5ec57e8a 100644 --- a/winml/lib/Api.Core/LotusEnvironment.cpp +++ b/winml/lib/Api.Core/LotusEnvironment.cpp @@ -15,7 +15,7 @@ void Windows::AI::MachineLearning::CWinMLLogSink::SendImpl( switch (message.Severity()) { case (onnxruntime::logging::Severity::kFATAL): //Telemetry TraceLoggingWrite( - _winmla::winml_trace_logging_provider, + winmla::winml_trace_logging_provider, "WinMLLogSink", TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance), TraceLoggingKeyword(WINML_PROVIDER_KEYWORD_DEFAULT), @@ -29,7 +29,7 @@ void Windows::AI::MachineLearning::CWinMLLogSink::SendImpl( break; case (onnxruntime::logging::Severity::kERROR): //Telemetry TraceLoggingWrite( - _winmla::winml_trace_logging_provider, + winmla::winml_trace_logging_provider, "WinMLLogSink", TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance), TraceLoggingKeyword(WINML_PROVIDER_KEYWORD_DEFAULT), @@ -43,7 +43,7 @@ void Windows::AI::MachineLearning::CWinMLLogSink::SendImpl( break; case (onnxruntime::logging::Severity::kWARNING): TraceLoggingWrite( - _winmla::winml_trace_logging_provider, + winmla::winml_trace_logging_provider, "WinMLLogSink", TraceLoggingKeyword(WINML_PROVIDER_KEYWORD_DEFAULT), TraceLoggingLevel(WINEVENT_LEVEL_WARNING), @@ -55,7 +55,7 @@ void Windows::AI::MachineLearning::CWinMLLogSink::SendImpl( break; case (onnxruntime::logging::Severity::kINFO): TraceLoggingWrite( - _winmla::winml_trace_logging_provider, + winmla::winml_trace_logging_provider, "WinMLLogSink", TraceLoggingKeyword(WINML_PROVIDER_KEYWORD_DEFAULT), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -69,7 +69,7 @@ void Windows::AI::MachineLearning::CWinMLLogSink::SendImpl( __fallthrough; //Default is Verbose too. default: TraceLoggingWrite( - _winmla::winml_trace_logging_provider, + winmla::winml_trace_logging_provider, "WinMLLogSink", TraceLoggingKeyword(WINML_PROVIDER_KEYWORD_DEFAULT), TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), @@ -87,7 +87,7 @@ void Windows::AI::MachineLearning::CWinMLLogSink::SendImpl( void Windows::AI::MachineLearning::CWinMLLogSink::SendProfileEvent(onnxruntime::profiling::EventRecord& eventRecord) const { if (eventRecord.cat == onnxruntime::profiling::EventCategory::NODE_EVENT) { TraceLoggingWrite( - _winmla::winml_trace_logging_provider, + winmla::winml_trace_logging_provider, "OnnxRuntimeProfiling", TraceLoggingKeyword(WINML_PROVIDER_KEYWORD_LOTUS_PROFILING), TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), @@ -102,7 +102,7 @@ void Windows::AI::MachineLearning::CWinMLLogSink::SendProfileEvent(onnxruntime:: TraceLoggingString(eventRecord.args["provider"].c_str(), "Execution Provider")); } else { TraceLoggingWrite( - _winmla::winml_trace_logging_provider, + winmla::winml_trace_logging_provider, "OnnxRuntimeProfiling", TraceLoggingKeyword(WINML_PROVIDER_KEYWORD_LOTUS_PROFILING), TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), diff --git a/winml/lib/Api.Core/inc/WinMLAdapter.h b/winml/lib/Api.Core/inc/WinMLAdapter.h index e6fb12b78a..39ea815a03 100644 --- a/winml/lib/Api.Core/inc/WinMLAdapter.h +++ b/winml/lib/Api.Core/inc/WinMLAdapter.h @@ -141,27 +141,4 @@ private: std::shared_ptr session_; }; -// header only code to enable smart pointers on abstract ort objects -template -class OrtObject { - public: - OrtObject() { - p_ = nullptr; - } - - OrtObject(T* m) { - p_ = m; - } - - virtual ~OrtObject() { - if (p_ != nullptr) { - ReleaseOrtObject(p_); - } - } - T* get() { return p_; } -private: - T* p_; -}; - - } // namespace Windows::AI::MachineLearning::Adapter \ No newline at end of file diff --git a/winml/lib/Api/ImageFeatureValue.cpp b/winml/lib/Api/ImageFeatureValue.cpp index 32884583ba..5f13a58212 100644 --- a/winml/lib/Api/ImageFeatureValue.cpp +++ b/winml/lib/Api/ImageFeatureValue.cpp @@ -346,7 +346,7 @@ static void GPUTensorize( com_ptr spSession, void* pAllocatedResource, WinML::BindingContext& context) { - com_ptr<_winmla::IWinMLAdapter> adapter; + com_ptr adapter; WINML_THROW_IF_FAILED(OrtGetWinMLAdapter(adapter.put())); auto d3dResource = @@ -505,7 +505,7 @@ HRESULT ImageFeatureValue::GetOrtValue(WinML::BindingContext& context, OrtValue* auto provider = spSession->GetExecutionProvider(); // and the adapter - com_ptr<_winmla::IWinMLAdapter> adapter; + com_ptr adapter; WINML_THROW_IF_FAILED(OrtGetWinMLAdapter(adapter.put())); // create the OrtValue @@ -552,7 +552,7 @@ HRESULT ImageFeatureValue::UpdateSourceResourceData(BindingContext& context, Ort auto spSession = context.session.as(); auto spDevice = spSession->Device().as(); - com_ptr<_winmla::IWinMLAdapter> adapter; + com_ptr adapter; WINML_THROW_IF_FAILED(OrtGetWinMLAdapter(adapter.put())); // Get the output tensor raw data diff --git a/winml/lib/Api/LearningModel.cpp b/winml/lib/Api/LearningModel.cpp index 6e5ea3b3aa..1984612fd9 100644 --- a/winml/lib/Api/LearningModel.cpp +++ b/winml/lib/Api/LearningModel.cpp @@ -253,9 +253,9 @@ LearningModel::LoadFromStream( } WINML_CATCH_ALL -_winmla::IModelProto* +winmla::IModelProto* LearningModel::DetachModelProto() { - com_ptr<_winmla::IModelProto> detached_model_proto; + com_ptr detached_model_proto; if (model_proto_ != nullptr) { detached_model_proto.attach(model_proto_.detach()); @@ -265,15 +265,15 @@ LearningModel::DetachModelProto() { return detached_model_proto.detach(); } -_winmla::IModelProto* +winmla::IModelProto* LearningModel::CopyModelProto() { if (model_proto_ == nullptr) { return nullptr; } - com_ptr<_winmla::IWinMLAdapter> adapter; + com_ptr adapter; WINML_THROW_IF_FAILED(OrtGetWinMLAdapter(adapter.put())); - com_ptr<_winmla::IModelProto> model_proto; + com_ptr model_proto; WINML_THROW_IF_FAILED(adapter->CreateModelProto(model_proto_.get(), model_proto.put())); return model_proto.detach(); diff --git a/winml/lib/Api/LearningModel.h b/winml/lib/Api/LearningModel.h index c30057ea5c..8b520218e9 100644 --- a/winml/lib/Api/LearningModel.h +++ b/winml/lib/Api/LearningModel.h @@ -91,35 +91,22 @@ struct LearningModel : LearningModelT { public: /* Non-ABI methods */ - bool - IsDisposed(); - - IMLOperatorRegistry* - GetOperatorRegistry(); - - _winmla::IModelProto* - DetachModelProto(); - - _winmla::IModelProto* - CopyModelProto(); + bool IsDisposed(); + IMLOperatorRegistry* GetOperatorRegistry(); + winmla::IModelProto* DetachModelProto(); + winmla::IModelProto* CopyModelProto(); private: - void - Initialize(); - - void - LogCreationEvent( - bool fromStream = false); - - void - ModelUseFP16( + void Initialize(); + void LogCreationEvent(bool fromStream = false); + void ModelUseFP16( winml::ILearningModelFeatureDescriptor descriptor, bool& use_fp16); private: - com_ptr<_winmla::IWinMLAdapter> adapter_; - com_ptr<_winmla::IModelProto> model_proto_; - com_ptr<_winmla::IModelInfo> model_info_; + com_ptr adapter_; + com_ptr model_proto_; + com_ptr model_info_; ILearningModelOperatorProvider operator_provider_; }; diff --git a/winml/lib/Api/LearningModelBinding.cpp b/winml/lib/Api/LearningModelBinding.cpp index f45d3a0aca..128d65a838 100644 --- a/winml/lib/Api/LearningModelBinding.cpp +++ b/winml/lib/Api/LearningModelBinding.cpp @@ -613,7 +613,8 @@ void LearningModelBinding::BindUnboundOutputs() // Add all unbound outputs to binding collection for (const auto& unbound_output : unbound_output_names) { - WINML_THROW_IF_FAILED(BindOutput(unbound_output, Ort::Value(nullptr))); + Ort::Value out(nullptr); + WINML_THROW_IF_FAILED(BindOutput(unbound_output, out)); } } diff --git a/winml/lib/Api/LearningModelBinding.h b/winml/lib/Api/LearningModelBinding.h index 21e9e6b2b8..d4d08f7e2f 100644 --- a/winml/lib/Api/LearningModelBinding.h +++ b/winml/lib/Api/LearningModelBinding.h @@ -74,7 +74,7 @@ struct LearningModelBinding : LearningModelBindingT m_providers; - com_ptr<_winmla::IWinMLAdapter> adapter_; + com_ptr adapter_; std::vector input_names_; std::vector inputs_; std::vector output_names_; diff --git a/winml/lib/Api/LearningModelSession.cpp b/winml/lib/Api/LearningModelSession.cpp index 6eaac423ff..190e2bd31a 100644 --- a/winml/lib/Api/LearningModelSession.cpp +++ b/winml/lib/Api/LearningModelSession.cpp @@ -50,7 +50,7 @@ LearningModelSession::LearningModelSession( } WINML_CATCH_ALL -_winmla::IModelProto* +winmla::IModelProto* LearningModelSession::GetOptimizedModel() { // Get the model proto @@ -61,9 +61,9 @@ LearningModelSession::GetOptimizedModel() { return GetOptimizedModel(should_close_model); } -_winmla::IModelProto* +winmla::IModelProto* LearningModelSession::GetOptimizedModel(bool should_close_model) { - com_ptr<_winmla::IModelProto> model_proto; + com_ptr model_proto; { // Lock the model detach/copy since multiple threads can access concurrently @@ -81,7 +81,7 @@ LearningModelSession::GetOptimizedModel(bool should_close_model) { } // Ensure that the model is runnable on the device - com_ptr<_winmla::IWinMLAdapter> adapter; + com_ptr adapter; WINML_THROW_IF_FAILED(OrtGetWinMLAdapter(adapter.put())); WINML_THROW_IF_FAILED(adapter->EnsureModelDeviceCompatibility(model_, model_proto.get(), device_.as()->GetD3DDeviceCache()->IsFloat16Supported())); @@ -94,16 +94,16 @@ void LearningModelSession::Initialize() { _winmlt::EventCategory::kSessionCreation); // Get the optimized model proto from the learning model - com_ptr<_winmla::IModelProto> model_proto; + com_ptr model_proto; model_proto.attach(GetOptimizedModel()); // Create the session builder auto device_impl = device_.as(); - com_ptr<_winmla::IWinMLAdapter> adapter; + com_ptr adapter; WINML_THROW_IF_FAILED(OrtGetWinMLAdapter(adapter.put())); - com_ptr<_winmla::IOrtSessionBuilder> session_builder; + com_ptr session_builder; WINML_THROW_IF_FAILED(adapter->CreateOrtSessionBuilder( device_impl->GetD3DDevice(), device_impl->GetDeviceQueue(), @@ -121,7 +121,7 @@ void LearningModelSession::Initialize() { session_options_.BatchSizeOverride())); } - com_ptr<_winmla::IInferenceSession> session; + com_ptr session; WINML_THROW_IF_FAILED(session_builder->CreateSession( options, session.put(), &cached_execution_provider_)); @@ -397,7 +397,7 @@ void LearningModelSession::ApplyEvaluationProperties() try { if (evaluation_properties_) { auto is_debug_output_enabled = evaluation_properties_.HasKey(c_enable_debug_output); if (is_debug_output_enabled) { - com_ptr<_winmla::IWinMLAdapter> adapter; + com_ptr adapter; WINML_THROW_IF_FAILED(OrtGetWinMLAdapter(adapter.put())); adapter->EnableDebugOutput(); } @@ -425,7 +425,7 @@ LearningModelSession::GetExecutionProvider() { return cached_execution_provider_; } -_winmla::IInferenceSession* +winmla::IInferenceSession* LearningModelSession::GetIInferenceSession() { return inference_session_.get(); } diff --git a/winml/lib/Api/LearningModelSession.h b/winml/lib/Api/LearningModelSession.h index 821510e502..6d4b2af80a 100644 --- a/winml/lib/Api/LearningModelSession.h +++ b/winml/lib/Api/LearningModelSession.h @@ -68,7 +68,7 @@ struct LearningModelSession : LearningModelSessionT { onnxruntime::IExecutionProvider* GetExecutionProvider(); - _winmla::IInferenceSession* + winmla::IInferenceSession* GetIInferenceSession(); void @@ -78,10 +78,10 @@ struct LearningModelSession : LearningModelSessionT { void Initialize(); - _winmla::IModelProto* + winmla::IModelProto* GetOptimizedModel(); - _winmla::IModelProto* + winmla::IModelProto* GetOptimizedModel(bool should_close_model); uint64_t @@ -101,7 +101,7 @@ struct LearningModelSession : LearningModelSessionT { ToggleProfiler(); private: - com_ptr<_winmla::IInferenceSession> inference_session_; + com_ptr inference_session_; // reference to the active execution provider. weak onnxruntime::IExecutionProvider* cached_execution_provider_ = nullptr; diff --git a/winml/lib/Api/impl/MapBase.h b/winml/lib/Api/impl/MapBase.h index 7c9757ff60..76ff6e3920 100644 --- a/winml/lib/Api/impl/MapBase.h +++ b/winml/lib/Api/impl/MapBase.h @@ -143,7 +143,7 @@ struct MapBase : winrt::implements< } template - static onnxruntime::MLDataType GetLotusType(_winmla::IWinMLAdapter* adapter) { + static onnxruntime::MLDataType GetLotusType(winmla::IWinMLAdapter* adapter) { return adapter->GetMapType(TensorKindFrom::Type, TensorKindFrom::Type); } diff --git a/winml/lib/Api/impl/SequenceBase.h b/winml/lib/Api/impl/SequenceBase.h index 8df40aba39..a611a1da3b 100644 --- a/winml/lib/Api/impl/SequenceBase.h +++ b/winml/lib/Api/impl/SequenceBase.h @@ -217,13 +217,13 @@ struct SequenceBase : public winrt::implements< *ort_value = Ort::Value::CreateSequence(sequence_values).release(); return S_OK; - /* winrt::com_ptr<_winmla::IWinMLAdapter> adapter; + /* winrt::com_ptr adapter; RETURN_IF_FAILED(OrtGetWinMLAdapter(adapter.put())); auto lotus_type = adapter->GetVectorMapType( TensorKindFrom::TKey>::Type, TensorKindFrom::TValue>::Type); - winrt::com_ptr<_winmla::IOrtValue> ml_value_out; + winrt::com_ptr ml_value_out; adapter->CreateOrtValue(lotus_data_.get(), lotus_type, ml_value_out.put()); *ml_value = ml_value_out.detach();*/ diff --git a/winml/lib/Api/impl/Tensor.h b/winml/lib/Api/impl/Tensor.h index f4e45fef96..9d2b9dace1 100644 --- a/winml/lib/Api/impl/Tensor.h +++ b/winml/lib/Api/impl/Tensor.h @@ -28,13 +28,13 @@ class Tensor { TensorBufferPtr m_buffer; std::vector shape_; - winrt::com_ptr<_winmla::IWinMLAdapter> adapter_; + winrt::com_ptr adapter_; public: Tensor() = delete; Tensor( - _winmla::IWinMLAdapter* adapter, + winmla::IWinMLAdapter* adapter, std::vector const& shape, winrt::Windows::Storage::Streams::IBuffer buffer) : shape_(shape), m_buffer( @@ -50,7 +50,7 @@ class Tensor { } Tensor( - _winmla::IWinMLAdapter* adapter, + winmla::IWinMLAdapter* adapter, std::vector const& shape) : shape_(shape), m_buffer( TensorBuffer::Create( @@ -64,7 +64,7 @@ class Tensor { } Tensor( - _winmla::IWinMLAdapter* adapter, + winmla::IWinMLAdapter* adapter, std::vector const&& shape) : shape_(std::move(shape)), m_buffer( TensorBuffer::Create( diff --git a/winml/lib/Api/impl/TensorBase.h b/winml/lib/Api/impl/TensorBase.h index be8d592954..bfdc34e4c1 100644 --- a/winml/lib/Api/impl/TensorBase.h +++ b/winml/lib/Api/impl/TensorBase.h @@ -834,7 +834,7 @@ struct TensorBase : TBase { std::shared_ptr> m_resources; std::vector>> m_outstandingReferences; bool m_isClosed = false; - winrt::com_ptr<_winmla::IWinMLAdapter> adapter_; + winrt::com_ptr adapter_; }; } // namespace Windows::AI::MachineLearning diff --git a/winml/lib/Api/impl/TensorMemoryBufferReference.h b/winml/lib/Api/impl/TensorMemoryBufferReference.h index 5f867f0ee5..032108c4ab 100644 --- a/winml/lib/Api/impl/TensorMemoryBufferReference.h +++ b/winml/lib/Api/impl/TensorMemoryBufferReference.h @@ -25,7 +25,7 @@ struct DMLResource { winrt::com_ptr DXResource; UINT64 resource_width_; void* ExecutionProviderAllocatedResource = nullptr; - winrt::com_ptr<_winmla::IWinMLAdapter> adapter_; + winrt::com_ptr adapter_; }; template @@ -47,7 +47,7 @@ struct TensorResources { try { // Lazily allocate the cpu resource on call to GetBuffer if (CpuResource == nullptr) { - winrt::com_ptr<_winmla::IWinMLAdapter> adapter; + winrt::com_ptr adapter; WINML_THROW_IF_FAILED(OrtGetWinMLAdapter(adapter.put())); CpuResource = std::make_shared>(adapter.get(), shape); } diff --git a/winml/lib/Common/inc/NamespaceAliases.h b/winml/lib/Common/inc/NamespaceAliases.h index a09ae6b698..91761cc490 100644 --- a/winml/lib/Common/inc/NamespaceAliases.h +++ b/winml/lib/Common/inc/NamespaceAliases.h @@ -30,11 +30,11 @@ namespace winml = ::winrt::Windows::AI::MachineLearning; namespace winrt::Windows::AI::MachineLearning::implementation {} namespace winmlp = ::winrt::Windows::AI::MachineLearning::implementation; +namespace Windows::AI::MachineLearning::Adapter {} +namespace winmla = ::Windows::AI::MachineLearning::Adapter; + namespace Windows::AI::MachineLearning {} namespace WinML = ::Windows::AI::MachineLearning; namespace Windows::AI::MachineLearning::Telemetry {} namespace _winmlt = ::Windows::AI::MachineLearning::Telemetry; - -namespace Windows::AI::MachineLearning::Adapter {} -namespace _winmla = ::Windows::AI::MachineLearning::Adapter; \ No newline at end of file