Positional arguments in symbolic API need type restriction. (apache#134)

* fix positional arguments can only be SymbolicNodes * fix missing signature of Symbolic function in docs
iblislin · Sep 6, 2016 · 9e3a60a · 9e3a60a
1 parent ae1d45b
commit 9e3a60a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/symbolic-node.jl b/src/symbolic-node.jl
@@ -610,7 +610,7 @@ function _define_atomic_symbol_creator(hdr :: MX_handle)
 
   signature = _format_signature(Int(ref_nargs[]), ref_arg_names)
   f_desc = "    " * func_name_s * "(" * signature * ")\n\n"
-  f_desc = unsafe_wrap(String, ref_desc[]) * "\n\n"
+  f_desc *= unsafe_wrap(String, ref_desc[]) * "\n\n"
   if !isempty(kv_nargs_s)
     f_desc *= "This function support variable length positional `SymbolicNode` inputs.\n\n"
   end
@@ -620,9 +620,9 @@ function _define_atomic_symbol_creator(hdr :: MX_handle)
   f_desc *= "* `attrs::Dict{Symbol, AbstractString}`: The attributes associated with this `SymbolicNode`.\n\n"
   f_desc *= "Returns `$(_format_typestring(unsafe_wrap(String, ref_ret_type[])))`."
 
-  # function $func_name(args...; kwargs...)
-  func_head = Expr(:call, func_name, Expr(:parameters, Expr(:..., :kwargs)), Expr(:..., :args))
-  func_body = quote
+  func_def = quote
+  @doc $f_desc ->
+  function $func_name(args::SymbolicNode...; kwargs...)
     idx = findfirst(x -> x[1] == :name, kwargs)
     if idx > 0
       name = kwargs[idx][2]
@@ -702,13 +702,9 @@ function _define_atomic_symbol_creator(hdr :: MX_handle)
     end
 
     return node
-  end
-
-  func_def = Expr(:function, func_head, Expr(:block, func_body))
-  return quote
-    @doc $f_desc ->
-    $func_def
-  end
+  end # function
+  end # quote
+  return func_def
 end
 
 function _get_atomic_symbol_creators()

diff --git a/test/unittest/symbolic-node.jl b/test/unittest/symbolic-node.jl
@@ -106,6 +106,12 @@ function test_attrs()
   @test_throws MethodError mx.Convolution(data=data2, kernel = (1,1), num_filter = 1, attrs = Dict(:test => "1.0", :test2 => 1.0))
 end
 
+function test_functions()
+  info("SymbolicNode::Functions")
+  data = mx.Variable(:data)
+  typeof(mx.sum(data)) == mx.SymbolicNode
+end
+
 ################################################################################
 # Run tests
 ################################################################################
@@ -116,5 +122,6 @@ test_infer_shape()
 test_infer_shape_error()
 test_saveload()
 test_attrs()
+test_functions()
 
 end