Merge pull request #283 from iblis17/issue-283

update OpReqType enum
dmlc · Sep 25, 2017 · bb88d79 · bb88d79
2 parents b68ca2e + 16c2c5a
commit bb88d79
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/base.jl b/src/base.jl
@@ -13,6 +13,18 @@ const MX_handle = Ptr{Void}
 const char_p = Ptr{UInt8}
 const char_pp = Ptr{char_p}
 
+################################################################################
+# Enumeration from MXNet headers
+################################################################################
+# OpReqType in include/mxnet/op_attr_types.h
+@enum GRAD_REQ GRAD_NOP=0 GRAD_WRITE=1 GRAD_INPLACE=2 GRAD_ADD=3
+const grad_req_map = Dict{Symbol, GRAD_REQ}(
+    :nop     => GRAD_NOP,      # no operation, do not write anything
+    :write   => GRAD_WRITE,    # write gradient to provided space
+    :inplace => GRAD_INPLACE,  # perform an inplace write
+    :add     => GRAD_ADD,      # add to the provided space
+)
+
 ################################################################################
 # Initialization and library API entrance
 ################################################################################

diff --git a/src/executor.jl b/src/executor.jl
@@ -65,8 +65,6 @@ function _get_ndarray_inputs(arg_key::AbstractString, args::Dict{Base.Symbol,NDA
   return (args_hdr, args_vec)
 end
 
-@enum GRAD_REQ GRAD_NOP=0 GRAD_WRITE=1 GRAD_ADD=3
-
 """
     bind(sym, ctx, args; args_grad=Dict(), aux_states=Dict(), grad_req=GRAD_WRITE)