Update linear

hshindo · Dec 11, 2017 · df538fa · df538fa
1 parent de29ab9
commit df538fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/functions/blas.jl b/src/functions/blas.jl
@@ -14,6 +14,7 @@ function BLAS.gemm(tA::Char, tB::Char, alpha::Number, A::Var, B::Var)
     y = BLAS.gemm(tA, tB, T(alpha), A.data, B.data)
     Var(y, BLAS.gemm, (tA,tB,alpha,A,B))
 end
+BLAS.gemm(tA::Char, tB::Char, alpha::Number, A::Node, B::Node; name="") = Node(BLAS.gemm, (tA,tB,alpha,A,B), name)
 
 function addgrad!(C::Var, ::typeof(BLAS.gemm), tA::Char, tB::Char, alpha::Number, A::Var, B::Var)
     T = eltype(C.data)

diff --git a/src/functions/linear.jl b/src/functions/linear.jl
@@ -37,9 +37,9 @@ function linear(x::Var, W::Var, b::Var)
 end
 linear(x::Node, W::Var, b::Var; name="") = Node(linear, (x,W,b), name)
 
-function linear(x::Matrix, W::Matrix, b::Vector)
+function linear(x::Matrix, W::Matrix, b)
     y = BLAS.gemm('T', 'N', W, x)
-    broadcast!(+, y, y, b)
+    b == nothing || broadcast!(+, y, y, b)
     y
 end