Random refactor (#7939)

* random refactor * fix * fix * fix * fix
starimpact · Sep 26, 2017 · 0ad14b6 · 0ad14b6
1 parent e040610
commit 0ad14b6
Show file tree

Hide file tree

Showing 14 changed files with 723 additions and 57 deletions.
diff --git a/cpp-package/include/mxnet-cpp/ndarray.hpp b/cpp-package/include/mxnet-cpp/ndarray.hpp
@@ -240,10 +240,10 @@ inline void NDArray::WaitToWrite() {
 }
 inline void NDArray::WaitAll() { CHECK_EQ(MXNDArrayWaitAll(), 0); }
 inline void NDArray::SampleGaussian(mx_float mu, mx_float sigma, NDArray *out) {
-  Operator("_sample_normal")(mu, sigma).Invoke(*out);
+  Operator("_random_normal")(mu, sigma).Invoke(*out);
 }
 inline void NDArray::SampleUniform(mx_float begin, mx_float end, NDArray *out) {
-  Operator("_sample_uniform")(begin, end).Invoke(*out);
+  Operator("_random_uniform")(begin, end).Invoke(*out);
 }
 inline void NDArray::Load(const std::string &file_name,
                           std::vector<NDArray> *array_list,

diff --git a/perl-package/AI-MXNet/lib/AI/MXNet/Random.pm b/perl-package/AI-MXNet/lib/AI/MXNet/Random.pm
@@ -58,13 +58,13 @@ method seed(Int $seed_state)
 }
 
 for my $method (
-        [qw/_sample_uniform uniform/],
-        [qw/_sample_normal normal/],
-        [qw/_sample_gamma gamma/],
-        [qw/_sample_exponential exponential/],
-        [qw/_sample_poisson poisson/],
-        [qw/_sample_negbinomial negative_binomial/],
-        [qw/_sample_gennegbinomial generalized_negative_binomial/],
+        [qw/_random_uniform uniform/],
+        [qw/_random_normal normal/],
+        [qw/_random_gamma gamma/],
+        [qw/_random_exponential exponential/],
+        [qw/_random_poisson poisson/],
+        [qw/_random_negbinomial negative_binomial/],
+        [qw/_random_gennegbinomial generalized_negative_binomial/],
 )
 {
     my ($nd_method_name, $rnd_method_name) = @{$method};

diff --git a/python/mxnet/base.py b/python/mxnet/base.py
@@ -365,7 +365,7 @@ def _as_list(obj):
         return [obj]
 
 
-_OP_NAME_PREFIX_LIST = ['_contrib_', '_linalg_', '_random_', '_sparse_']
+_OP_NAME_PREFIX_LIST = ['_contrib_', '_linalg_', '_sparse_']
 
 
 def _get_op_name_prefix(op_name):

diff --git a/python/mxnet/ndarray/__init__.py b/python/mxnet/ndarray/__init__.py
@@ -17,7 +17,7 @@
 
 """NDArray API of MXNet."""
 
-from . import _internal, contrib, linalg, random, sparse
+from . import _internal, contrib, linalg, sparse, random
 # pylint: disable=wildcard-import, redefined-builtin
 from .op import *
 from .ndarray import *