updates

georgia-tech-db · Jun 27, 2023 · 2be622e · 2be622e
1 parent 860b41f
commit 2be622e
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 1,498 deletions.
diff --git a/evadb/udfs/ocr_extractor.py b/evadb/udfs/ocr_extractor.py
diff --git a/evadb/udfs/toxicity_classifier.py b/evadb/udfs/toxicity_classifier.py
diff --git a/evadb/udfs/udf_bootstrap_queries.py b/evadb/udfs/udf_bootstrap_queries.py
@@ -122,16 +122,6 @@
       'model' 'yolov8m.pt';
       """
 
-ocr_udf_query = """CREATE UDF IF NOT EXISTS OCRExtractor
-      INPUT  (frame NDARRAY UINT8(3, ANYDIM, ANYDIM))
-      OUTPUT (labels NDARRAY STR(10), bboxes NDARRAY FLOAT32(ANYDIM, 4),
-                scores NDARRAY FLOAT32(ANYDIM))
-      TYPE  OCRExtraction
-      IMPL  '{}/udfs/ocr_extractor.py';
-      """.format(
-    EvaDB_INSTALLATION_DIR
-)
-
 face_detection_udf_query = """CREATE UDF IF NOT EXISTS FaceDetector
                   INPUT  (frame NDARRAY UINT8(3, ANYDIM, ANYDIM))
                   OUTPUT (bboxes NDARRAY FLOAT32(ANYDIM, 4),
@@ -223,7 +213,7 @@ def init_builtin_udfs(db: EvaDBDatabase, mode: str = "debug") -> None:
         pass
 
     # Enable environment variables
-    # Relevant for ocr and other transformer-based models
+    # Relevant for transformer-based models
     import os
 
     os.environ["PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION"] = "python"
@@ -240,7 +230,6 @@ def init_builtin_udfs(db: EvaDBDatabase, mode: str = "debug") -> None:
         norfair_obj_tracker_query,
         chatgpt_udf_query,
         face_detection_udf_query,
-        # ocr_udf_query,
         # Mvit_udf_query,
         Sift_udf_query,
         Yolo_udf_query,

diff --git a/evadb/utils/generic_utils.py b/evadb/utils/generic_utils.py
@@ -294,6 +294,16 @@ def try_to_import_cv2():
         )
 
 
+def try_to_import_timm():
+    try:
+        import timm  # noqa: F401
+    except ImportError:
+        raise ValueError(
+            """Could not import timm python package.
+                Please install them with `pip install timm`."""
+        )
+
+
 def try_to_import_kornia():
     try:
         import kornia  # noqa: F401

diff --git a/test/integration_tests/test_huggingface_udfs.py b/test/integration_tests/test_huggingface_udfs.py
@@ -276,7 +276,6 @@ def test_summarization_from_video(self):
         drop_udf_query = f"DROP UDF {summary_udf};"
         execute_query_fetch_all(self.evadb, drop_udf_query)
 
-    @pytest.mark.benchmark
     def test_toxicity_classification(self):
         udf_name = "HFToxicityClassifier"
         create_udf_query = f"""CREATE UDF {udf_name}

diff --git a/test/integration_tests/test_ocr_extractor.py b/test/integration_tests/test_ocr_extractor.py
diff --git a/test/util.py b/test/util.py
@@ -12,7 +12,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import asyncio
 import gc
 import multiprocessing as mp
 import os
@@ -230,7 +229,7 @@ def get_physical_query_plan(
     db, query: str, rule_manager=None, cost_model=None
 ) -> AbstractPlan:
     l_plan = get_logical_query_plan(db, query)
-    p_plan = asyncio.run(PlanGenerator(db, rule_manager, cost_model).build(l_plan))
+    p_plan = PlanGenerator(db, rule_manager, cost_model).build(l_plan)
     return p_plan