Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor WinMLAPI Tests to build both google and taef test based on preprocessor definition #2829

Merged
merged 7 commits into from
Jan 15, 2020
Merged

Refactor WinMLAPI Tests to build both google and taef test based on preprocessor definition #2829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c92df06
Add winml macro wrappers on top of google test macros
Jan 6, 2020
ab2b4cd
change test methods to disabled
Jan 7, 2020
457e6d8
Add custom winml macros for both taef and google tests
Jan 9, 2020
031a053
PR comments
Jan 10, 2020
f9341ba
Merge remote-tracking branch 'origin/windowsai' into user/rylai/test_…
Jan 13, 2020
1e8cc07
Refactor winml api tests
Jan 13, 2020
37e71ac
Move additional gtest specific macro definition into googleTestMacros.h
Jan 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmake/winml_unittests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ add_winml_test(
SOURCES ${winml_test_api_src}
LIBS winml_test_common
)
target_compile_definitions(winml_test_api PRIVATE BUILD_GOOGLE_TEST)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is this used?

Copy link
Contributor Author

@ryanlai2 ryanlai2 Jan 13, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Used only in test.h line 4 to determine the correct test header which defines the WinML Test preprocessor definitions. I will make a similar change to the cmake api test in internal WindowsAI as well for BUILD_TAEF_TEST.

target_precompiled_header(winml_test_api testPch.h)

if (onnxruntime_USE_DML)
Expand Down
52 changes: 20 additions & 32 deletions winml/test/api/APITest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,25 @@
//-----------------------------------------------------------------------------

#pragma once
#include "fileHelpers.h"
namespace APITest {
static void LoadModel(const std::wstring& modelPath,
winrt::Windows::AI::MachineLearning::LearningModel& learningModel) {
std::wstring fullPath = FileHelpers::GetModulePath() + modelPath;
learningModel = winrt::Windows::AI::MachineLearning::LearningModel::LoadFromFilePath(fullPath);
};

#include <gtest/gtest.h>

class APITest : public ::testing::Test
{
protected:
void LoadModel(const std::wstring& modelPath)
{
std::wstring fullPath = FileHelpers::GetModulePath() + modelPath;
m_model = winrt::Windows::AI::MachineLearning::LearningModel::LoadFromFilePath(fullPath);
}

winrt::Windows::AI::MachineLearning::LearningModel m_model = nullptr;
winrt::Windows::AI::MachineLearning::LearningModelDevice m_device = nullptr;
winrt::Windows::AI::MachineLearning::LearningModelSession m_session = nullptr;

uint64_t GetAdapterIdQuadPart()
{
LARGE_INTEGER id;
id.LowPart = m_device.AdapterId().LowPart;
id.HighPart = m_device.AdapterId().HighPart;
return id.QuadPart;
};

_LUID GetAdapterIdAsLUID()
{
_LUID id;
id.LowPart = m_device.AdapterId().LowPart;
id.HighPart = m_device.AdapterId().HighPart;
return id;
}

bool m_runGPUTests = true;
static uint64_t GetAdapterIdQuadPart(winrt::Windows::AI::MachineLearning::LearningModelDevice& device) {
LARGE_INTEGER id;
id.LowPart = device.AdapterId().LowPart;
id.HighPart = device.AdapterId().HighPart;
return id.QuadPart;
};

static _LUID GetAdapterIdAsLUID(winrt::Windows::AI::MachineLearning::LearningModelDevice& device) {
_LUID id;
id.LowPart = device.AdapterId().LowPart;
id.HighPart = device.AdapterId().HighPart;
return id;
}
}; // namespace APITest
Loading