Enable disabled tests and add fixed model (#4059)

Co-authored-by: Ryan Lai <ryalai96@gamil.com>
This commit is contained in:
Ryan Lai 2020-05-28 13:24:12 -07:00 committed by GitHub
parent 279f9aa865
commit ed0a8e5b5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 38 deletions

View file

@ -251,11 +251,8 @@ static void CreateSessionWithCastToFloat16InModel()
CreateSession(learningModel);
}
static void DISABLED_CreateSessionWithFloat16InitializersInModel()
static void CreateSessionWithFloat16InitializersInModel()
{
// Disabled due to https://microsoft.visualstudio.com/DefaultCollection/OS/_workitems/edit/21624720:
// Model fails to resolve due to ORT using incorrect IR version within partition
// load a model
LearningModel learningModel = nullptr;
WINML_EXPECT_NO_THROW(APITest::LoadModel(L"fp16-initializer.onnx", learningModel));
@ -403,7 +400,7 @@ const LearningModelSessionAPITestsApi& getapi() {
EvaluateFeaturesAsync,
EvaluationProperties,
CreateSessionWithCastToFloat16InModel,
DISABLED_CreateSessionWithFloat16InitializersInModel,
CreateSessionWithFloat16InitializersInModel,
EvaluateSessionAndCloseModel,
CloseSession,
};
@ -413,7 +410,7 @@ const LearningModelSessionAPITestsApi& getapi() {
api.CreateSessionDeviceDirectXHighPerformance = SkipTest;
api.CreateSessionDeviceDirectXMinimumPower = SkipTest;
api.CreateSessionWithCastToFloat16InModel = SkipTest;
api.DISABLED_CreateSessionWithFloat16InitializersInModel = SkipTest;
api.CreateSessionWithFloat16InitializersInModel = SkipTest;
api.AdapterIdAndDevice = SkipTest;
}
if (RuntimeParameterExists(L"EdgeCore")) {

View file

@ -16,7 +16,7 @@ struct LearningModelSessionAPITestsApi {
VoidTest EvaluateFeaturesAsync;
VoidTest EvaluationProperties;
VoidTest CreateSessionWithCastToFloat16InModel;
VoidTest DISABLED_CreateSessionWithFloat16InitializersInModel;
VoidTest CreateSessionWithFloat16InitializersInModel;
VoidTest EvaluateSessionAndCloseModel;
VoidTest CloseSession;
};
@ -36,6 +36,6 @@ WINML_TEST(LearningModelSessionAPITests, CreateSessionDeviceDirectX)
WINML_TEST(LearningModelSessionAPITests, CreateSessionDeviceDirectXHighPerformance)
WINML_TEST(LearningModelSessionAPITests, CreateSessionDeviceDirectXMinimumPower)
WINML_TEST(LearningModelSessionAPITests, CreateSessionWithCastToFloat16InModel)
WINML_TEST(LearningModelSessionAPITests, DISABLED_CreateSessionWithFloat16InitializersInModel)
WINML_TEST(LearningModelSessionAPITests, CreateSessionWithFloat16InitializersInModel)
WINML_TEST(LearningModelSessionAPITests, AdapterIdAndDevice)
WINML_TEST_CLASS_END()

View file

@ -1,7 +1,7 @@
sheilk:Š
6
fp16_initializercast_to_float_output"Cast*
to
sheilk:<3A>
9
fp16_initializercast_to_float_output"Cast*
to 
!
X
cast_to_float_outputY"Add*

View file

@ -1441,19 +1441,19 @@ const ScenarioTestsApi& getapi() {
api.Scenario8SetDeviceSampleMinPower = SkipTest;
api.Scenario8SetDeviceSampleMaxPerf = SkipTest;
api.Scenario8SetDeviceSampleCustomCommandQueue = SkipTest;
api.DISABLED_Scenario9LoadBindEvalInputTensorGPU = SkipTest;
api.Scenario9LoadBindEvalInputTensorGPU = SkipTest;
api.Scenario13SingleModelOnCPUandGPU = SkipTest;
api.Scenario11FreeDimensionsTensor = SkipTest;
api.Scenario11FreeDimensionsImage = SkipTest;
api.Scenario14RunModelSwapchain = SkipTest;
api.Scenario20aLoadBindEvalCustomOperatorCPU = SkipTest;
api.Scenario20bLoadBindEvalReplacementCustomOperatorCPU = SkipTest;
api.DISABLED_Scenario21RunModel2ChainZ = SkipTest;
api.DISABLED_Scenario22ImageBindingAsGPUTensor = SkipTest;
api.Scenario21RunModel2ChainZ = SkipTest;
api.Scenario22ImageBindingAsGPUTensor = SkipTest;
api.MsftQuantizedModels = SkipTest;
api.DISABLED_SyncVsAsync = SkipTest;
api.DISABLED_CustomCommandQueueWithFence = SkipTest;
api.DISABLED_ReuseVideoFrame = SkipTest;
api.SyncVsAsync = SkipTest;
api.CustomCommandQueueWithFence = SkipTest;
api.ReuseVideoFrame = SkipTest;
api.DeviceLostRecovery = SkipTest;
api.Scenario8SetDeviceSampleD3D11Device = SkipTest;
api.D2DInterop = SkipTest;
@ -1471,17 +1471,17 @@ const ScenarioTestsApi& getapi() {
api.Scenario5AsyncEval = SkipTest;
api.Scenario6BindWithProperties = SkipTest;
api.Scenario7EvalWithNoBind = SkipTest;
api.DISABLED_Scenario9LoadBindEvalInputTensorGPU = SkipTest;
api.Scenario9LoadBindEvalInputTensorGPU = SkipTest;
api.Scenario11FreeDimensionsTensor = SkipTest;
api.Scenario11FreeDimensionsImage = SkipTest;
api.Scenario13SingleModelOnCPUandGPU = SkipTest;
api.Scenario14RunModelSwapchain = SkipTest;
api.Scenario17DevDiagnostics = SkipTest;
api.DISABLED_Scenario21RunModel2ChainZ = SkipTest;
api.DISABLED_Scenario22ImageBindingAsCPUTensor = SkipTest;
api.DISABLED_Scenario22ImageBindingAsGPUTensor = SkipTest;
api.DISABLED_CustomCommandQueueWithFence = SkipTest;
api.DISABLED_ReuseVideoFrame = SkipTest;
api.Scenario21RunModel2ChainZ = SkipTest;
api.Scenario22ImageBindingAsCPUTensor = SkipTest;
api.Scenario22ImageBindingAsGPUTensor = SkipTest;
api.CustomCommandQueueWithFence = SkipTest;
api.ReuseVideoFrame = SkipTest;
api.D2DInterop = SkipTest;
api.DeviceLostRecovery = SkipTest;
api.QuantizedModels = SkipTest;

View file

@ -13,7 +13,7 @@ struct ScenarioTestsApi
VoidTest Scenario8SetDeviceSampleDefault;
VoidTest Scenario8SetDeviceSampleCPU;
VoidTest Scenario17DevDiagnostics;
VoidTest DISABLED_Scenario22ImageBindingAsCPUTensor;
VoidTest Scenario22ImageBindingAsCPUTensor;
VoidTest QuantizedModels;
VoidTest EncryptedStream;
VoidTest Scenario3SoftwareBitmapInputBinding;
@ -23,19 +23,19 @@ struct ScenarioTestsApi
VoidTest Scenario8SetDeviceSampleMaxPerf;
VoidTest Scenario8SetDeviceSampleMyCameraDevice;
VoidTest Scenario8SetDeviceSampleCustomCommandQueue;
VoidTest DISABLED_Scenario9LoadBindEvalInputTensorGPU;
VoidTest Scenario9LoadBindEvalInputTensorGPU;
VoidTest Scenario13SingleModelOnCPUandGPU;
VoidTest Scenario11FreeDimensionsTensor;
VoidTest Scenario11FreeDimensionsImage;
VoidTest Scenario14RunModelSwapchain;
VoidTest Scenario20aLoadBindEvalCustomOperatorCPU;
VoidTest Scenario20bLoadBindEvalReplacementCustomOperatorCPU;
VoidTest DISABLED_Scenario21RunModel2ChainZ;
VoidTest DISABLED_Scenario22ImageBindingAsGPUTensor;
VoidTest Scenario21RunModel2ChainZ;
VoidTest Scenario22ImageBindingAsGPUTensor;
VoidTest MsftQuantizedModels;
VoidTest DISABLED_SyncVsAsync;
VoidTest DISABLED_CustomCommandQueueWithFence;
VoidTest DISABLED_ReuseVideoFrame;
VoidTest SyncVsAsync;
VoidTest CustomCommandQueueWithFence;
VoidTest ReuseVideoFrame;
VoidTest DeviceLostRecovery;
VoidTest Scenario8SetDeviceSampleD3D11Device;
VoidTest D2DInterop;
@ -53,7 +53,7 @@ WINML_TEST(ScenarioCppWinrtTests, Scenario7EvalWithNoBind)
WINML_TEST(ScenarioCppWinrtTests, Scenario8SetDeviceSampleDefault)
WINML_TEST(ScenarioCppWinrtTests, Scenario8SetDeviceSampleCPU)
WINML_TEST(ScenarioCppWinrtTests, Scenario17DevDiagnostics)
WINML_TEST(ScenarioCppWinrtTests, DISABLED_Scenario22ImageBindingAsCPUTensor)
WINML_TEST(ScenarioCppWinrtTests, Scenario22ImageBindingAsCPUTensor)
WINML_TEST(ScenarioCppWinrtTests, QuantizedModels)
WINML_TEST(ScenarioCppWinrtTests, EncryptedStream)
WINML_TEST(ScenarioCppWinrtTests, Scenario3SoftwareBitmapInputBinding)
@ -62,19 +62,19 @@ WINML_TEST(ScenarioCppWinrtTests, Scenario8SetDeviceSampleDefaultDirectX)
WINML_TEST(ScenarioCppWinrtTests, Scenario8SetDeviceSampleMinPower)
WINML_TEST(ScenarioCppWinrtTests, Scenario8SetDeviceSampleMaxPerf)
WINML_TEST(ScenarioCppWinrtTests, Scenario8SetDeviceSampleCustomCommandQueue)
WINML_TEST(ScenarioCppWinrtTests, DISABLED_Scenario9LoadBindEvalInputTensorGPU)
WINML_TEST(ScenarioCppWinrtTests, Scenario9LoadBindEvalInputTensorGPU)
WINML_TEST(ScenarioCppWinrtTests, Scenario13SingleModelOnCPUandGPU)
WINML_TEST(ScenarioCppWinrtTests, Scenario11FreeDimensionsTensor)
WINML_TEST(ScenarioCppWinrtTests, Scenario11FreeDimensionsImage)
WINML_TEST(ScenarioCppWinrtTests, Scenario14RunModelSwapchain)
WINML_TEST(ScenarioCppWinrtTests, Scenario20aLoadBindEvalCustomOperatorCPU)
WINML_TEST(ScenarioCppWinrtTests, Scenario20bLoadBindEvalReplacementCustomOperatorCPU)
WINML_TEST(ScenarioCppWinrtTests, DISABLED_Scenario21RunModel2ChainZ)
WINML_TEST(ScenarioCppWinrtTests, DISABLED_Scenario22ImageBindingAsGPUTensor)
WINML_TEST(ScenarioCppWinrtTests, Scenario21RunModel2ChainZ)
WINML_TEST(ScenarioCppWinrtTests, Scenario22ImageBindingAsGPUTensor)
WINML_TEST(ScenarioCppWinrtTests, MsftQuantizedModels)
WINML_TEST(ScenarioCppWinrtTests, DISABLED_SyncVsAsync)
WINML_TEST(ScenarioCppWinrtTests, DISABLED_CustomCommandQueueWithFence)
WINML_TEST(ScenarioCppWinrtTests, DISABLED_ReuseVideoFrame)
WINML_TEST(ScenarioCppWinrtTests, SyncVsAsync)
WINML_TEST(ScenarioCppWinrtTests, CustomCommandQueueWithFence)
WINML_TEST(ScenarioCppWinrtTests, ReuseVideoFrame)
WINML_TEST(ScenarioCppWinrtTests, DeviceLostRecovery)
WINML_TEST(ScenarioCppWinrtTests, Scenario8SetDeviceSampleD3D11Device)
WINML_TEST(ScenarioCppWinrtTests, D2DInterop)