mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-05-16 21:00:14 +00:00
0180c0429f
This addresses a DML performance regression from the following PR resulting in allocations not being rounded and pooled in the DML execution provider. https://github.com/microsoft/onnxruntime/pull/15833 This also fixes a pre-existing limitation that allocations during session initialization (primarily large weights and persistent resources) only bypassed rounding and pooling while using the Winml API. The allocator now also respects a caller's rounding mode parameter when provided.
115 lines
3.5 KiB
C++
115 lines
3.5 KiB
C++
// Copyright (c) Microsoft Corporation. All rights reserved.
|
|
// Licensed under the MIT License.
|
|
|
|
#include "lib/Api.Ort/pch.h"
|
|
|
|
#ifdef USE_DML
|
|
|
|
#include "OnnxruntimeDmlSessionBuilder.h"
|
|
#include "OnnxruntimeEngine.h"
|
|
#include "OnnxruntimeErrors.h"
|
|
#include "LearningModelDevice.h"
|
|
|
|
using namespace _winml;
|
|
|
|
HRESULT OnnxruntimeDmlSessionBuilder::RuntimeClassInitialize(
|
|
OnnxruntimeEngineFactory* engine_factory, ID3D12Device* device, ID3D12CommandQueue* queue, bool metacommands_enabled
|
|
) {
|
|
engine_factory_ = engine_factory;
|
|
device_.copy_from(device);
|
|
queue_.copy_from(queue);
|
|
metacommands_enabled_ = metacommands_enabled;
|
|
return S_OK;
|
|
}
|
|
|
|
HRESULT
|
|
OnnxruntimeDmlSessionBuilder::CreateSessionOptions(OrtSessionOptions** options) {
|
|
RETURN_HR_IF_NULL(E_POINTER, options);
|
|
|
|
auto ort_api = engine_factory_->UseOrtApi();
|
|
auto winml_adapter_api = engine_factory_->UseWinmlAdapterApi();
|
|
|
|
OrtSessionOptions* ort_options;
|
|
RETURN_HR_IF_NOT_OK_MSG(ort_api->CreateSessionOptions(&ort_options), ort_api);
|
|
|
|
auto session_options = UniqueOrtSessionOptions(ort_options, ort_api->ReleaseSessionOptions);
|
|
|
|
// set the graph optimization level to all (used to be called level 3)
|
|
RETURN_HR_IF_NOT_OK_MSG(
|
|
ort_api->SetSessionGraphOptimizationLevel(session_options.get(), GraphOptimizationLevel::ORT_ENABLE_ALL), ort_api
|
|
);
|
|
|
|
// Disable the mem pattern session option for DML. It will cause problems with how memory is allocated.
|
|
RETURN_HR_IF_NOT_OK_MSG(ort_api->DisableMemPattern(session_options.get()), ort_api);
|
|
|
|
// Request the dml ep
|
|
RETURN_HR_IF_NOT_OK_MSG(
|
|
winml_adapter_api->OrtSessionOptionsAppendExecutionProvider_DML(
|
|
session_options.get(), device_.get(), queue_.get(), metacommands_enabled_
|
|
),
|
|
ort_api
|
|
);
|
|
|
|
#ifndef _WIN64
|
|
auto use_arena = false;
|
|
#else
|
|
auto use_arena = true;
|
|
#endif
|
|
RETURN_HR_IF_NOT_OK_MSG(
|
|
winml_adapter_api->OrtSessionOptionsAppendExecutionProvider_CPU(session_options.get(), use_arena), ort_api
|
|
);
|
|
|
|
// call release() so the underlying OrtSessionOptions object isn't freed
|
|
*options = session_options.release();
|
|
|
|
return S_OK;
|
|
}
|
|
|
|
HRESULT OnnxruntimeDmlSessionBuilder::CreateSession(
|
|
OrtSessionOptions* options,
|
|
OrtThreadPool* inter_op_thread_pool,
|
|
OrtThreadPool* intra_op_thread_pool,
|
|
OrtSession** session
|
|
) {
|
|
RETURN_HR_IF_NULL(E_POINTER, session);
|
|
|
|
auto ort_api = engine_factory_->UseOrtApi();
|
|
auto winml_adapter_api = engine_factory_->UseWinmlAdapterApi();
|
|
|
|
OrtEnv* ort_env;
|
|
RETURN_IF_FAILED(engine_factory_->GetOrtEnvironment(&ort_env));
|
|
|
|
OrtSession* ort_session_raw;
|
|
RETURN_HR_IF_NOT_OK_MSG(
|
|
winml_adapter_api->CreateSessionWithoutModel(
|
|
ort_env, options, inter_op_thread_pool, intra_op_thread_pool, &ort_session_raw
|
|
),
|
|
engine_factory_->UseOrtApi()
|
|
);
|
|
auto ort_session = UniqueOrtSession(ort_session_raw, ort_api->ReleaseSession);
|
|
|
|
*session = ort_session.release();
|
|
|
|
return S_OK;
|
|
}
|
|
|
|
HRESULT OnnxruntimeDmlSessionBuilder::Initialize(OrtSession* session) {
|
|
RETURN_HR_IF_NULL(E_INVALIDARG, session);
|
|
auto winml_adapter_api = engine_factory_->UseWinmlAdapterApi();
|
|
|
|
RETURN_HR_IF_NOT_OK_MSG(winml_adapter_api->SessionInitialize(session), engine_factory_->UseOrtApi());
|
|
|
|
OrtExecutionProvider* ort_provider;
|
|
RETURN_HR_IF_NOT_OK_MSG(
|
|
winml_adapter_api->SessionGetExecutionProvider(session, 0, &ort_provider), engine_factory_->UseOrtApi()
|
|
);
|
|
|
|
// Flush the D3D12 work from the DML execution provider
|
|
RETURN_HR_IF_NOT_OK_MSG(
|
|
winml_adapter_api->DmlExecutionProviderFlushContext(ort_provider), engine_factory_->UseOrtApi()
|
|
);
|
|
|
|
return S_OK;
|
|
}
|
|
|
|
#endif USE_DML
|