Merge pull request #24 from tkelman/nopiracy

Don't extend base functions on base types

src/utils.jl

@@ -9,7 +9,7 @@ const AArray = AbstractArray
 initn(dims...) = randn(dims...)/100
 
 unsqueeze(xs, dim = 1) = reshape(xs, (size(xs)[1:dim-1]..., 1, size(xs)[dim:end]...))
-Base.squeeze(xs) = squeeze(xs, 1)
+squeeze(xs, dim = 1) = Base.squeeze(xs, dim)
 
 stack(xs, dim = 1) = cat(dim, unsqueeze.(xs, dim)...)
 unstack(xs, dim = 1) = [slicedim(xs, dim, i) for i = 1:size(xs, dim)]

test/runtests.jl

@@ -1,5 +1,5 @@
 using Flux, DataFlow, MacroTools, Base.Test
-using Flux: graph, Param, unsqueeze
+using Flux: graph, Param, squeeze, unsqueeze
 using DataFlow: Line, Frame
 
 macro mxonly(ex)