TastyPancakes/Flux.jl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

model -> net

Browse Source
This commit is contained in:
Mike J Innes 2016-10-12 16:28:16 +01:00
parent 066ecafd71
commit b115d8ce3f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/code.jl
View File

@ -2,7 +2,7 @@
import Flow: mapconst, cse import Flow: mapconst, cse
export @model export @net
function process_func(ex, params = []) function process_func(ex, params = [])
@capture(shortdef(ex), (args__,) -> body_) @capture(shortdef(ex), (args__,) -> body_)
@ -85,7 +85,7 @@ function process_anon(ex)
:(Flux.Capacitor($(Flow.constructor(makegraph(body, args))))) |> esc :(Flux.Capacitor($(Flow.constructor(makegraph(body, args))))) |> esc
end end
macro model(ex) macro net(ex)
isexpr(ex, :type) ? process_type(ex) : isexpr(ex, :type) ? process_type(ex) :
isexpr(ex, :->, :function) ? process_anon(ex) : isexpr(ex, :->, :function) ? process_anon(ex) :
error("Unsupported model expression $ex") error("Unsupported model expression $ex")

2
src/compiler/loops.jl
View File

@ -59,7 +59,7 @@ end
# #
# break!(atomise(r)) |> syntax |> prettify |> display # break!(atomise(r)) |> syntax |> prettify |> display
@model type Recurrent @net type Recurrent
Wx; Wh; B Wx; Wh; B
hidden hidden

4
src/layers/dense.jl
View File

@ -2,7 +2,7 @@ export Dense
# TODO: type hints for parameters # TODO: type hints for parameters
@model type Dense @net type Dense
W W
b b
x -> x*W + b x -> x*W + b
@ -14,7 +14,7 @@ Dense(in::Integer, out::Integer; init = initn) =
Base.show(io::IO, d::Dense) = Base.show(io::IO, d::Dense) =
print(io, "Dense($(size(d.W.x,1)),$(size(d.W.x,2)))") print(io, "Dense($(size(d.W.x,1)),$(size(d.W.x,2)))")
@model type Sigmoid @net type Sigmoid
layer::Model layer::Model
x -> σ(layer(x)) x -> σ(layer(x))
end end