Make GPUTEST macro consistent among TAEF/googletest (#3518)

This commit is contained in:
Tiago Koji Castro Shibata 2020-04-14 10:55:16 -07:00 committed by GitHub
parent 621b3ac03a
commit 560f4c5b16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions

View file

@ -72,11 +72,13 @@
WINML_SKIP_TEST("GPU tests disabled because this is a WinML only build (no DML)")
#define GPUTEST_ENABLED alwaysFalse()
#else
#define GPUTEST \
if (auto no_gpu_tests = RuntimeParameters::Parameters.find("noGPUtests"); \
no_gpu_tests != RuntimeParameters::Parameters.end() && no_gpu_tests->second != "0") { \
WINML_SKIP_TEST("GPU tests disabled"); \
}
#define GPUTEST \
do { \
if (auto no_gpu_tests = RuntimeParameters::Parameters.find("noGPUtests"); \
no_gpu_tests != RuntimeParameters::Parameters.end() && no_gpu_tests->second != "0") { \
WINML_SKIP_TEST("GPU tests disabled"); \
} \
} while (0)
#define GPUTEST_ENABLED auto _no_gpu_tests = RuntimeParameters::Parameters.find("noGPUtests"); \
_no_gpu_tests == RuntimeParameters::Parameters.end() || _no_gpu_tests->second == "0"
#endif

View file

@ -253,7 +253,7 @@ void MultiThreadMultiSession() {
}
void MultiThreadMultiSessionGpu() {
GPUTEST
GPUTEST;
MultiThreadMultiSessionOnDevice(LearningModelDeviceKind::DirectX);
}
@ -323,7 +323,7 @@ void MultiThreadSingleSession() {
}
void MultiThreadSingleSessionGpu() {
GPUTEST
GPUTEST;
MultiThreadSingleSessionOnDevice(LearningModelDeviceKind::DirectX);
}
}

View file

@ -58,7 +58,7 @@ static void ScenarioCppWinrtTestSetup() {
static void ScenarioCppWinrtGpuTestSetup() {
ScenarioCppWinrtTestSetup();
GPUTEST
GPUTEST;
};
static void ScenarioCppWinrtGpuSkipEdgeCoreTestSetup() {