From 7252018f93645da172f5d63a4acc456fa8f1f231 Mon Sep 17 00:00:00 2001
From: Andrey Stotskiy <andrey.stotskiy@tevian.ru>
Date: Tue, 14 Apr 2020 17:59:11 +0300
Subject: [PATCH] bump onnx version to 1.5

---
 ci/docker/install/ubuntu_onnx.sh              |  2 +-
 .../contrib/onnx/mx2onnx/_op_translations.py  | 40 +++++++++++++++----
 tests/python-pytest/onnx/test_cases.py        | 18 ++++-----
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/ci/docker/install/ubuntu_onnx.sh b/ci/docker/install/ubuntu_onnx.sh
index 44d6b9ed52dc..335572b379dc 100755
--- a/ci/docker/install/ubuntu_onnx.sh
+++ b/ci/docker/install/ubuntu_onnx.sh
@@ -31,4 +31,4 @@ apt-get update || true
 apt-get install -y libprotobuf-dev protobuf-compiler
 
 echo "Installing pytest, pytest-cov, protobuf, Pillow, ONNX and tabulate ..."
-pip3 install pytest==3.6.3 pytest-cov==2.5.1 protobuf==3.5.2 onnx==1.3.0 Pillow==5.0.0 tabulate==0.7.5
+pip3 install pytest==3.6.3 pytest-cov==2.5.1 protobuf==3.5.2 onnx==1.5.0 Pillow==5.0.0 tabulate==0.7.5
diff --git a/python/mxnet/contrib/onnx/mx2onnx/_op_translations.py b/python/mxnet/contrib/onnx/mx2onnx/_op_translations.py
index 45eb1e56ea52..247b39301b78 100644
--- a/python/mxnet/contrib/onnx/mx2onnx/_op_translations.py
+++ b/python/mxnet/contrib/onnx/mx2onnx/_op_translations.py
@@ -1614,16 +1614,34 @@ def convert_slice_axis(node, **kwargs):
         in_shape = kwargs['in_shape'][0]
         ends = in_shape[axes]
 
+    export_nodes = []
+
+    starts = np.atleast_1d(np.asarray(starts, dtype=np.int))
+    ends = np.atleast_1d(np.asarray(ends, dtype=np.int))
+    axes = np.atleast_1d(np.asarray(axes, dtype=np.int))
+
+    starts_node = create_helper_tensor_node(starts, name + '__starts', kwargs)
+    export_nodes.extend(starts_node)
+    starts_node = starts_node[-1].name
+
+    ends_node = create_helper_tensor_node(ends, name + '__ends', kwargs)
+    export_nodes.extend(ends_node)
+    ends_node = ends_node[-1].name
+
+    axes_node = create_helper_tensor_node(axes, name + '__axes', kwargs)
+    export_nodes.extend(axes_node)
+    axes_node = axes_node[-1].name
+
+    input_node = input_nodes[0]
     node = onnx.helper.make_node(
         "Slice",
-        input_nodes,
+        [input_node, starts_node, ends_node, axes_node],
         [name],
-        axes=[axes],
-        starts=[starts],
-        ends=[int(ends)],
         name=name,
     )
-    return [node]
+    export_nodes.extend([node])
+
+    return export_nodes
 
 
 @mx_op.register("SliceChannel")
@@ -2181,14 +2199,22 @@ def convert_topk(node, **kwargs):
     else:
         raise NotImplementedError("ONNX expects both value and indices as output")
 
+    export_nodes = []
+
+    k = np.asarray([k], dtype=np.int)
+    k_node = create_helper_tensor_node(k, name + '__k', kwargs)
+    export_nodes.extend(k_node)
+    k_node = k_node[-1].name
+
+    input_node = input_nodes[0]
     topk_node = onnx.helper.make_node(
         "TopK",
-        input_nodes,
+        [input_node, k_node],
         outputs,
         axis=axis,
-        k=k,
         name=name
     )
+    export_nodes.extend([topk_node])
 
     return [topk_node]
 
diff --git a/tests/python-pytest/onnx/test_cases.py b/tests/python-pytest/onnx/test_cases.py
index 9a72d58e0490..8d4f323b5c83 100644
--- a/tests/python-pytest/onnx/test_cases.py
+++ b/tests/python-pytest/onnx/test_cases.py
@@ -39,9 +39,6 @@
              'test_transpose',
              'test_globalmaxpool',
              'test_globalaveragepool',
-             'test_slice_cpu',
-             'test_slice_neg',
-             'test_slice_end',
              'test_reciprocal',
              'test_sqrt',
              'test_pow',
@@ -54,19 +51,19 @@
              'test_operator_maxpool',
              'test_operator_params',
              'test_operator_permute2',
-             'test_cos',
-             'test_sin',
+             'test_cos[^h]',
+             'test_sin[^h]',
              'test_tan',
-             'test_acos',
-             'test_asin',
-             'test_atan',
+             'test_acos[^h]',
+             'test_asin[^h]',
+             'test_atan[^h]',
              'test_squeeze',
-             'test_matmul',
+             'test_matmul_',
              'test_depthtospace',
              'test_hardsigmoid',
              'test_instancenorm',
              'test_shape',
-             'test_cast',
+             'test_cast((?!STRING).)*$',
              'test_clip',
              'test_size',
              'test_dropout',
@@ -80,7 +77,6 @@
              'test_softplus',
              'test_reduce_',
              'test_split_equal',
-             'test_top_k',
              'test_gather'
              ],
     'import': ['test_softsign',