From ef681f16ead27810e73a205af66e1b0d4a92362e Mon Sep 17 00:00:00 2001
From: Mike J Innes <mike.j.innes@gmail.com>
Date: Mon, 21 Aug 2017 17:53:04 +0100
Subject: [PATCH] use nnlib for activations

---
 REQUIRE                 | 1 +
 src/Flux.jl             | 5 ++++-
 src/layers/stateless.jl | 8 --------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/REQUIRE b/REQUIRE
index 7658eeb2..a1091874 100644
--- a/REQUIRE
+++ b/REQUIRE
@@ -2,3 +2,4 @@ julia 0.6.0
 DataFlow 0.2.1 0.3-
 Juno
 MacroTools 0.3.3
+NNlib
diff --git a/src/Flux.jl b/src/Flux.jl
index b85809da..c3138ad7 100644
--- a/src/Flux.jl
+++ b/src/Flux.jl
@@ -5,10 +5,13 @@ module Flux
 using Juno
 using Lazy: @forward
 
-export Chain, Linear, σ, softmax
+export Chain, Linear
 
 # Zero Flux Given
 
+using NNlib
+export σ, relu, softmax
+
 include("Tracker/Tracker.jl")
 using .Tracker
 export track, back!
diff --git a/src/layers/stateless.jl b/src/layers/stateless.jl
index 7e1582fd..f53de2dd 100644
--- a/src/layers/stateless.jl
+++ b/src/layers/stateless.jl
@@ -1,11 +1,3 @@
-# Activation Functions
-
-σ(x) = 1 / (1 + exp(-x))
-
-relu(x) = max(0, x)
-
-softmax(xs) = exp.(xs) ./ sum(exp.(xs), 2)
-
 # Cost functions
 
 mse(ŷ, y) = sumabs2(ŷ .- y)/2