From 5562d1dfdad8faa34cc20bdaeef03c7bde094ff7 Mon Sep 17 00:00:00 2001 From: Ean Garvey <87458719+monorimet@users.noreply.github.com> Date: Tue, 13 Jun 2023 19:01:51 -0500 Subject: [PATCH] Fix xfails for cpu pytest cases (#1527) Adding cpu-sync and cpu-task device configs was allowing respective tests to bypass the xfail conditional for cpu pytests marked in tank/all_models.csv. This commit updates the conditional to xfail those cases for cpu-sync and cpu-task as well. --- tank/test_models.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tank/test_models.py b/tank/test_models.py index ec16c46d..cf5b6967 100644 --- a/tank/test_models.py +++ b/tank/test_models.py @@ -348,7 +348,11 @@ class SharkModuleTest(unittest.TestCase): self.pytestconfig.getoption("dispatch_benchmarks_dir") ) - if config["xfail_cpu"] == "True" and device == "cpu": + if config["xfail_cpu"] == "True" and device in [ + "cpu", + "cpu-sync", + "cpu-task", + ]: pytest.xfail(reason=config["xfail_reason"]) if config["xfail_cuda"] == "True" and device == "cuda":