From a1a34657d41627b21dddf2bf9cc55941329a60b6 Mon Sep 17 00:00:00 2001 From: Yih-Dar <2521628+ydshieh@users.noreply.github.com> Date: Mon, 15 Jul 2024 17:56:24 +0200 Subject: [PATCH] Avoid race condition (#31973) * [test_all] hub * remove delete * remove delete * remove delete * remove delete * remove delete * remove delete * [test_all] * [test_all] * [test_all] * [test_all] * [test_all] * [test_all] --------- Co-authored-by: ydshieh --- tests/generation/test_configuration_utils.py | 14 ++++++++++---- tests/utils/test_configuration_utils.py | 14 ++++++++++---- tests/utils/test_feature_extraction_utils.py | 14 ++++++++++---- tests/utils/test_image_processing_utils.py | 14 ++++++++++---- tests/utils/test_modeling_flax_utils.py | 14 ++++++++++---- tests/utils/test_modeling_tf_utils.py | 14 ++++++++++---- tests/utils/test_modeling_utils.py | 14 ++++++++++---- tests/utils/test_tokenization_utils.py | 14 ++++++++++---- 8 files changed, 80 insertions(+), 32 deletions(-) diff --git a/tests/generation/test_configuration_utils.py b/tests/generation/test_configuration_utils.py index ece3f33a06..26b8d092fd 100644 --- a/tests/generation/test_configuration_utils.py +++ b/tests/generation/test_configuration_utils.py @@ -253,8 +253,11 @@ class ConfigPushToHubTester(unittest.TestCase): if k != "transformers_version": self.assertEqual(v, getattr(new_config, k)) - # Reset repo - delete_repo(token=self._token, repo_id="test-generation-config") + try: + # Reset repo + delete_repo(token=self._token, repo_id="test-generation-config") + except: # noqa E722 + pass # Push to hub via save_pretrained with tempfile.TemporaryDirectory() as tmp_dir: @@ -278,8 +281,11 @@ class ConfigPushToHubTester(unittest.TestCase): if k != "transformers_version": self.assertEqual(v, getattr(new_config, k)) - # Reset repo - delete_repo(token=self._token, repo_id="valid_org/test-generation-config-org") + try: + # Reset repo + delete_repo(token=self._token, repo_id="valid_org/test-generation-config-org") + except: # noqa E722 + pass # Push to hub via save_pretrained with tempfile.TemporaryDirectory() as tmp_dir: diff --git a/tests/utils/test_configuration_utils.py b/tests/utils/test_configuration_utils.py index 6809b3a2ce..15adb21307 100644 --- a/tests/utils/test_configuration_utils.py +++ b/tests/utils/test_configuration_utils.py @@ -126,8 +126,11 @@ class ConfigPushToHubTester(unittest.TestCase): if k != "transformers_version": self.assertEqual(v, getattr(new_config, k)) - # Reset repo - delete_repo(token=self._token, repo_id="test-config") + try: + # Reset repo + delete_repo(token=self._token, repo_id="test-config") + except: # noqa E722 + pass # Push to hub via save_pretrained with tempfile.TemporaryDirectory() as tmp_dir: @@ -149,8 +152,11 @@ class ConfigPushToHubTester(unittest.TestCase): if k != "transformers_version": self.assertEqual(v, getattr(new_config, k)) - # Reset repo - delete_repo(token=self._token, repo_id="valid_org/test-config-org") + try: + # Reset repo + delete_repo(token=self._token, repo_id="valid_org/test-config-org") + except: # noqa E722 + pass # Push to hub via save_pretrained with tempfile.TemporaryDirectory() as tmp_dir: diff --git a/tests/utils/test_feature_extraction_utils.py b/tests/utils/test_feature_extraction_utils.py index d88fcb2760..0e68addb2a 100644 --- a/tests/utils/test_feature_extraction_utils.py +++ b/tests/utils/test_feature_extraction_utils.py @@ -85,8 +85,11 @@ class FeatureExtractorPushToHubTester(unittest.TestCase): for k, v in feature_extractor.__dict__.items(): self.assertEqual(v, getattr(new_feature_extractor, k)) - # Reset repo - delete_repo(token=self._token, repo_id="test-feature-extractor") + try: + # Reset repo + delete_repo(token=self._token, repo_id="test-feature-extractor") + except: # noqa E722 + pass # Push to hub via save_pretrained with tempfile.TemporaryDirectory() as tmp_dir: @@ -106,8 +109,11 @@ class FeatureExtractorPushToHubTester(unittest.TestCase): for k, v in feature_extractor.__dict__.items(): self.assertEqual(v, getattr(new_feature_extractor, k)) - # Reset repo - delete_repo(token=self._token, repo_id="valid_org/test-feature-extractor") + try: + # Reset repo + delete_repo(token=self._token, repo_id="valid_org/test-feature-extractor") + except: # noqa E722 + pass # Push to hub via save_pretrained with tempfile.TemporaryDirectory() as tmp_dir: diff --git a/tests/utils/test_image_processing_utils.py b/tests/utils/test_image_processing_utils.py index 4b2586a634..3681d1d1e1 100644 --- a/tests/utils/test_image_processing_utils.py +++ b/tests/utils/test_image_processing_utils.py @@ -96,8 +96,11 @@ class ImageProcessorPushToHubTester(unittest.TestCase): for k, v in image_processor.__dict__.items(): self.assertEqual(v, getattr(new_image_processor, k)) - # Reset repo - delete_repo(token=self._token, repo_id="test-image-processor") + try: + # Reset repo + delete_repo(token=self._token, repo_id="test-image-processor") + except: # noqa E722 + pass # Push to hub via save_pretrained with tempfile.TemporaryDirectory() as tmp_dir: @@ -117,8 +120,11 @@ class ImageProcessorPushToHubTester(unittest.TestCase): for k, v in image_processor.__dict__.items(): self.assertEqual(v, getattr(new_image_processor, k)) - # Reset repo - delete_repo(token=self._token, repo_id="valid_org/test-image-processor") + try: + # Reset repo + delete_repo(token=self._token, repo_id="valid_org/test-image-processor") + except: # noqa E722 + pass # Push to hub via save_pretrained with tempfile.TemporaryDirectory() as tmp_dir: diff --git a/tests/utils/test_modeling_flax_utils.py b/tests/utils/test_modeling_flax_utils.py index 0309a3bd8f..5011c240cc 100644 --- a/tests/utils/test_modeling_flax_utils.py +++ b/tests/utils/test_modeling_flax_utils.py @@ -83,8 +83,11 @@ class FlaxModelPushToHubTester(unittest.TestCase): max_diff = (base_params[key] - new_params[key]).sum().item() self.assertLessEqual(max_diff, 1e-3, msg=f"{key} not identical") - # Reset repo - delete_repo(token=self._token, repo_id="test-model-flax") + try: + # Reset repo + delete_repo(token=self._token, repo_id="test-model-flax") + except: # noqa E722 + pass # Push to hub via save_pretrained with tempfile.TemporaryDirectory() as tmp_dir: @@ -115,8 +118,11 @@ class FlaxModelPushToHubTester(unittest.TestCase): max_diff = (base_params[key] - new_params[key]).sum().item() self.assertLessEqual(max_diff, 1e-3, msg=f"{key} not identical") - # Reset repo - delete_repo(token=self._token, repo_id="valid_org/test-model-flax-org") + try: + # Reset repo + delete_repo(token=self._token, repo_id="valid_org/test-model-flax-org") + except: # noqa E722 + pass # Push to hub via save_pretrained with tempfile.TemporaryDirectory() as tmp_dir: diff --git a/tests/utils/test_modeling_tf_utils.py b/tests/utils/test_modeling_tf_utils.py index 8a28176133..6332df014d 100644 --- a/tests/utils/test_modeling_tf_utils.py +++ b/tests/utils/test_modeling_tf_utils.py @@ -723,8 +723,11 @@ class TFModelPushToHubTester(unittest.TestCase): break self.assertTrue(models_equal) - # Reset repo - delete_repo(token=self._token, repo_id="test-model-tf") + try: + # Reset repo + delete_repo(token=self._token, repo_id="test-model-tf") + except: # noqa E722 + pass # Push to hub via save_pretrained with tempfile.TemporaryDirectory() as tmp_dir: @@ -786,8 +789,11 @@ class TFModelPushToHubTester(unittest.TestCase): break self.assertTrue(models_equal) - # Reset repo - delete_repo(token=self._token, repo_id="valid_org/test-model-tf-org") + try: + # Reset repo + delete_repo(token=self._token, repo_id="valid_org/test-model-tf-org") + except: # noqa E722 + pass # Push to hub via save_pretrained with tempfile.TemporaryDirectory() as tmp_dir: diff --git a/tests/utils/test_modeling_utils.py b/tests/utils/test_modeling_utils.py index 83c8ec8499..ed540fd5e5 100644 --- a/tests/utils/test_modeling_utils.py +++ b/tests/utils/test_modeling_utils.py @@ -1847,8 +1847,11 @@ class ModelPushToHubTester(unittest.TestCase): for p1, p2 in zip(model.parameters(), new_model.parameters()): self.assertTrue(torch.equal(p1, p2)) - # Reset repo - delete_repo(token=self._token, repo_id="test-model") + try: + # Reset repo + delete_repo(token=self._token, repo_id="test-model") + except: # noqa E722 + pass # Push to hub via save_pretrained with tempfile.TemporaryDirectory() as tmp_dir: @@ -1887,8 +1890,11 @@ The commit description supports markdown synthax see: for p1, p2 in zip(model.parameters(), new_model.parameters()): self.assertTrue(torch.equal(p1, p2)) - # Reset repo - delete_repo(token=self._token, repo_id="valid_org/test-model-org") + try: + # Reset repo + delete_repo(token=self._token, repo_id="valid_org/test-model-org") + except: # noqa E722 + pass # Push to hub via save_pretrained with tempfile.TemporaryDirectory() as tmp_dir: diff --git a/tests/utils/test_tokenization_utils.py b/tests/utils/test_tokenization_utils.py index 5b2f202156..0df86dc3cc 100644 --- a/tests/utils/test_tokenization_utils.py +++ b/tests/utils/test_tokenization_utils.py @@ -146,8 +146,11 @@ class TokenizerPushToHubTester(unittest.TestCase): new_tokenizer = BertTokenizer.from_pretrained(f"{USER}/test-tokenizer") self.assertDictEqual(new_tokenizer.vocab, tokenizer.vocab) - # Reset repo - delete_repo(token=self._token, repo_id="test-tokenizer") + try: + # Reset repo + delete_repo(token=self._token, repo_id="test-tokenizer") + except: # noqa E722 + pass # Push to hub via save_pretrained with tempfile.TemporaryDirectory() as tmp_dir: @@ -167,8 +170,11 @@ class TokenizerPushToHubTester(unittest.TestCase): new_tokenizer = BertTokenizer.from_pretrained("valid_org/test-tokenizer-org") self.assertDictEqual(new_tokenizer.vocab, tokenizer.vocab) - # Reset repo - delete_repo(token=self._token, repo_id="valid_org/test-tokenizer-org") + try: + # Reset repo + delete_repo(token=self._token, repo_id="valid_org/test-tokenizer-org") + except: # noqa E722 + pass # Push to hub via save_pretrained with tempfile.TemporaryDirectory() as tmp_dir: