rollback rollback rollback, rollback to where we were

cloud-annotations · Jan 11, 2020 · 19d4968 · 19d4968
1 parent ab3a037
commit 19d4968
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 19 deletions.
diff --git a/cacli/cmd/train.go b/cacli/cmd/train.go
@@ -57,6 +57,6 @@ func init() {
 	trainCmd.Flags().String("script", "", "Custom training script.zip")
 
 	trainCmd.Flags().String("framework", "tensorflow", "keras, pytorch, caffe")
-	trainCmd.Flags().String("frameworkv", "1.14", "Framework version")
+	trainCmd.Flags().String("frameworkv", "1.12", "Framework version")
 	trainCmd.Flags().String("pythonv", "3.6", "Python version")
 }
diff --git a/trainer/src/convert/convert.py b/trainer/src/convert/convert.py
@@ -80,11 +80,11 @@ def infer_model_structure():
     print(e)
     print("Unable to convert to TensorFlow Lite")
 
-# try:
-#     if args.tfjs:
-#         from convert.convert_to_tfjs import convert_to_tfjs
-#         output_names = model_structure['output_names']
-#         convert_to_tfjs(args.exported_graph_path, output_names, args.tfjs_path)
-# except Exception as e:
-#     print(e)
-#     print("Unable to convert to TensorFlow.js")
+try:
+    if args.tfjs:
+        from convert.convert_to_tfjs import convert_to_tfjs
+        output_names = model_structure['output_names']
+        convert_to_tfjs(args.exported_graph_path, output_names, args.tfjs_path)
+except Exception as e:
+    print(e)
+    print("Unable to convert to TensorFlow.js")
diff --git a/trainer/src/start.sh b/trainer/src/start.sh
@@ -65,13 +65,4 @@ python -m convert.convert --tfjs --coreml --tflite \
   --tfjs-path=${RESULT_DIR}/model_web \
   --mlmodel-path=${RESULT_DIR}/model_ios \
   --tflite-path=${RESULT_DIR}/model_android \
-  --exported-graph-path=$OUTPUT_DIRECTORY
-
-tensorflowjs_converter \
-  --input_format=tf_frozen_model \
-  --output_format=tfjs_graph_model \
-  --output_node_names='Postprocessor/ExpandDims_1,Postprocessor/Slice' \
-  --quantization_bytes=1 \
-  --skip_op_check \
-  $OUTPUT_DIRECTORY/frozen_inference_graph.pb \
-  /model_web
+  --exported-graph-path=$OUTPUT_DIRECTORY