Merge branch 'master' of https://github.com/emgucv/emgutf

emgucv · Jul 8, 2021 · 5e86593 · 5e86593
2 parents dd63134 + b78b46e
commit 5e86593
Show file tree

Hide file tree

Showing 21 changed files with 52 additions and 36 deletions.
diff --git a/...gu.TF.Lite/Plugins/emgutflite.bundle.meta → ....TF.Lite/Plugins/tfliteextern.bundle.meta b/...gu.TF.Lite/Plugins/emgutflite.bundle.meta → ....TF.Lite/Plugins/tfliteextern.bundle.meta
diff --git a/...e/Plugins/emgutflite.bundle/Contents.meta → ...Plugins/tfliteextern.bundle/Contents.meta b/...e/Plugins/emgutflite.bundle/Contents.meta → ...Plugins/tfliteextern.bundle/Contents.meta
diff --git a/...ins/emgutflite.bundle/Contents/MacOS.meta → ...s/tfliteextern.bundle/Contents/MacOS.meta b/...ins/emgutflite.bundle/Contents/MacOS.meta → ...s/tfliteextern.bundle/Contents/MacOS.meta
diff --git a/...emgutflite.bundle/Contents/Resources.meta → ...liteextern.bundle/Contents/Resources.meta b/...emgutflite.bundle/Contents/Resources.meta → ...liteextern.bundle/Contents/Resources.meta
diff --git a/Emgu.TF.Lite.Unity/Packages/manifest.json b/Emgu.TF.Lite.Unity/Packages/manifest.json
@@ -13,6 +13,7 @@
     "com.unity.test-framework": "1.1.26",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.4.8",
+    "com.unity.toolchain.macos-x86_64-linux-x86_64": "0.1.21-preview",
     "com.unity.ugui": "1.0.0",
     "com.unity.xr.legacyinputhelpers": "2.1.7",
     "com.unity.modules.ai": "1.0.0",

