From 5a1a9269e6cd8a6a0167b43d0ba17327362bf13f Mon Sep 17 00:00:00 2001 From: MediaPipe Team Date: Wed, 5 Apr 2023 22:29:23 -0700 Subject: [PATCH] Internal Changes PiperOrigin-RevId: 522247775 --- mediapipe/model_maker/python/core/utils/file_util.py | 2 ++ .../gesture_recognizer/gesture_recognizer_test.py | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mediapipe/model_maker/python/core/utils/file_util.py b/mediapipe/model_maker/python/core/utils/file_util.py index 7871d90c..221df94f 100644 --- a/mediapipe/model_maker/python/core/utils/file_util.py +++ b/mediapipe/model_maker/python/core/utils/file_util.py @@ -94,4 +94,6 @@ class DownloadedFiles: pathlib.Path.mkdir(absolute_path.parent, parents=True, exist_ok=True) with open(absolute_path, 'wb') as f: f.write(r.content) + else: + print(f'Using existing files at {absolute_path}') return str(absolute_path) diff --git a/mediapipe/model_maker/python/vision/gesture_recognizer/gesture_recognizer_test.py b/mediapipe/model_maker/python/vision/gesture_recognizer/gesture_recognizer_test.py index ad2f211f..11b4f975 100644 --- a/mediapipe/model_maker/python/vision/gesture_recognizer/gesture_recognizer_test.py +++ b/mediapipe/model_maker/python/vision/gesture_recognizer/gesture_recognizer_test.py @@ -15,7 +15,6 @@ import io import os import tempfile -import unittest from unittest import mock as unittest_mock import zipfile @@ -32,7 +31,6 @@ _TEST_DATA_DIR = 'mediapipe/model_maker/python/vision/gesture_recognizer/testdat tf.keras.backend.experimental.enable_tf_random_generator() -@unittest.skip('b/273818271') class GestureRecognizerTest(tf.test.TestCase): def _load_data(self): @@ -47,9 +45,6 @@ class GestureRecognizerTest(tf.test.TestCase): def setUp(self): super().setUp() tf.keras.utils.set_random_seed(87654321) - all_data = self._load_data() - # Splits data, 90% data for training, 10% for validation - self._train_data, self._validation_data = all_data.split(0.9) # Mock tempfile.gettempdir() to be unique for each test to avoid race # condition when downloading model since these tests may run in parallel. mock_gettempdir = unittest_mock.patch.object( @@ -60,6 +55,10 @@ class GestureRecognizerTest(tf.test.TestCase): ) self.mock_gettempdir = mock_gettempdir.start() self.addCleanup(mock_gettempdir.stop) + # Load dataset used by tests + all_data = self._load_data() + # Splits data, 90% data for training, 10% for validation + self._train_data, self._validation_data = all_data.split(0.9) def test_gesture_recognizer_model(self): mo = gesture_recognizer.ModelOptions() @@ -74,7 +73,6 @@ class GestureRecognizerTest(tf.test.TestCase): self._test_accuracy(model) - @unittest.skip('b/273818271') @unittest_mock.patch.object( tf.keras.layers, 'Dense', wraps=tf.keras.layers.Dense )