From fc331cbd5d2c8260298d6f0071987dc5af665f6a Mon Sep 17 00:00:00 2001 From: Tiago Koji Castro Shibata Date: Mon, 7 Jun 2021 18:06:31 -0700 Subject: [PATCH] Accept success codes other than S_OK in RoInitialize (#7979) * Accept success codes other than S_OK in RoInitialize * Use multithreaded apartment in raw WinML tests --- winml/test/api/RawApiTests.cpp | 2 +- winml/test/api/RawApiTestsGpu.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/winml/test/api/RawApiTests.cpp b/winml/test/api/RawApiTests.cpp index b25383c782..d067545379 100644 --- a/winml/test/api/RawApiTests.cpp +++ b/winml/test/api/RawApiTests.cpp @@ -24,7 +24,7 @@ auto CreateModelAsBuffer(const wchar_t* model_path) } static void RawApiTestsApiTestsClassSetup() { - WINML_EXPECT_HRESULT_SUCCEEDED(RoInitialize(RO_INIT_TYPE::RO_INIT_SINGLETHREADED)); + WINML_EXPECT_HRESULT_SUCCEEDED(RoInitialize(RO_INIT_TYPE::RO_INIT_MULTITHREADED)); } static void CreateModelFromFilePath() { diff --git a/winml/test/api/RawApiTestsGpu.cpp b/winml/test/api/RawApiTestsGpu.cpp index aa71be10c2..0be2a2bfbc 100644 --- a/winml/test/api/RawApiTestsGpu.cpp +++ b/winml/test/api/RawApiTestsGpu.cpp @@ -101,7 +101,7 @@ ml::learning_model_device CreateDevice(DeviceType deviceType) } static void RawApiTestsGpuApiTestsClassSetup() { - WINML_EXPECT_HRESULT_SUCCEEDED(RoInitialize(RO_INIT_TYPE::RO_INIT_SINGLETHREADED)); + WINML_EXPECT_HRESULT_SUCCEEDED(RoInitialize(RO_INIT_TYPE::RO_INIT_MULTITHREADED)); } static void CreateDirectXDevice() {