Skip to content

Commit 5ee4fb1

Browse files
authored
maintenance changes to fix CI issues (#60)
1 parent bde06c9 commit 5ee4fb1

File tree

17 files changed

+122
-910
lines changed

17 files changed

+122
-910
lines changed

Makefile

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@ test: generate_core test_core generate_text test_text
1717
# Runs all tests for all packages
1818
test_only: test_core test_text
1919

20-
# Rebuilds the MediaPipe task for macOS
21-
# Assumes google/mediapipe and google/flutter-mediapipe are siblings on the file system
22-
compile_text_classifier_macos_arm:
23-
cd ../mediapipe && bazel build --linkopt -s --config darwin_arm64 --strip always --define MEDIAPIPE_DISABLE_GPU=1 mediapipe/tasks/c/text/text_classifier:libtext_classifier.dylib
24-
cd ../mediapipe && sudo cp bazel-bin/mediapipe/tasks/c/text/text_classifier/libtext_classifier.dylib ../flutter-mediapipe/packages/mediapipe-task-text/example/assets/libtext_classifier_arm64.dylib
25-
26-
compile_text_classifier_macos_x86:
27-
cd ../mediapipe && bazel build --linkopt -s --config darwin_x86_64 --strip always --define MEDIAPIPE_DISABLE_GPU=1 mediapipe/tasks/c/text/text_classifier:libtext_classifier.dylib
28-
cd ../mediapipe && sudo cp bazel-bin/mediapipe/tasks/c/text/text_classifier/libtext_classifier.dylib ../flutter-mediapipe/packages/mediapipe-task-text/example/assets/libtext_classifier_x64.dylib
29-
3020
# Runs `sdks_finder` to update manifest files
3121
sdks:
3222
dart tool/builder/bin/main.dart sdks
@@ -38,6 +28,9 @@ analyze:
3828

3929
# Core ---
4030

31+
get_core:
32+
cd packages/mediapipe-core && dart pub get
33+
4134
# Runs `ffigen` for `mediapipe_core`
4235
generate_core:
4336
cd packages/mediapipe-core && dart run ffigen --config=ffigen.yaml
@@ -46,20 +39,29 @@ generate_core:
4639
test_core:
4740
cd packages/mediapipe-core && dart test
4841

42+
core: get_core generate_core test_core
43+
4944
# Text ---
5045

5146
# Runs `ffigen` for `mediapipe_text`
5247
generate_text:
5348
cd packages/mediapipe-task-text && dart --enable-experiment=native-assets run ffigen --config=ffigen.yaml
5449

5550
# Runs all text tests
51+
52+
get_text:
53+
cd packages/mediapipe-task-text && dart pub get
54+
cd packages/mediapipe-task-text/example && flutter pub get
55+
5656
test_text:
5757
cd packages/mediapipe-task-text && dart --enable-experiment=native-assets test
5858
cd packages/mediapipe-task-text/example && flutter test
5959

6060
example_text:
6161
cd packages/mediapipe-task-text/example && flutter run -d macos
6262

63+
text: get_text generate_text test_text
64+
6365
# GenAI ---
6466
generate_genai:
6567
cd packages/mediapipe-task-genai && dart --enable-experiment=native-assets run ffigen --config=ffigen.yaml

packages/mediapipe-core/lib/generated/core_symbols.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
format_version: 1.0.0
22
files:
3-
? package:mediapipe_core/src/io/third_party/mediapipe/generated/mediapipe_common_bindings.dart
4-
: used-config:
3+
package:mediapipe_core/src/io/third_party/mediapipe/generated/mediapipe_common_bindings.dart:
4+
used-config:
55
ffi-native: false
66
symbols:
77
c:@S@BaseOptions:

packages/mediapipe-core/lib/mediapipe_core.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
library mediapipe_core;
88

99
export 'src/extensions.dart';
10+
export 'src/ffi_utils.dart';
1011
export 'src/interface/containers.dart' show EmbeddingType;
1112
export 'universal_mediapipe_core.dart'
1213
if (dart.library.html) 'src/web/mediapipe_core.dart'

packages/mediapipe-core/lib/src/containers.dart

Lines changed: 0 additions & 162 deletions
This file was deleted.

packages/mediapipe-core/lib/src/io/third_party/mediapipe/generated/mediapipe_common_bindings.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,8 @@ const int false1 = 0;
227227

228228
const int __WORDSIZE = 64;
229229

230+
const int __has_safe_buffers = 1;
231+
230232
const int __DARWIN_ONLY_64_BIT_INO_T = 1;
231233

232234
const int __DARWIN_ONLY_UNIX_CONFORMANCE = 1;

0 commit comments

Comments
 (0)