Skip to content
This repository has been archived by the owner on Jan 18, 2022. It is now read-only.

Commit

Permalink
Fix remaining bugs of the library (#29)
Browse files Browse the repository at this point in the history
* Starting to fix every literal bug of the lib

* Removed protofiles as they should be downloaded automatically through the build script

* Tried to reintegrate mediapipe_api, third_party and build.py... Still doesn't build

* Added another missing Assert()

* Added *another* other missing Assert()

* Remove CharSet attribute

The `CharSet = CharSet.Unicode` was making the test fail.

* Remove CharSet attribute on google logging unsafe native methods

* Mismatch: MpPtr

* D:

* Added StandardError enum

* Re-add opencv flags and disable Windows again

* Make SignalAbortAttribute filterable

Co-authored-by: Capuccino <[email protected]>
  • Loading branch information
Speykious and sr229 authored Sep 28, 2021
1 parent 2b1d191 commit e9eb330
Show file tree
Hide file tree
Showing 37 changed files with 161 additions and 1,895 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
os:
- { prettyname: Windows, fullname: windows-latest }
# - { prettyname: Windows, fullname: windows-latest }
- { prettyname: Linux, fullname: ubuntu-latest }
steps:
- name: Cache Bazel directory
Expand Down Expand Up @@ -60,13 +60,13 @@ jobs:
$env:PYTHON_BIN_PATH=(Get-Command python).Path
echo $env:PYTHON_BIN_PATH
pip install numpy
python build.py build --desktop cpu -vv
python build.py build --desktop cpu --opencv=local -vv
- name: Build (Native, *nix)
if: ${{ matrix.os.prettyname != 'Windows' }}
run: |
pip install numpy
python build.py build --desktop cpu -vv
python build.py build --desktop cpu --opencv=cmake -vv
- name: Build (.NET)
run: dotnet build -c Debug src/${{env.PROJECT_NAME}}.sln
Expand Down
6 changes: 3 additions & 3 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ def __init__(self, command_args):

self.system = platform.system()
self.desktop = command_args.args.desktop
self.protobuf = command_args.args.protobuf
# self.android = command_args.args.android
# self.ios= command_args.args.ios
self.resources = command_args.args.resources
Expand All @@ -102,7 +103,6 @@ def __init__(self, command_args):

self.compilation_mode = command_args.args.compilation_mode
self.linkopt = command_args.args.linkopt
self.protobuf = command_args.args.protobuf

def run(self):
if self.protobuf:
Expand Down Expand Up @@ -163,7 +163,7 @@ def run(self):
# os.path.join(_BAZEL_BIN_PATH, 'mediapipe_api', 'objc', 'MediaPipeUnity.zip'),
# os.path.join(_BUILD_PATH, 'Plugins', 'iOS'))

# self.console.info('Built native libraries for iOS')


self.console.info('Printing build path...')
for root, directories, files in os.walk(_BUILD_PATH, topdown=False):
Expand Down Expand Up @@ -325,7 +325,7 @@ def run(self):
if self.ios:
self.console.info('Uninstalling native libraries for iOS...')

ios_framework_path = os.path.join(_INSTALL_PATH, 'Plugins', 'iOS', 'MediaPipeUnity.framework')
ios_framework_path = os.path.join(_INSTALL_PATH, 'Plugins', 'iOS', 'Akihabara.framework')

if os.path.exists(ios_framework_path):
self._rmtree(ios_framework_path)
Expand Down
4 changes: 2 additions & 2 deletions mediapipe_api/objc/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ objc_library(
)

ios_framework(
name = "MediaPipeUnity",
bundle_id = "YOUR_BUNDLE_ID_HERE.MediaPipeUnity",
name = "Akihabara",
bundle_id = "YOUR_BUNDLE_ID_HERE.Akihabara",
families = [
"iphone",
"ipad",
Expand Down
158 changes: 0 additions & 158 deletions protofiles/any.proto

This file was deleted.

Loading

0 comments on commit e9eb330

Please sign in to comment.