Merge branch 'main' into contributing-guide

google · Jun 5, 2024 · f788847 · f788847
2 parents 52a6206 + 5ee4fb1
commit f788847
Show file tree

Hide file tree

Showing 17 changed files with 122 additions and 900 deletions.
diff --git a/Makefile b/Makefile
@@ -28,6 +28,9 @@ analyze:
 
 # Core ---
 
+get_core:
+	cd packages/mediapipe-core && dart pub get
+
 # Runs `ffigen` for `mediapipe_core`
 generate_core:
 	cd packages/mediapipe-core && dart run ffigen --config=ffigen.yaml
@@ -36,20 +39,29 @@ generate_core:
 test_core:
 	cd packages/mediapipe-core && dart test
 
+core: get_core generate_core test_core
+
 # Text ---
 
 # Runs `ffigen` for `mediapipe_text`
 generate_text:
 	cd packages/mediapipe-task-text && dart --enable-experiment=native-assets run ffigen --config=ffigen.yaml
 
 # Runs all text tests
+
+get_text:
+	cd packages/mediapipe-task-text && dart pub get
+	cd packages/mediapipe-task-text/example && flutter pub get
+
 test_text:
 	cd packages/mediapipe-task-text && dart --enable-experiment=native-assets test
 	cd packages/mediapipe-task-text/example && flutter test
 
 example_text:
 	cd packages/mediapipe-task-text/example && flutter run -d macos
 
+text: get_text generate_text test_text
+
 # GenAI ---
 generate_genai:
 	cd packages/mediapipe-task-genai && dart --enable-experiment=native-assets run ffigen --config=ffigen.yaml

diff --git a/packages/mediapipe-core/lib/generated/core_symbols.yaml b/packages/mediapipe-core/lib/generated/core_symbols.yaml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 files:
-  ? package:mediapipe_core/src/io/third_party/mediapipe/generated/mediapipe_common_bindings.dart
-  : used-config:
+  package:mediapipe_core/src/io/third_party/mediapipe/generated/mediapipe_common_bindings.dart:
+    used-config:
       ffi-native: false
     symbols:
       c:@S@BaseOptions:

diff --git a/packages/mediapipe-core/lib/mediapipe_core.dart b/packages/mediapipe-core/lib/mediapipe_core.dart
@@ -7,6 +7,7 @@
 library mediapipe_core;
 
 export 'src/extensions.dart';
+export 'src/ffi_utils.dart';
 export 'src/interface/containers.dart' show EmbeddingType;
 export 'universal_mediapipe_core.dart'
     if (dart.library.html) 'src/web/mediapipe_core.dart'

diff --git a/packages/mediapipe-core/lib/src/containers.dart b/packages/mediapipe-core/lib/src/containers.dart
diff --git a/.../mediapipe-core/lib/src/io/third_party/mediapipe/generated/mediapipe_common_bindings.dart b/.../mediapipe-core/lib/src/io/third_party/mediapipe/generated/mediapipe_common_bindings.dart
@@ -227,6 +227,8 @@ const int false1 = 0;
 
 const int __WORDSIZE = 64;
 
+const int __has_safe_buffers = 1;
+
 const int __DARWIN_ONLY_64_BIT_INO_T = 1;
 
 const int __DARWIN_ONLY_UNIX_CONFORMANCE = 1;

diff --git a/packages/mediapipe-core/lib/src/task_options.dart b/packages/mediapipe-core/lib/src/task_options.dart