diff --git a/Emgu.TF.Lite.Unity/ProjectSettings/ProjectSettings.asset b/Emgu.TF.Lite.Unity/ProjectSettings/ProjectSettings.asset
diff --git a/Emgu.TF.Lite.Unity/copy_unity_assets b/Emgu.TF.Lite.Unity/copy_unity_assets
@@ -29,3 +29,9 @@ cp ../Emgu.TF.Util/*.cs Assets/Emgu.TF.Lite/Assets/Scripts/Emgu.TF.Util/
 cp ../Emgu.TF.Lite/*.cs Assets/Emgu.TF.Lite/Assets/Scripts/Emgu.TF.Lite/
 cp ../Emgu.Models/*.cs Assets/Emgu.TF.Lite/Assets/Scripts/Emgu.Models/
 cp ../Emgu.TF.Lite.Models/*.cs Assets/Emgu.TF.Lite/Assets/Scripts/Emgu.TF.Lite.Models/
+
+cd Assets/Emgu.TF.Lite/Plugins
+if test -d "../../../../platforms/macos/tfliteextern.bundle"
+then
+    cp -rf ../../../../platforms/macos/tfliteextern.bundle ./
+fi
diff --git a/Emgu.TF.Unity/Assets/Emgu.TF/Plugins/emgutf.bundle/Contents.meta b/Emgu.TF.Unity/Assets/Emgu.TF/Plugins/emgutf.bundle/Contents.meta
diff --git a/...Assets/Emgu.TF/Plugins/emgutf.bundle.meta → ...sets/Emgu.TF/Plugins/tfextern.bundle.meta b/...Assets/Emgu.TF/Plugins/emgutf.bundle.meta → ...sets/Emgu.TF/Plugins/tfextern.bundle.meta
diff --git a/...Plugins/emgutf.bundle/Contents/MacOS.meta → ...ugins/tfextern.bundle/Contents/MacOS.meta b/...Plugins/emgutf.bundle/Contents/MacOS.meta → ...ugins/tfextern.bundle/Contents/MacOS.meta
diff --git a/...ins/emgutf.bundle/Contents/Resources.meta → ...s/tfextern.bundle/Contents/Resources.meta b/...ins/emgutf.bundle/Contents/Resources.meta → ...s/tfextern.bundle/Contents/Resources.meta
diff --git a/Emgu.TF.Unity/Packages/manifest.json b/Emgu.TF.Unity/Packages/manifest.json
@@ -12,6 +12,7 @@
     "com.unity.test-framework": "1.1.26",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.4.8",
+    "com.unity.toolchain.macos-x86_64-linux-x86_64": "0.1.21-preview",
     "com.unity.ugui": "1.0.0",
     "com.unity.xr.legacyinputhelpers": "2.1.7",
     "com.unity.modules.ai": "1.0.0",

diff --git a/Emgu.TF.Unity/ProjectSettings/ProjectSettings.asset b/Emgu.TF.Unity/ProjectSettings/ProjectSettings.asset
diff --git a/Emgu.TF.Unity/ProjectSettings/UnityConnectSettings.asset b/Emgu.TF.Unity/ProjectSettings/UnityConnectSettings.asset
diff --git a/Emgu.TF.Unity/copy_unity_assets b/Emgu.TF.Unity/copy_unity_assets
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash -v
 cd "$(dirname "$0")"
 
 cd Assets
@@ -23,4 +23,10 @@ cp ../Emgu.TF.Util/*.cs Assets/Emgu.TF/Assets/Scripts/Emgu.TF.Util/
 cp ../Emgu.TF/*.cs Assets/Emgu.TF/Assets/Scripts/Emgu.TF/
 cp ../Emgu.TF.Models/*.cs Assets/Emgu.TF/Assets/Scripts/Emgu.TF.Models/
 cp ../Emgu.Models/*.cs Assets/Emgu.TF/Assets/Scripts/Emgu.Models/
-cp ./Assets/csc.rsp* Assets/Emgu.TF/Assets/
+cp ./Assets/csc.rsp* Assets/Emgu.TF/Assets/
+
+if test -d "../platforms/macos/tfextern.bundle"
+then
+    cp -rf ../platforms/macos/tfextern.bundle Assets/Emgu.TF/Plugins/
+fi
+
diff --git a/Emgu.TF/TfInvokeEntryPoints.cs b/Emgu.TF/TfInvokeEntryPoints.cs
@@ -12,11 +12,7 @@ public partial class TfInvoke
         /// <summary>
         /// The file name of the tfextern library
         /// </summary>
-#if UNITY_EDITOR_OSX
-        public const string ExternLibrary = "Assets/Emgu.TF/Plugins/emgutf.bundle/Contents/MacOS/libtfextern.dylib";
-#elif UNITY_STANDALONE_OSX
-        public const string ExternLibrary = "@executable_path/../Plugins/emgutf.bundle/Contents/MacOS/libtfextern.dylib";
-#elif (__IOS__ || UNITY_IPHONE) && (!UNITY_EDITOR)
+#if (__IOS__ || UNITY_IPHONE) && (!UNITY_EDITOR)
         public const string ExternLibrary = "__Internal";
 #else
         public const string ExternLibrary = "tfextern";

diff --git a/platforms/macos/Info.lite.plist b/platforms/macos/Info.lite.plist
@@ -7,9 +7,11 @@
   <key>CFBundleIdentifier</key>
   <string>com.emgu.tf.lite</string>
   <key>CFBundleName</key>
-  <string>EmguTFLite</string>
+  <string>tfliteextern</string>
   <key>CFBundleIconFile</key>
   <string>icons.icns</string>
+  <key>CFBundleExecutable</key>
+  <string>libtfliteextern.dylib</string>
   <key>CFBundleShortVersionString</key>
   <string>0.01</string>
   <key>CFBundleInfoDictionaryVersion</key>

diff --git a/platforms/macos/Info.plist b/platforms/macos/Info.plist
@@ -7,9 +7,11 @@
   <key>CFBundleIdentifier</key>
   <string>com.emgu.tf</string>
   <key>CFBundleName</key>
-  <string>EmguTF</string>
+  <string>tfextern</string>
   <key>CFBundleIconFile</key>
   <string>icons.icns</string>
+  <key>CFBundleExecutable</key>
+  <string>libtfextern.dylib</string>
   <key>CFBundleShortVersionString</key>
   <string>0.01</string>
   <key>CFBundleInfoDictionaryVersion</key>

diff --git a/platforms/macos/bazel_build_tflite_macos b/platforms/macos/bazel_build_tflite_macos
@@ -1,10 +1,15 @@
 #!/bin/bash
 
+if [[ $# -lt 1 ]]; then
+    BAZEL_CPU=darwin
+else
+    BAZEL_CPU=$1
+fi    
 cd "$(dirname "$0")"
 cd ../../
 mkdir -p lib/macos
 cd tensorflow
-bazel build --verbose_failures -c opt --cpu=darwin --cxxopt='--std=c++11' //tensorflow/tfliteextern:libtfliteextern.so
+bazel build --verbose_failures -c opt --cpu=$BAZEL_CPU --cxxopt='--std=c++11' //tensorflow/tfliteextern:libtfliteextern.so
 cp -f bazel-bin/tensorflow/tfliteextern/libtfliteextern.so ../lib/macos/libtfliteextern.dylib
 #cp -f bazel-bin/tensorflow/tfliteextern/libtfliteextern.so ../platforms/osx/darwin_x86_64/libtfliteextern.dylib
 

diff --git a/platforms/macos/makeBundle b/platforms/macos/makeBundle
@@ -1,12 +1,17 @@
 #!/usr/bin/env bash
 
-rm -rf emgutf.bundle
-mkdir emgutf.bundle
-mkdir emgutf.bundle/Contents
-mkdir emgutf.bundle/Contents/MacOS
-mkdir emgutf.bundle/Contents/Resources
-cp ../../lib/macos/libtfextern.dylib emgutf.bundle/Contents/MacOS/
-cp ../../lib/macos/libtensorflow_framework.dylib emgutf.bundle/Contents/MacOS/
-cp Info.plist emgutf.bundle/Contents/
+rm -rf tfextern.bundle
+mkdir -p tfextern.bundle/Contents/MacOS
+mkdir -p tfextern.bundle/Contents/Resources
+mkdir -p tfextern.bundle/Contents/Frameworks
+
+cp ../../lib/macos/libtfextern.dylib tfextern.bundle/Contents/MacOS/
+install_name_tool -change "@rpath/libtensorflow_framework.dylib" "@loader_path/../Frameworks/libtensorflow_framework.dylib" tfextern.bundle/Contents/MacOS/libtfextern.dylib
+chmod u+w tfextern.bundle/Contents/MacOS/libtfextern.dylib
+
+cp ../../lib/macos/libtensorflow_framework.dylib tfextern.bundle/Contents/Frameworks/
+chmod u+w tfextern.bundle/Contents/Frameworks/libtensorflow_framework.dylib
+
+cp Info.plist tfextern.bundle/Contents/
 iconutil -c icns icons.iconset/
-cp icons.icns emgutf.bundle/Contents/Resources/
+cp icons.icns tfextern.bundle/Contents/Resources/
diff --git a/platforms/macos/makeBundleLite b/platforms/macos/makeBundleLite
@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 
-rm -rf emgutflite.bundle
-mkdir emgutflite.bundle
-mkdir emgutflite.bundle/Contents
-mkdir emgutflite.bundle/Contents/MacOS
-mkdir emgutflite.bundle/Contents/Resources
-cp ../../lib/macos/libtfliteextern.dylib emgutflite.bundle/Contents/MacOS/
-cp Info.lite.plist emgutflite.bundle/Contents/Info.plist
+rm -rf tfliteextern.bundle
+mkdir -p tfliteextern.bundle/Contents/MacOS
+mkdir -p tfliteextern.bundle/Contents/Resources
+
+cp ../../lib/macos/libtfliteextern.dylib tfliteextern.bundle/Contents/MacOS/
+chmod u+w tfliteextern.bundle/Contents/MacOS/libtfliteextern.dylib
+
+cp Info.lite.plist tfliteextern.bundle/Contents/Info.plist
 iconutil -c icns icons.iconset/
-cp icons.icns emgutflite.bundle/Contents/Resources/
+cp icons.icns tfliteextern.bundle/Contents/Resources/