Handle mask-rcnn conversion for ort 1.2

applications/mask_rcnn/mask_rcnn.py

@@ -110,7 +110,8 @@ def convert_apply_box_deltas_graph(scope, operator, container, oopb, box_transpo
  ('_delta', oopb.int64, np.array([1], dtype='int64'))
  ],
  operator.inputs[1].full_name + '_prob_range',
- op_domain='com.microsoft')
+ op_domain='com.microsoft',
+ op_version=1)
 
  attrs = {'axes': [1]}
  prob_range_unsqueeze = oopb.add_node('Unsqueeze',
@@ -129,8 +130,7 @@ def convert_apply_box_deltas_graph(scope, operator, container, oopb, box_transpo
 
  deltas_specific = oopb.add_node('GatherND',
  [deltas_squeeze, indices],
- operator.inputs[2].full_name + '_deltas_specific',
- op_domain='com.microsoft')
+ operator.inputs[2].full_name + '_deltas_specific')
  # output shape: [spatial_dimension, 4]
 
  BBOX_STD_DEV = np.array([0.1, 0.1, 0.2, 0.2], dtype='float32')
@@ -580,7 +580,7 @@ def convert_DetectionLayer(scope, operator, container):
  container.add_node("GatherND",
  [score_squeeze.full_name, class_box_idx_output.full_name],
  score_gather,
- op_version=operator.target_opset, op_domain='com.microsoft',
+ op_version=operator.target_opset,
  name=nms_node.name + '_score_gather')
  # output shape: [num_selected_indices]
 
@@ -651,8 +651,7 @@ def convert_DetectionLayer(scope, operator, container):
  [all_gather,
  np.array([0, 0, DETECTION_MAX_INSTANCES, 0],
  dtype=np.int64)],
- nms_node.name + '_padded_result',
- op_domain='com.microsoft')
+ nms_node.name + '_padded_result')
  detection_final = oopb.add_node('Slice',
  [padded_result,
  ('_start', oopb.int64, np.array([0], dtype='int64')),

applications/nightly_build/test_mask_rcnn.py

@@ -29,12 +29,6 @@
 working_path = os.path.abspath(os.path.dirname(__file__))
 tmp_path = os.path.join(working_path, 'temp')
 
-enable_mask_rcnn_test = False
-
-import onnxruntime
-if StrictVersion(onnxruntime.__version__.split('-')[0]) == StrictVersion('1.1.1'):
- enable_mask_rcnn_test = True
-
 # mask rcnn code From https:/matterport/Mask_RCNN
 class TestMaskRCNN(unittest.TestCase):
 
@@ -45,7 +39,7 @@ def tearDown(self):
  for fl in self.model_files:
  os.remove(fl)
 
- @unittest.skipIf(StrictVersion(onnx.__version__.split('-')[0]) < StrictVersion("1.6.0") or not enable_mask_rcnn_test,
+ @unittest.skipIf(StrictVersion(onnx.__version__.split('-')[0]) < StrictVersion("1.6.0"),
  "Mask-rcnn conversion needs contrib op for onnx < 1.6.0.")
  def test_mask_rcnn(self):
  set_converter('CropAndResize', convert_tf_crop_and_resize)

keras2onnx/main.py

@@ -34,7 +34,7 @@ def convert_keras(model, name=None, doc_string='', target_opset=None,
  """
  if isinstance(model, tf.keras.Model) and not is_tf_keras:
  raise Exception("This is a tensorflow keras model, but keras standalone converter is used." +
- " Please set environment variable TF_KERAS = 1.")
+ " Please set environment variable TF_KERAS = 1 before importing keras2onnx.")
 
  set_logger_level(logging.DEBUG if debug_mode else logging.INFO)
  if is_tf2:

tests/test_utils.py

@@ -28,6 +28,7 @@ def convert_tf_crop_and_resize(scope, operator, container):
  transpose_node + operator.input_full_names[1:],
  operator.full_name + '_crop_and_resize',
  op_domain='com.microsoft',
+ op_version=1,
  mode=mode_value)
  oopb.apply_op_with_output("apply_transpose",
  cropandresize,