From 788e8ce76da6654475160ae943dfb0b451e20fd5 Mon Sep 17 00:00:00 2001 From: ckt624 Date: Wed, 14 Aug 2019 13:00:04 +0800 Subject: [PATCH] Rebase --- python/mxnet/symbol/numpy/_symbol.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python/mxnet/symbol/numpy/_symbol.py b/python/mxnet/symbol/numpy/_symbol.py index da7322df3511..8b95f5bafc99 100644 --- a/python/mxnet/symbol/numpy/_symbol.py +++ b/python/mxnet/symbol/numpy/_symbol.py @@ -1064,7 +1064,6 @@ def tensordot(a, b, axes=2): @set_module('mxnet.symbol.numpy') -<<<<<<< HEAD def linspace(start, stop, num=50, endpoint=True, retstep=False, dtype=None, axis=0, ctx=None): # pylint: disable=too-many-arguments r""" Return evenly spaced numbers over a specified interval. @@ -1311,7 +1310,9 @@ def split(ary, indices_or_sections, axis=0): raise ValueError('indices_or_sections must either int or tuple of ints') ret = _npi.split(ary, indices, axis, False, sections) return ret -======= + + +@set_module('mxnet.symbol.numpy') def inner(a, b): r""" inner(a, b) @@ -1450,7 +1451,6 @@ def vdot(a, b): 30 """ return tensordot(a.flatten(), b.flatten(), 1) ->>>>>>> 80101d60d... Implements inner, outer, vdot. _set_np_symbol_class(_Symbol)