Optimizing for coreml

PINTO0309 · Feb 16, 2022 · ab7d962 · ab7d962
1 parent 00d714d
commit ab7d962
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -325,6 +325,7 @@ usage: tflite2tensorflow
   [--output_tftrt_float32]
   [--output_tftrt_float16]
   [--output_coreml]
+  [--optimizing_coreml]
   [--output_edgetpu]
   [--edgetpu_compiler_timeout EDGETPU_COMPILER_TIMEOUT]
   [--edgetpu_num_segments EDGETPU_NUM_SEGMENTS]
@@ -339,7 +340,7 @@ usage: tflite2tensorflow
   [--optimizing_for_openvino_and_myriad]
   [--rigorous_optimization_for_myriad]
   [--replace_swish_and_hardswish]
-  [--optimizing_hardswish_for_edgetpu]
+  [--optimizing_for_edgetpu]
   [--replace_prelu_and_minmax]
   [--disable_experimental_new_quantizer]
   [--locationids_of_the_terminating_output]
@@ -404,6 +405,8 @@ optional arguments:
                         tftrt float16 model output switch
   --output_coreml
                         coreml model output switch
+  --optimizing_for_coreml
+                         Optimizing graph for coreml
   --output_edgetpu
                         edgetpu model output switch
   --edgetpu_compiler_timeout
@@ -438,8 +441,8 @@ optional arguments:
                         e.g. 'Abs' -> 'Square' + 'Sqrt'
   --replace_swish_and_hardswish
                         Replace swish and hard-swish with each other
-  --optimizing_hardswish_for_edgetpu
-                        Optimizing hardswish for edgetpu
+  --optimizing_for_edgetpu
+                        Optimizing for edgetpu
   --replace_prelu_and_minmax
                         Replace prelu and minimum/maximum with each other
   --disable_experimental_new_quantizer
@@ -484,8 +487,18 @@ $ tflite2tensorflow \
   --flatc_path ../flatc \
   --schema_path ../schema.fbs \
   --output_pb \
-  --optimizing_hardswish_for_edgetpu
+  --optimizing_for_edgetpu
 ```
+or
+```
+$ tflite2tensorflow \
+  --model_path segm_full_v679.tflite \
+  --flatc_path ../flatc \
+  --schema_path ../schema.fbs \
+  --output_pb \
+  --optimizing_for_coreml
+```
+
 ### 4-3. Step 2 : Generation of quantized tflite, TFJS, TF-TRT, EdgeTPU, CoreML and ONNX
 ```
 $ tflite2tensorflow \

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
     setup(
         name="tflite2tensorflow",
         scripts=scripts,
-        version="1.18.4",
+        version="1.19.0",
         description="Generate saved_model, tfjs, tf-trt, EdgeTPU, CoreML, quantized tflite, ONNX, OpenVINO, Myriad Inference Engine blob and .pb from .tflite.",
         long_description=long_description,
         long_description_content_type="text/markdown",

diff --git a/tflite2tensorflow/tflite2tensorflow.py b/tflite2tensorflow/tflite2tensorflow.py
@@ -415,7 +415,9 @@ def make_graph(
     replace_prelu_and_minmax,
     optimizing_for_edgetpu_flg,
     optimizing_for_openvino_and_myriad,
-    rigorous_optimization_for_myriad):
+    rigorous_optimization_for_myriad,
+    optimizing_for_coreml,
+):
 
     import tensorflow.compat.v1 as tf
     tf.get_logger().setLevel('INFO')
@@ -1443,6 +1445,12 @@ def upsampling2d_bilinear(x, size_height, size_width, align_corners, half_pixel_
                                 align_corners=True,
                                 half_pixel_centers=half_pixel_centers
                             )
