瀏覽代碼

Fix Arm NN browser support

Lutz Roeder 6 年之前
父節點
當前提交
4a54344580
共有 3 個文件被更改,包括 10 次插入4 次删除
  1. 3 2
      src/armnn-schema.js
  2. 1 1
      src/armnn.js
  3. 6 1
      tools/armnn

+ 3 - 2
src/armnn-schema.js

@@ -13935,5 +13935,6 @@ armnnSerializer.SerializedGraph.createSerializedGraph = function(builder, layers
   return armnnSerializer.SerializedGraph.endSerializedGraph(builder);
 }
 
-// Exports for Node.js and RequireJS
-this.armnnSerializer = armnnSerializer;
+if (typeof module !== 'undefined' && typeof module.exports === 'object') {
+  module.exports = armnnSerializer;
+}

+ 1 - 1
src/armnn.js

@@ -23,7 +23,7 @@ armnn.ModelFactory = class {
             try {
                 const buffer = context.buffer;
                 const byteBuffer = new flatbuffers.ByteBuffer(buffer);
-                armnn.schema = armnn_schema.armnnSerializer;
+                armnn.schema = armnn_schema;
                 model = armnn.schema.SerializedGraph.getRootAsSerializedGraph(byteBuffer);
             }
             catch (error) {

+ 6 - 1
tools/armnn

@@ -58,8 +58,13 @@ install() {
 schema() {
     bold "armnn schema"
 
-    ${third_party}/flatbuffers/flatc --js ${third_party}/armnn/src/armnnSerializer/ArmnnSchema.fbs
+    ${third_party}/flatbuffers/flatc --no-js-exports --js ${third_party}/armnn/src/armnnSerializer/ArmnnSchema.fbs
     mv ./ArmnnSchema_generated.js ${src}/armnn-schema.js
+    cat <<EOT >> ${src}/armnn-schema.js
+if (typeof module !== 'undefined' && typeof module.exports === 'object') {
+  module.exports = armnnSerializer;
+}
+EOT
 }
 
 while [ "$#" != 0 ]; do