diff --git a/winml/test/api/LearningModelSessionAPITest.cpp b/winml/test/api/LearningModelSessionAPITest.cpp index 2132fe9bfe..749f727467 100644 --- a/winml/test/api/LearningModelSessionAPITest.cpp +++ b/winml/test/api/LearningModelSessionAPITest.cpp @@ -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")) { diff --git a/winml/test/api/LearningModelSessionAPITest.h b/winml/test/api/LearningModelSessionAPITest.h index d8c51c9475..dbbdf95dba 100644 --- a/winml/test/api/LearningModelSessionAPITest.h +++ b/winml/test/api/LearningModelSessionAPITest.h @@ -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() diff --git a/winml/test/api/models/fp16-initializer.onnx b/winml/test/api/models/fp16-initializer.onnx index 36e7e5e8e0..79c7680de8 100644 --- a/winml/test/api/models/fp16-initializer.onnx +++ b/winml/test/api/models/fp16-initializer.onnx @@ -1,7 +1,7 @@ -sheilk: -6 -fp16_initializercast_to_float_output"Cast* -to +sheilk: +9 +fp16_initializercast_to_float_output"Cast* +to ! X cast_to_float_outputY"Add* diff --git a/winml/test/scenario/cppwinrt/scenariotestscppwinrt.cpp b/winml/test/scenario/cppwinrt/scenariotestscppwinrt.cpp index a8a3f84db0..9becd9aecd 100644 --- a/winml/test/scenario/cppwinrt/scenariotestscppwinrt.cpp +++ b/winml/test/scenario/cppwinrt/scenariotestscppwinrt.cpp @@ -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; diff --git a/winml/test/scenario/cppwinrt/scenariotestscppwinrt.h b/winml/test/scenario/cppwinrt/scenariotestscppwinrt.h index 4fee0e5747..4293323b24 100644 --- a/winml/test/scenario/cppwinrt/scenariotestscppwinrt.h +++ b/winml/test/scenario/cppwinrt/scenariotestscppwinrt.h @@ -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)