diff --git a/Manifest.toml b/Manifest.toml index ee80fbdc..ca2ffa3a 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -46,10 +46,10 @@ uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232" version = "0.5.4" [[CMake]] -deps = ["BinDeps", "Libdl", "Test"] -git-tree-sha1 = "6e39bef3cbb8321e8a464b18a5c20d7cef813938" +deps = ["BinDeps"] +git-tree-sha1 = "c67a8689dc5444adc5eb2be7d837100340ecba11" uuid = "631607c0-34d2-5d66-819e-eb0f9aa2061a" -version = "1.1.1" +version = "1.1.2" [[CMakeWrapper]] deps = ["BinDeps", "CMake", "Libdl", "Parameters", "Test"] @@ -58,10 +58,10 @@ uuid = "d5fb7624-851a-54ee-a528-d3f3bac0b4a0" version = "0.2.3" [[CSTParser]] -deps = ["LibGit2", "Test", "Tokenize"] -git-tree-sha1 = "437c93bc191cd55957b3f8dee7794b6131997c56" +deps = ["Tokenize"] +git-tree-sha1 = "376a39f1862000442011390f1edf5e7f4dcc7142" uuid = "00ebfdb7-1f24-5e51-bd34-a7502290713f" -version = "0.5.2" +version = "0.6.0" [[Callbacks]] deps = ["FileIO", "Lens", "ProgressMeter", "UnicodePlots"] @@ -151,9 +151,9 @@ version = "0.20.0" [[DocStringExtensions]] deps = ["LibGit2", "Markdown", "Pkg", "Test"] -git-tree-sha1 = "4d30e889c9f106a51ffa4791a88ffd4765bf20c3" +git-tree-sha1 = "0513f1a8991e9d83255e0140aace0d0fc4486600" uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.7.0" +version = "0.8.0" [[DynamicHMC]] deps = ["ArgCheck", "DataStructures", "DocStringExtensions", "LinearAlgebra", "LogDensityProblems", "Parameters", "Random", "Statistics", "StatsFuns", "TransformVariables"] @@ -162,10 +162,10 @@ uuid = "bbc10e6e-7c05-544b-b16e-64fede858acb" version = "1.0.5" [[FileIO]] -deps = ["Pkg", "Random", "Test"] -git-tree-sha1 = "da32159d4a2e526338506685e280e39ed2f18961" +deps = ["Pkg"] +git-tree-sha1 = "351f001a78aa1b7ad2696e386e110b5abd071c71" uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.0.6" +version = "1.0.7" [[FixedPointNumbers]] git-tree-sha1 = "d14a6fa5890ea3a7e5dcab6811114f132fec2b4b" @@ -313,10 +313,10 @@ deps = ["Printf"] uuid = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79" [[ProgressMeter]] -deps = ["Distributed", "Printf", "Random", "Test"] -git-tree-sha1 = "48058bc11607676e5bbc0b974af79106c6200787" +deps = ["Distributed", "Printf"] +git-tree-sha1 = "0f08e0e74e5b160ca20d3962a2620038b75881c7" uuid = "92933f4c-e287-5a05-a399-4b506db050ca" -version = "0.9.0" +version = "1.0.0" [[QuadGK]] deps = ["DataStructures", "LinearAlgebra"] @@ -386,10 +386,10 @@ uuid = "276daf66-3868-5448-9aa4-cd146d93841b" version = "0.7.2" [[StaticArrays]] -deps = ["InteractiveUtils", "LinearAlgebra", "Random", "Statistics", "Test"] -git-tree-sha1 = "3841b39ed5f047db1162627bf5f80a9cd3e39ae2" +deps = ["LinearAlgebra", "Random", "Statistics"] +git-tree-sha1 = "db23bbf50064c582b6f2b9b043c8e7e98ea8c0c6" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "0.10.3" +version = "0.11.0" [[Statistics]] deps = ["LinearAlgebra", "SparseArrays"] @@ -422,10 +422,9 @@ uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f" version = "0.5.0" [[Tokenize]] -deps = ["Printf", "Test"] -git-tree-sha1 = "3e83f60b74911d3042d3550884ca2776386a02b8" +git-tree-sha1 = "0de343efc07da00cd449d5b04e959ebaeeb3305d" uuid = "0796e94c-ce3b-5d07-9a54-7f471281c624" -version = "0.5.3" +version = "0.5.4" [[Tracker]] deps = ["Adapt", "DiffRules", "ForwardDiff", "LinearAlgebra", "MacroTools", "NNlib", "NaNMath", "Printf", "Random", "Requires", "SpecialFunctions", "Statistics", "Test"] @@ -441,9 +440,9 @@ version = "0.9.4" [[TransformVariables]] deps = ["ArgCheck", "DocStringExtensions", "ForwardDiff", "LinearAlgebra", "MacroTools", "Parameters", "Random"] -git-tree-sha1 = "5c8bf91640555e44341a0aa0b3379b812fad5547" +git-tree-sha1 = "e66c238138fdbf13bf3f316e662b7cbf013ce530" uuid = "84d833dd-6860-57f9-a1a7-6da5db126cff" -version = "0.3.2" +version = "0.3.3" [[URIParser]] deps = ["Test", "Unicode"] @@ -465,10 +464,10 @@ uuid = "b8865327-cd53-5732-bb35-84acbb429228" version = "1.1.0" [[ZipFile]] -deps = ["BinaryProvider", "Libdl", "Printf", "Test"] -git-tree-sha1 = "5f6f663890dfb9bad6af75a86a43f67904e5050e" +deps = ["BinaryProvider", "Libdl", "Printf"] +git-tree-sha1 = "580ce62b6c14244916cc28ad54f8a2e2886f843d" uuid = "a5390f91-8eb1-5f08-bee0-b1d1ffed6cea" -version = "0.8.1" +version = "0.8.3" [[Zygote]] deps = ["DiffRules", "ForwardDiff", "IRTools", "InteractiveUtils", "LinearAlgebra", "MacroTools", "NNlib", "NaNMath", "Random", "Requires", "SpecialFunctions", "Statistics"] diff --git a/Project.toml b/Project.toml index 500bdd2e..9b770802 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Omega" uuid = "1af16e33-887a-59b3-8344-18f1671b3ade" authors = ["Zenna Tavares "] -version = "0.1.0" +version = "0.1.1" [deps] Callbacks = "db1e321a-d383-57b4-a664-0144fd54e973" @@ -31,3 +31,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] test = ["Spec"] + +[compat] +julia = "1" \ No newline at end of file diff --git a/REQUIRE b/REQUIRE deleted file mode 100644 index 73aaaede..00000000 --- a/REQUIRE +++ /dev/null @@ -1,17 +0,0 @@ -julia 1.0 -Flux -Distributions -PDMats -ProgressMeter -Spec -Cassette -DocStringExtensions -DynamicHMC -ForwardDiff -LogDensityProblems -TransformVariables -Statistics -Random - -# Will probably remove -UnicodePlots diff --git a/src/Omega.jl b/src/Omega.jl index 0895b9a7..5031a6cd 100644 --- a/src/Omega.jl +++ b/src/Omega.jl @@ -214,7 +214,8 @@ export lsuccprob, # Neural Network Stuff include("flux.jl") -export Dense +using .OmegaFlux +export OmegaDense # Memoize include("memoize.jl") diff --git a/src/flux.jl b/src/flux.jl index 194d5ac5..6b784393 100644 --- a/src/flux.jl +++ b/src/flux.jl @@ -1,8 +1,22 @@ - "Dense network layer" -function Flux.Dense(ω::Omega.Ω, in::Integer, out::Integer, σ = identity; - initW = (ω, dims) -> logistic(ω, 0.0, 0.1, dims), - initb = (ω, dims) -> logistic(ω, 0.0, 0.1, dims)) - initW_ = initW(ω[@id][1], (out, in)) - initb_ = initb(ω[@id][2], (out,)) - Flux.Dense(initW_, initb_, σ) +module OmegaFlux + +import ..Omega: ciid, logistic +import Flux +export OmegaDense + +# "Dense network layer" +# function Flux.Dense(ω::Omega.Ω, in::Integer, out::Integer, σ = identity; +# initW = (ω, dims) -> logistic(ω, 0.0, 0.1, dims), +# initb = (ω, dims) -> logistic(ω, 0.0, 0.1, dims)) +# initW_ = initW(ω[@id][1], (out, in)) +# initb_ = initb(ω[@id][2], (out,)) +# Flux.Dense(initW_, initb_, σ) +# end + +function OmegaDense(in, out, σ = identity; + initW = logistic(0.0, 0.1, (in, out,)), + initb = logistic(0.0, 0.1, (out,))) + ciid(ω -> Flux.Dense(initW(ω), initb(ω), σ)) end + +end \ No newline at end of file diff --git a/src/soft/softbool.jl b/src/soft/softbool.jl index e9227064..ab2f1cca 100644 --- a/src/soft/softbool.jl +++ b/src/soft/softbool.jl @@ -22,6 +22,7 @@ ssoftfalse(::Type{T} = Float64) where T = SoftBool(-inf(T)) kernelrettype(x::T, y::T) where T = T softeq(a::Bool, b::Bool) = softeq(float(a), float(b)) +softeq(a::Integer, b::Integer) = softeq(float(a), float(b)) "Soft Equality" function ssofteq(x, y, k = globalkernel())