+                    elif optimizing_for_coreml:
+                        return tf.image.resize_bilinear(
+                            x,
+                            (size_height, size_width),
+                            align_corners=True
+                        )
                     else:
                         return tfv2.image.resize(
                             x,
@@ -1496,6 +1504,12 @@ def upsampling2d_nearrest(x, size_height, size_width, align_corners, half_pixel_
                                 align_corners=True,
                                 half_pixel_centers=half_pixel_centers
                             )
+                    elif optimizing_for_coreml:
+                        return tf.image.resize_nearest_neighbor(
+                            x,
+                            (size_height, size_width),
+                            align_corners=True
+                        )
                     else:
                         return tfv2.image.resize(
                             x,
@@ -5547,6 +5561,7 @@ def main():
     parser.add_argument('--output_tftrt_float32', action='store_true', help='tftrt float32 model output switch')
     parser.add_argument('--output_tftrt_float16', action='store_true', help='tftrt float16 model output switch')
     parser.add_argument('--output_coreml', action='store_true', help='coreml model output switch')
+    parser.add_argument('--optimizing_for_coreml', action='store_true', help='Optimizing graph for coreml')
     parser.add_argument('--output_edgetpu', action='store_true', help='edgetpu model output switch')
     parser.add_argument('--edgetpu_compiler_timeout', type=int, default=3600, help='edgetpu_compiler timeout for one compilation process in seconds. Default: 3600')
     parser.add_argument('--edgetpu_num_segments', type=int, default=1, help='Partition the model into [num_segments] segments. Default: 1 (no partition)')
@@ -5561,7 +5576,7 @@ def main():
     parser.add_argument('--optimizing_for_openvino_and_myriad', action='store_true', help='Optimizing graph for openvino/myriad')
     parser.add_argument('--rigorous_optimization_for_myriad', action='store_true', help='Replace operations that are not supported by myriad with operations that are as feasible as possible.')
     parser.add_argument('--replace_swish_and_hardswish', action='store_true', help='Replace swish and hard-swish with each other')
-    parser.add_argument('--optimizing_hardswish_for_edgetpu', action='store_true', help='Optimizing hardswish for edgetpu')
+    parser.add_argument('--optimizing_for_edgetpu', action='store_true', help='Optimizing for edgetpu')
     parser.add_argument('--replace_prelu_and_minmax', action='store_true', help='Replace prelu and minimum/maximum with each other')
     parser.add_argument('--disable_experimental_new_quantizer', action='store_true', help='Disable MLIR\'s new quantization feature during INT8 quantization in TensorFlowLite.')
     parser.add_argument('--locationids_of_the_terminating_output', type=str, default='', help='A comma-separated list of location IDs to be used as output layers. Default: \'\'')
@@ -5595,6 +5610,7 @@ def main():
     output_tftrt_float32 = args.output_tftrt_float32
     output_tftrt_float16 = args.output_tftrt_float16
     output_coreml = args.output_coreml
+    optimizing_for_coreml = args.optimizing_for_coreml
     output_edgetpu = args.output_edgetpu
     edgetpu_compiler_timeout = args.edgetpu_compiler_timeout
     edgetpu_num_segments = args.edgetpu_num_segments
@@ -5609,7 +5625,7 @@ def main():
     optimizing_for_openvino_and_myriad = args.optimizing_for_openvino_and_myriad
     rigorous_optimization_for_myriad = args.rigorous_optimization_for_myriad
     replace_swish_and_hardswish = args.replace_swish_and_hardswish
-    optimizing_hardswish_for_edgetpu = args.optimizing_hardswish_for_edgetpu
+    optimizing_for_edgetpu = args.optimizing_for_edgetpu
     replace_prelu_and_minmax = args.replace_prelu_and_minmax
     use_experimental_new_quantizer = not args.disable_experimental_new_quantizer
     locationids_of_the_terminating_output_tmp = args.locationids_of_the_terminating_output
@@ -5626,7 +5642,7 @@ def main():
         output_full_integer_quant_tflite = True
         optimizing_for_edgetpu_flg = True
 
-    if optimizing_hardswish_for_edgetpu:
+    if optimizing_for_edgetpu:
         optimizing_for_edgetpu_flg = True
 
     from pkg_resources import working_set
@@ -5711,8 +5727,16 @@ def main():
         print('[Group.2] output_no_quant_float32_tflite, output_weight_quant_tflite, output_float16_quant_tflite, output_integer_quant_tflite, output_full_integer_quant_tflite, output_tfjs, output_tftrt_float32, output_tftrt_float16, output_coreml, output_edgetpu, output_onnx, output_openvino_and_myriad')
         sys.exit(-1)
 
-    if optimizing_for_openvino_and_myriad and optimizing_hardswish_for_edgetpu:
-        print(f'{Color.RED}ERROR:{Color.RESET} optimizing_for_openvino_and_myriad and optimizing_hardswish_for_edgetpu cannot be True at the same time.')
+    if optimizing_for_openvino_and_myriad and optimizing_for_edgetpu:
+        print(f'{Color.RED}ERROR:{Color.RESET} optimizing_for_openvino_and_myriad and optimizing_for_edgetpu cannot be True at the same time.')
+        sys.exit(-1)
+
+    if optimizing_for_openvino_and_myriad and optimizing_for_coreml:
+        print(f'{Color.RED}ERROR:{Color.RESET} optimizing_for_openvino_and_myriad and optimizing_for_coreml cannot be True at the same time.')
+        sys.exit(-1)
+
+    if optimizing_for_edgetpu and optimizing_for_coreml:
+        print(f'{Color.RED}ERROR:{Color.RESET} optimizing_for_edgetpu and optimizing_for_coreml cannot be True at the same time.')
         sys.exit(-1)
 
     if not optimizing_for_openvino_and_myriad and rigorous_optimization_for_myriad:
@@ -5756,7 +5780,9 @@ def main():
             replace_prelu_and_minmax,
             optimizing_for_edgetpu_flg,
             optimizing_for_openvino_and_myriad,
-            rigorous_optimization_for_myriad)
+            rigorous_optimization_for_myriad,
+            optimizing_for_coreml
+        )
         print('@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@')
         print('outputs:')
         dummy_outputs = []