From 2fda4d573be8475934672c1299962f9604c1aa54 Mon Sep 17 00:00:00 2001 From: Seth Axen Date: Wed, 13 May 2020 16:23:22 -0700 Subject: [PATCH 1/9] Add Buffers.jl as dependency --- .gitignore | 1 - Manifest.toml | 220 ++++++++++++++++++++++++++++++++++++++++++++++++++ Project.toml | 1 + src/Zygote.jl | 1 + 4 files changed, 222 insertions(+), 1 deletion(-) create mode 100644 Manifest.toml diff --git a/.gitignore b/.gitignore index 78756acf1..9e6791bdc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ *.jl.*.cov *.jl.mem docs/build -Manifest.toml diff --git a/Manifest.toml b/Manifest.toml new file mode 100644 index 000000000..1084daad3 --- /dev/null +++ b/Manifest.toml @@ -0,0 +1,220 @@ +# This file is machine-generated - editing it directly is not advised + +[[AbstractFFTs]] +deps = ["LinearAlgebra"] +git-tree-sha1 = "051c95d6836228d120f5f4b984dd5aba1624f716" +uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" +version = "0.5.0" + +[[ArrayLayouts]] +deps = ["FillArrays", "LinearAlgebra"] +git-tree-sha1 = "a504dca2ac7eda8761c8f7c1ed52427a1be75a3c" +uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" +version = "0.2.6" + +[[Base64]] +uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" + +[[BinaryProvider]] +deps = ["Libdl", "Logging", "SHA"] +git-tree-sha1 = "428e9106b1ff27593cbd979afac9b45b82372b8c" +uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232" +version = "0.5.9" + +[[Buffers]] +deps = ["MacroTools", "ZygoteRules"] +git-tree-sha1 = "65c547d44b5a0b771b811053a5b9d711fdafc502" +repo-rev = "master" +repo-url = "https://github.com/sethaxen/Buffers.jl" +uuid = "f06dc053-dc01-43d6-9774-6ac660c29876" +version = "0.1.0" + +[[ChainRules]] +deps = ["ChainRulesCore", "LinearAlgebra", "Reexport", "Requires", "Statistics"] +git-tree-sha1 = "f7175b1c1275b55e67b926c8d5ba57188b01c679" +uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2" +version = "0.5.2" + +[[ChainRulesCore]] +deps = ["MuladdMacro"] +git-tree-sha1 = "e7f1b2b4ba7146575e1a30345e0ae842ae4c74d8" +uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" +version = "0.7.5" + +[[CommonSubexpressions]] +deps = ["Test"] +git-tree-sha1 = "efdaf19ab11c7889334ca247ff4c9f7c322817b0" +uuid = "bbf7d656-a473-5ed7-a52c-81e309532950" +version = "0.2.0" + +[[CompilerSupportLibraries_jll]] +deps = ["Libdl", "Pkg"] +git-tree-sha1 = "7c4f882c41faa72118841185afc58a2eb00ef612" +uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" +version = "0.3.3+0" + +[[Dates]] +deps = ["Printf"] +uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" + +[[DiffResults]] +deps = ["StaticArrays"] +git-tree-sha1 = "da24935df8e0c6cf28de340b958f6aac88eaa0cc" +uuid = "163ba53b-c6d8-5494-b064-1a9d43ac40c5" +version = "1.0.2" + +[[DiffRules]] +deps = ["NaNMath", "Random", "SpecialFunctions"] +git-tree-sha1 = "eb0c34204c8410888844ada5359ac8b96292cfd1" +uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" +version = "1.0.1" + +[[Distributed]] +deps = ["Random", "Serialization", "Sockets"] +uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" + +[[FillArrays]] +deps = ["LinearAlgebra", "Random", "SparseArrays"] +git-tree-sha1 = "5322d34d7600d3429665b37bcf7628dc602a28cc" +uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" +version = "0.8.8" + +[[ForwardDiff]] +deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"] +git-tree-sha1 = "869540e4367122fbffaace383a5bdc34d6e5e5ac" +uuid = "f6369f11-7733-5829-9624-2563aa707210" +version = "0.10.10" + +[[Future]] +deps = ["Random"] +uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" + +[[IRTools]] +deps = ["InteractiveUtils", "MacroTools", "Test"] +git-tree-sha1 = "1a4355e4b5b50be2311ebb644f34f3306dbd0410" +uuid = "7869d1d1-7146-5819-86e3-90919afe41df" +version = "0.3.1" + +[[InteractiveUtils]] +deps = ["Markdown"] +uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" + +[[LibGit2]] +deps = ["Printf"] +uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" + +[[Libdl]] +uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" + +[[LinearAlgebra]] +deps = ["Libdl"] +uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" + +[[Logging]] +uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" + +[[MacroTools]] +deps = ["Markdown", "Random"] +git-tree-sha1 = "f7d2e3f654af75f01ec49be82c231c382214223a" +uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" +version = "0.5.5" + +[[Markdown]] +deps = ["Base64"] +uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" + +[[MuladdMacro]] +git-tree-sha1 = "c6190f9a7fc5d9d5915ab29f2134421b12d24a68" +uuid = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" +version = "0.2.2" + +[[NNlib]] +deps = ["BinaryProvider", "Libdl", "LinearAlgebra", "Requires", "Statistics"] +git-tree-sha1 = "d9f196d911f55aeaff11b11f681b135980783824" +uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" +version = "0.6.6" + +[[NaNMath]] +git-tree-sha1 = "928b8ca9b2791081dc71a51c55347c27c618760f" +uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" +version = "0.3.3" + +[[OpenSpecFun_jll]] +deps = ["CompilerSupportLibraries_jll", "Libdl", "Pkg"] +git-tree-sha1 = "d51c416559217d974a1113522d5919235ae67a87" +uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" +version = "0.5.3+3" + +[[Pkg]] +deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] +uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" + +[[Printf]] +deps = ["Unicode"] +uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" + +[[REPL]] +deps = ["InteractiveUtils", "Markdown", "Sockets"] +uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" + +[[Random]] +deps = ["Serialization"] +uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" + +[[Reexport]] +deps = ["Pkg"] +git-tree-sha1 = "7b1d07f411bc8ddb7977ec7f377b97b158514fe0" +uuid = "189a3867-3050-52da-a836-e630ba90ab69" +version = "0.2.0" + +[[Requires]] +deps = ["UUIDs"] +git-tree-sha1 = "d37400976e98018ee840e0ca4f9d20baa231dc6b" +uuid = "ae029012-a4dd-5104-9daa-d747884805df" +version = "1.0.1" + +[[SHA]] +uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" + +[[Serialization]] +uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" + +[[Sockets]] +uuid = "6462fe0b-24de-5631-8697-dd941f90decc" + +[[SparseArrays]] +deps = ["LinearAlgebra", "Random"] +uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" + +[[SpecialFunctions]] +deps = ["OpenSpecFun_jll"] +git-tree-sha1 = "e19b98acb182567bcb7b75bb5d9eedf3a3b5ec6c" +uuid = "276daf66-3868-5448-9aa4-cd146d93841b" +version = "0.10.0" + +[[StaticArrays]] +deps = ["LinearAlgebra", "Random", "Statistics"] +git-tree-sha1 = "5c06c0aeb81bef54aed4b3f446847905eb6cbda0" +uuid = "90137ffa-7385-5640-81b9-e52037218182" +version = "0.12.3" + +[[Statistics]] +deps = ["LinearAlgebra", "SparseArrays"] +uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" + +[[Test]] +deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] +uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[[UUIDs]] +deps = ["Random", "SHA"] +uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" + +[[Unicode]] +uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" + +[[ZygoteRules]] +deps = ["MacroTools"] +git-tree-sha1 = "b3b4882cc9accf6731a08cc39543fbc6b669dca8" +uuid = "700de1a5-db45-46bc-99cf-38207098b444" +version = "0.2.0" diff --git a/Project.toml b/Project.toml index e0f1316f9..7f598cc84 100644 --- a/Project.toml +++ b/Project.toml @@ -5,6 +5,7 @@ version = "0.4.20" [deps] AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c" ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" +Buffers = "f06dc053-dc01-43d6-9774-6ac660c29876" DiffRules = "b552c78f-8df3-52c6-915a-8e097449b14b" FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" diff --git a/src/Zygote.jl b/src/Zygote.jl index 550ee0bb0..a96b31b0f 100644 --- a/src/Zygote.jl +++ b/src/Zygote.jl @@ -5,6 +5,7 @@ using LinearAlgebra: copytri!, AbstractTriangular using ArrayLayouts: MemoryLayout, AbstractColumnMajor import ZygoteRules: @adjoint, @adjoint!, AContext, adjoint, _pullback, pullback, literal_getproperty +using Buffers: Buffer, bufferfrom using IRTools using MacroTools, Requires From eb15590a8e3808df6c0803af92787f498d5e16ac Mon Sep 17 00:00:00 2001 From: Seth Axen Date: Wed, 13 May 2020 18:42:42 -0700 Subject: [PATCH 2/9] Remove Buffer code --- src/Zygote.jl | 2 -- src/lib/buffer.jl | 52 --------------------------- src/tools/buffer.jl | 86 --------------------------------------------- 3 files changed, 140 deletions(-) delete mode 100644 src/lib/buffer.jl delete mode 100644 src/tools/buffer.jl diff --git a/src/Zygote.jl b/src/Zygote.jl index a96b31b0f..44d40ff0d 100644 --- a/src/Zygote.jl +++ b/src/Zygote.jl @@ -14,7 +14,6 @@ using MacroTools: @forward export Params, gradient, pullback, @code_grad include("tools/idset.jl") -include("tools/buffer.jl") include("compiler/reverse.jl") include("compiler/emit.jl") @@ -26,7 +25,6 @@ include("lib/lib.jl") include("lib/number.jl") include("lib/base.jl") include("lib/array.jl") -include("lib/buffer.jl") include("lib/broadcast.jl") include("lib/nnlib.jl") include("lib/forward.jl") diff --git a/src/lib/buffer.jl b/src/lib/buffer.jl deleted file mode 100644 index 4d332c16d..000000000 --- a/src/lib/buffer.jl +++ /dev/null @@ -1,52 +0,0 @@ -grad_mut(b::Buffer) = fill!(similar(b.data, Any), nothing) -grad_mut(b::Buffer{T}) where T<:Number = fill!(similar(b.data, float(T)), 0) - -@nograd Buffer - -@adjoint function getindex(b::Buffer, i...) - b[i...], function (Δ) - grad = grad_mut(__context__, b) - grad[i...] = accum(grad[i...], Δ) - return - end -end - -@adjoint! function setindex!(b::Buffer, v, i...) - setindex!(b, v, i...), function (_) - grad = grad_mut(__context__, b) - v̄ = grad[i...] - zero = eltype(grad) <: Number ? 0 : nothing - if i isa NTuple{N,Integer} where N - grad[i...] = zero - else - grad[i...] .= zero - end - (nothing, v̄, map(_->nothing, i)...) - end -end - -@adjoint! function copyto!(b::Buffer, xs) - copyto!(b, xs), function (_) - grad = grad_mut(__context__, b) - x̄s = copy(grad) - grad .= eltype(grad) <: Number ? 0 : nothing - return (nothing, x̄s) - end -end - -@adjoint! function push!(b::Buffer, x) - push!(b, x), function (y) - grad = grad_mut(__context__, b) - return (nothing, pop!(grad)) - end -end - -_pullback(cx::AContext, ::typeof(Broadcast.materialize!), b::Buffer, x::AbstractArray) = - _pullback(cx, copyto!, b, x) - -@adjoint function copy(b::Buffer) - copy(b), function (b̄) - grad_mut(__context__, b)[:] = b̄ - return - end -end diff --git a/src/tools/buffer.jl b/src/tools/buffer.jl deleted file mode 100644 index 9409a74bc..000000000 --- a/src/tools/buffer.jl +++ /dev/null @@ -1,86 +0,0 @@ -""" - Buffer(xs, ...) - -`Buffer` is an array-like type which is mutable when taking gradients. You can -construct a `Buffer` with the same syntax as `similar` (e.g. `Buffer(xs, 5)`) -and then use normal indexing. Finally, use `copy` to get back a normal array. - -For example: - -```julia -julia> function vstack(xs) - buf = Buffer(xs, length(xs), 5) - for i = 1:5 - buf[:, i] = xs - end - return copy(buf) - end -vstack (generic function with 1 method) - -julia> vstack([1, 2, 3]) -3×5 Array{Int64,2}: - 1 1 1 1 1 - 2 2 2 2 2 - 3 3 3 3 3 - -julia> gradient(x -> sum(vstack(x)), [1, 2, 3]) -([5.0, 5.0, 5.0],) -``` - -`Buffer` is not an `AbstractArray` and can't be used for linear algebra -operations like matrix multiplication. This prevents it from being captured by -pullbacks. - -`copy` is a semantic copy, but does not allocate memory. Instead the `Buffer` -is made immutable after copying. -""" -mutable struct Buffer{T,A<:AbstractArray{T}} - data::A - freeze::Bool -end - -Buffer(xs::AbstractArray, args...) = - Buffer(similar(xs, args...), false) - -bufferfrom(xs::AbstractArray) = Buffer(xs, false) - -Base.getindex(b::Buffer, i...) = b.data[i...] - -function Base.setindex!(b::Buffer, v, i...) - b.freeze && error("Buffer is frozen") - b.data[i...] = v -end - -function Base.copyto!(b::Buffer, data) - b.freeze && error("Buffer is frozen") - copyto!(b.data, data) -end - -function Base.push!(b::Buffer, data) - b.freeze && error("Buffer is frozen") - push!(b.data, data) -end - -function Base.copy(b::Buffer) - b.freeze = true - return b.data -end - -function Base.deleteat!(b::Buffer, i) - b.freeze && error("Buffer is frozen") - deleteat!(b.data, i) - return b -end - -@forward Buffer.data Base.eltype, Base.length, Base.ndims, Base.size, Base.axes, - Base.eachindex, Base.stride, Base.strides, Base.findfirst, - Base.keys - -Base.IteratorSize(::Type{<:Buffer{<:Any, A}}) where {A} = Base.IteratorSize(A) - -# Buffer iteration mirrors iteration for AbstractArray -function Base.iterate(b::Buffer, state=(eachindex(b),)) - y = iterate(state...) - y === nothing && return nothing - b[y[1]], (state[1], tail(y)...) -end From a52dbca5e67c171e2b3b5002682f55f240ff4ec4 Mon Sep 17 00:00:00 2001 From: Seth Axen Date: Wed, 13 May 2020 19:07:53 -0700 Subject: [PATCH 3/9] Bump commit in manifest --- Manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Manifest.toml b/Manifest.toml index 1084daad3..016910eb0 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -23,7 +23,7 @@ version = "0.5.9" [[Buffers]] deps = ["MacroTools", "ZygoteRules"] -git-tree-sha1 = "65c547d44b5a0b771b811053a5b9d711fdafc502" +git-tree-sha1 = "ae8092bb50cb5e8fcbcbadace2703eeb2362cc2e" repo-rev = "master" repo-url = "https://github.com/sethaxen/Buffers.jl" uuid = "f06dc053-dc01-43d6-9774-6ac660c29876" From 64d772739ebd341b3cac9b95620cb4de776712e2 Mon Sep 17 00:00:00 2001 From: Seth Axen Date: Wed, 13 May 2020 20:32:42 -0700 Subject: [PATCH 4/9] Remove all but necessary deps --- Manifest.toml | 185 -------------------------------------------------- 1 file changed, 185 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 016910eb0..e89492b93 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -1,26 +1,8 @@ # This file is machine-generated - editing it directly is not advised -[[AbstractFFTs]] -deps = ["LinearAlgebra"] -git-tree-sha1 = "051c95d6836228d120f5f4b984dd5aba1624f716" -uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" -version = "0.5.0" - -[[ArrayLayouts]] -deps = ["FillArrays", "LinearAlgebra"] -git-tree-sha1 = "a504dca2ac7eda8761c8f7c1ed52427a1be75a3c" -uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "0.2.6" - [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" -[[BinaryProvider]] -deps = ["Libdl", "Logging", "SHA"] -git-tree-sha1 = "428e9106b1ff27593cbd979afac9b45b82372b8c" -uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232" -version = "0.5.9" - [[Buffers]] deps = ["MacroTools", "ZygoteRules"] git-tree-sha1 = "ae8092bb50cb5e8fcbcbadace2703eeb2362cc2e" @@ -29,90 +11,6 @@ repo-url = "https://github.com/sethaxen/Buffers.jl" uuid = "f06dc053-dc01-43d6-9774-6ac660c29876" version = "0.1.0" -[[ChainRules]] -deps = ["ChainRulesCore", "LinearAlgebra", "Reexport", "Requires", "Statistics"] -git-tree-sha1 = "f7175b1c1275b55e67b926c8d5ba57188b01c679" -uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2" -version = "0.5.2" - -[[ChainRulesCore]] -deps = ["MuladdMacro"] -git-tree-sha1 = "e7f1b2b4ba7146575e1a30345e0ae842ae4c74d8" -uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "0.7.5" - -[[CommonSubexpressions]] -deps = ["Test"] -git-tree-sha1 = "efdaf19ab11c7889334ca247ff4c9f7c322817b0" -uuid = "bbf7d656-a473-5ed7-a52c-81e309532950" -version = "0.2.0" - -[[CompilerSupportLibraries_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "7c4f882c41faa72118841185afc58a2eb00ef612" -uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -version = "0.3.3+0" - -[[Dates]] -deps = ["Printf"] -uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" - -[[DiffResults]] -deps = ["StaticArrays"] -git-tree-sha1 = "da24935df8e0c6cf28de340b958f6aac88eaa0cc" -uuid = "163ba53b-c6d8-5494-b064-1a9d43ac40c5" -version = "1.0.2" - -[[DiffRules]] -deps = ["NaNMath", "Random", "SpecialFunctions"] -git-tree-sha1 = "eb0c34204c8410888844ada5359ac8b96292cfd1" -uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" -version = "1.0.1" - -[[Distributed]] -deps = ["Random", "Serialization", "Sockets"] -uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" - -[[FillArrays]] -deps = ["LinearAlgebra", "Random", "SparseArrays"] -git-tree-sha1 = "5322d34d7600d3429665b37bcf7628dc602a28cc" -uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "0.8.8" - -[[ForwardDiff]] -deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"] -git-tree-sha1 = "869540e4367122fbffaace383a5bdc34d6e5e5ac" -uuid = "f6369f11-7733-5829-9624-2563aa707210" -version = "0.10.10" - -[[Future]] -deps = ["Random"] -uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" - -[[IRTools]] -deps = ["InteractiveUtils", "MacroTools", "Test"] -git-tree-sha1 = "1a4355e4b5b50be2311ebb644f34f3306dbd0410" -uuid = "7869d1d1-7146-5819-86e3-90919afe41df" -version = "0.3.1" - -[[InteractiveUtils]] -deps = ["Markdown"] -uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" - -[[LibGit2]] -deps = ["Printf"] -uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" - -[[Libdl]] -uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" - -[[LinearAlgebra]] -deps = ["Libdl"] -uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" - -[[Logging]] -uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" - [[MacroTools]] deps = ["Markdown", "Random"] git-tree-sha1 = "f7d2e3f654af75f01ec49be82c231c382214223a" @@ -123,96 +21,13 @@ version = "0.5.5" deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" -[[MuladdMacro]] -git-tree-sha1 = "c6190f9a7fc5d9d5915ab29f2134421b12d24a68" -uuid = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" -version = "0.2.2" - -[[NNlib]] -deps = ["BinaryProvider", "Libdl", "LinearAlgebra", "Requires", "Statistics"] -git-tree-sha1 = "d9f196d911f55aeaff11b11f681b135980783824" -uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" -version = "0.6.6" - -[[NaNMath]] -git-tree-sha1 = "928b8ca9b2791081dc71a51c55347c27c618760f" -uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" -version = "0.3.3" - -[[OpenSpecFun_jll]] -deps = ["CompilerSupportLibraries_jll", "Libdl", "Pkg"] -git-tree-sha1 = "d51c416559217d974a1113522d5919235ae67a87" -uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" -version = "0.5.3+3" - -[[Pkg]] -deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] -uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" - -[[Printf]] -deps = ["Unicode"] -uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" - -[[REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets"] -uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" - [[Random]] deps = ["Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" -[[Reexport]] -deps = ["Pkg"] -git-tree-sha1 = "7b1d07f411bc8ddb7977ec7f377b97b158514fe0" -uuid = "189a3867-3050-52da-a836-e630ba90ab69" -version = "0.2.0" - -[[Requires]] -deps = ["UUIDs"] -git-tree-sha1 = "d37400976e98018ee840e0ca4f9d20baa231dc6b" -uuid = "ae029012-a4dd-5104-9daa-d747884805df" -version = "1.0.1" - -[[SHA]] -uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" - [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" -[[Sockets]] -uuid = "6462fe0b-24de-5631-8697-dd941f90decc" - -[[SparseArrays]] -deps = ["LinearAlgebra", "Random"] -uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" - -[[SpecialFunctions]] -deps = ["OpenSpecFun_jll"] -git-tree-sha1 = "e19b98acb182567bcb7b75bb5d9eedf3a3b5ec6c" -uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "0.10.0" - -[[StaticArrays]] -deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "5c06c0aeb81bef54aed4b3f446847905eb6cbda0" -uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "0.12.3" - -[[Statistics]] -deps = ["LinearAlgebra", "SparseArrays"] -uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" - -[[Test]] -deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] -uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" - -[[UUIDs]] -deps = ["Random", "SHA"] -uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" - -[[Unicode]] -uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" - [[ZygoteRules]] deps = ["MacroTools"] git-tree-sha1 = "b3b4882cc9accf6731a08cc39543fbc6b669dca8" From da4a42b93af5503a1d9df3f7c978f7cf18989cfe Mon Sep 17 00:00:00 2001 From: Seth Axen Date: Wed, 13 May 2020 20:47:01 -0700 Subject: [PATCH 5/9] Revert "Remove all but necessary deps" This reverts commit 64d772739ebd341b3cac9b95620cb4de776712e2. --- Manifest.toml | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 185 insertions(+) diff --git a/Manifest.toml b/Manifest.toml index e89492b93..016910eb0 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -1,8 +1,26 @@ # This file is machine-generated - editing it directly is not advised +[[AbstractFFTs]] +deps = ["LinearAlgebra"] +git-tree-sha1 = "051c95d6836228d120f5f4b984dd5aba1624f716" +uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" +version = "0.5.0" + +[[ArrayLayouts]] +deps = ["FillArrays", "LinearAlgebra"] +git-tree-sha1 = "a504dca2ac7eda8761c8f7c1ed52427a1be75a3c" +uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" +version = "0.2.6" + [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" +[[BinaryProvider]] +deps = ["Libdl", "Logging", "SHA"] +git-tree-sha1 = "428e9106b1ff27593cbd979afac9b45b82372b8c" +uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232" +version = "0.5.9" + [[Buffers]] deps = ["MacroTools", "ZygoteRules"] git-tree-sha1 = "ae8092bb50cb5e8fcbcbadace2703eeb2362cc2e" @@ -11,6 +29,90 @@ repo-url = "https://github.com/sethaxen/Buffers.jl" uuid = "f06dc053-dc01-43d6-9774-6ac660c29876" version = "0.1.0" +[[ChainRules]] +deps = ["ChainRulesCore", "LinearAlgebra", "Reexport", "Requires", "Statistics"] +git-tree-sha1 = "f7175b1c1275b55e67b926c8d5ba57188b01c679" +uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2" +version = "0.5.2" + +[[ChainRulesCore]] +deps = ["MuladdMacro"] +git-tree-sha1 = "e7f1b2b4ba7146575e1a30345e0ae842ae4c74d8" +uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" +version = "0.7.5" + +[[CommonSubexpressions]] +deps = ["Test"] +git-tree-sha1 = "efdaf19ab11c7889334ca247ff4c9f7c322817b0" +uuid = "bbf7d656-a473-5ed7-a52c-81e309532950" +version = "0.2.0" + +[[CompilerSupportLibraries_jll]] +deps = ["Libdl", "Pkg"] +git-tree-sha1 = "7c4f882c41faa72118841185afc58a2eb00ef612" +uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" +version = "0.3.3+0" + +[[Dates]] +deps = ["Printf"] +uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" + +[[DiffResults]] +deps = ["StaticArrays"] +git-tree-sha1 = "da24935df8e0c6cf28de340b958f6aac88eaa0cc" +uuid = "163ba53b-c6d8-5494-b064-1a9d43ac40c5" +version = "1.0.2" + +[[DiffRules]] +deps = ["NaNMath", "Random", "SpecialFunctions"] +git-tree-sha1 = "eb0c34204c8410888844ada5359ac8b96292cfd1" +uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" +version = "1.0.1" + +[[Distributed]] +deps = ["Random", "Serialization", "Sockets"] +uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" + +[[FillArrays]] +deps = ["LinearAlgebra", "Random", "SparseArrays"] +git-tree-sha1 = "5322d34d7600d3429665b37bcf7628dc602a28cc" +uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" +version = "0.8.8" + +[[ForwardDiff]] +deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"] +git-tree-sha1 = "869540e4367122fbffaace383a5bdc34d6e5e5ac" +uuid = "f6369f11-7733-5829-9624-2563aa707210" +version = "0.10.10" + +[[Future]] +deps = ["Random"] +uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" + +[[IRTools]] +deps = ["InteractiveUtils", "MacroTools", "Test"] +git-tree-sha1 = "1a4355e4b5b50be2311ebb644f34f3306dbd0410" +uuid = "7869d1d1-7146-5819-86e3-90919afe41df" +version = "0.3.1" + +[[InteractiveUtils]] +deps = ["Markdown"] +uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" + +[[LibGit2]] +deps = ["Printf"] +uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" + +[[Libdl]] +uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" + +[[LinearAlgebra]] +deps = ["Libdl"] +uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" + +[[Logging]] +uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" + [[MacroTools]] deps = ["Markdown", "Random"] git-tree-sha1 = "f7d2e3f654af75f01ec49be82c231c382214223a" @@ -21,13 +123,96 @@ version = "0.5.5" deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" +[[MuladdMacro]] +git-tree-sha1 = "c6190f9a7fc5d9d5915ab29f2134421b12d24a68" +uuid = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" +version = "0.2.2" + +[[NNlib]] +deps = ["BinaryProvider", "Libdl", "LinearAlgebra", "Requires", "Statistics"] +git-tree-sha1 = "d9f196d911f55aeaff11b11f681b135980783824" +uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" +version = "0.6.6" + +[[NaNMath]] +git-tree-sha1 = "928b8ca9b2791081dc71a51c55347c27c618760f" +uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" +version = "0.3.3" + +[[OpenSpecFun_jll]] +deps = ["CompilerSupportLibraries_jll", "Libdl", "Pkg"] +git-tree-sha1 = "d51c416559217d974a1113522d5919235ae67a87" +uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" +version = "0.5.3+3" + +[[Pkg]] +deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] +uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" + +[[Printf]] +deps = ["Unicode"] +uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" + +[[REPL]] +deps = ["InteractiveUtils", "Markdown", "Sockets"] +uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" + [[Random]] deps = ["Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +[[Reexport]] +deps = ["Pkg"] +git-tree-sha1 = "7b1d07f411bc8ddb7977ec7f377b97b158514fe0" +uuid = "189a3867-3050-52da-a836-e630ba90ab69" +version = "0.2.0" + +[[Requires]] +deps = ["UUIDs"] +git-tree-sha1 = "d37400976e98018ee840e0ca4f9d20baa231dc6b" +uuid = "ae029012-a4dd-5104-9daa-d747884805df" +version = "1.0.1" + +[[SHA]] +uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" + [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" +[[Sockets]] +uuid = "6462fe0b-24de-5631-8697-dd941f90decc" + +[[SparseArrays]] +deps = ["LinearAlgebra", "Random"] +uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" + +[[SpecialFunctions]] +deps = ["OpenSpecFun_jll"] +git-tree-sha1 = "e19b98acb182567bcb7b75bb5d9eedf3a3b5ec6c" +uuid = "276daf66-3868-5448-9aa4-cd146d93841b" +version = "0.10.0" + +[[StaticArrays]] +deps = ["LinearAlgebra", "Random", "Statistics"] +git-tree-sha1 = "5c06c0aeb81bef54aed4b3f446847905eb6cbda0" +uuid = "90137ffa-7385-5640-81b9-e52037218182" +version = "0.12.3" + +[[Statistics]] +deps = ["LinearAlgebra", "SparseArrays"] +uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" + +[[Test]] +deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] +uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[[UUIDs]] +deps = ["Random", "SHA"] +uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" + +[[Unicode]] +uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" + [[ZygoteRules]] deps = ["MacroTools"] git-tree-sha1 = "b3b4882cc9accf6731a08cc39543fbc6b669dca8" From fabe503a57136706ac13483a76a8d7392cd41cb2 Mon Sep 17 00:00:00 2001 From: Seth Axen Date: Sun, 21 Jun 2020 18:44:36 -0700 Subject: [PATCH 6/9] Update Manifest.toml --- Manifest.toml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 016910eb0..3bf9b3dbd 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -8,19 +8,13 @@ version = "0.5.0" [[ArrayLayouts]] deps = ["FillArrays", "LinearAlgebra"] -git-tree-sha1 = "a504dca2ac7eda8761c8f7c1ed52427a1be75a3c" +git-tree-sha1 = "89182776a99b69964e995cc2f1e37b5fc3476d56" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "0.2.6" +version = "0.3.4" [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" -[[BinaryProvider]] -deps = ["Libdl", "Logging", "SHA"] -git-tree-sha1 = "428e9106b1ff27593cbd979afac9b45b82372b8c" -uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232" -version = "0.5.9" - [[Buffers]] deps = ["MacroTools", "ZygoteRules"] git-tree-sha1 = "ae8092bb50cb5e8fcbcbadace2703eeb2362cc2e" @@ -31,15 +25,15 @@ version = "0.1.0" [[ChainRules]] deps = ["ChainRulesCore", "LinearAlgebra", "Reexport", "Requires", "Statistics"] -git-tree-sha1 = "f7175b1c1275b55e67b926c8d5ba57188b01c679" +git-tree-sha1 = "85f130f2c5ce208a5a395b550802398d2fcc5ee6" uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2" -version = "0.5.2" +version = "0.6.4" [[ChainRulesCore]] deps = ["MuladdMacro"] -git-tree-sha1 = "e7f1b2b4ba7146575e1a30345e0ae842ae4c74d8" +git-tree-sha1 = "32e2c6e44d4fdd985b5688b5e85c1f6892cf3d15" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "0.7.5" +version = "0.8.0" [[CommonSubexpressions]] deps = ["Test"] @@ -75,9 +69,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays"] -git-tree-sha1 = "5322d34d7600d3429665b37bcf7628dc602a28cc" +git-tree-sha1 = "bf726ba7ce99e00d10bf63c031285fb9ab3676ae" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "0.8.8" +version = "0.8.11" [[ForwardDiff]] deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"] @@ -91,9 +85,9 @@ uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" [[IRTools]] deps = ["InteractiveUtils", "MacroTools", "Test"] -git-tree-sha1 = "1a4355e4b5b50be2311ebb644f34f3306dbd0410" +git-tree-sha1 = "6875ae3cfcb9a50af80553d5cc825f406e8d13bc" uuid = "7869d1d1-7146-5819-86e3-90919afe41df" -version = "0.3.1" +version = "0.4.0" [[InteractiveUtils]] deps = ["Markdown"] @@ -128,11 +122,17 @@ git-tree-sha1 = "c6190f9a7fc5d9d5915ab29f2134421b12d24a68" uuid = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" version = "0.2.2" +[[NNPACK_jll]] +deps = ["Libdl", "Pkg"] +git-tree-sha1 = "c3d1a616362645754b18e12dbba96ec311b0867f" +uuid = "a6bfbf70-4841-5cb9-aa18-3a8ad3c413ee" +version = "2018.6.22+0" + [[NNlib]] -deps = ["BinaryProvider", "Libdl", "LinearAlgebra", "Requires", "Statistics"] -git-tree-sha1 = "d9f196d911f55aeaff11b11f681b135980783824" +deps = ["Libdl", "LinearAlgebra", "NNPACK_jll", "Pkg", "Requires", "Statistics"] +git-tree-sha1 = "04bae5dcd446ee45d6a3b9e84adca85ee33fb20c" uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" -version = "0.6.6" +version = "0.7.0" [[NaNMath]] git-tree-sha1 = "928b8ca9b2791081dc71a51c55347c27c618760f" @@ -188,9 +188,9 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[SpecialFunctions]] deps = ["OpenSpecFun_jll"] -git-tree-sha1 = "e19b98acb182567bcb7b75bb5d9eedf3a3b5ec6c" +git-tree-sha1 = "d8d8b8a9f4119829410ecd706da4cc8594a1e020" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "0.10.0" +version = "0.10.3" [[StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] From 150658712fb8b86b2a07a4166f485c78ed1d9be2 Mon Sep 17 00:00:00 2001 From: Seth Axen Date: Sun, 5 Jul 2020 22:59:59 -0700 Subject: [PATCH 7/9] Update Manifest.toml --- Manifest.toml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 3bf9b3dbd..eed7bcca7 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -8,9 +8,9 @@ version = "0.5.0" [[ArrayLayouts]] deps = ["FillArrays", "LinearAlgebra"] -git-tree-sha1 = "89182776a99b69964e995cc2f1e37b5fc3476d56" +git-tree-sha1 = "a3254b3780a3544838ca0b7e23b1e9b06eb71bd8" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "0.3.4" +version = "0.3.5" [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -24,22 +24,22 @@ uuid = "f06dc053-dc01-43d6-9774-6ac660c29876" version = "0.1.0" [[ChainRules]] -deps = ["ChainRulesCore", "LinearAlgebra", "Reexport", "Requires", "Statistics"] -git-tree-sha1 = "85f130f2c5ce208a5a395b550802398d2fcc5ee6" +deps = ["ChainRulesCore", "LinearAlgebra", "Random", "Reexport", "Requires", "Statistics"] +git-tree-sha1 = "49a636fcd40d624124529871228c38ceeab8e46b" uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2" -version = "0.6.4" +version = "0.7.5" [[ChainRulesCore]] deps = ["MuladdMacro"] -git-tree-sha1 = "32e2c6e44d4fdd985b5688b5e85c1f6892cf3d15" +git-tree-sha1 = "bd1e56ac59d408c63ea26ab23aab78f827f13511" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "0.8.0" +version = "0.9.1" [[CommonSubexpressions]] -deps = ["Test"] -git-tree-sha1 = "efdaf19ab11c7889334ca247ff4c9f7c322817b0" +deps = ["MacroTools", "Test"] +git-tree-sha1 = "7b8a93dba8af7e3b42fecabf646260105ac373f7" uuid = "bbf7d656-a473-5ed7-a52c-81e309532950" -version = "0.2.0" +version = "0.3.0" [[CompilerSupportLibraries_jll]] deps = ["Libdl", "Pkg"] @@ -69,15 +69,15 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays"] -git-tree-sha1 = "bf726ba7ce99e00d10bf63c031285fb9ab3676ae" +git-tree-sha1 = "4783bbbeade37f2a8bd82af6c112510fde78e532" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "0.8.11" +version = "0.8.12" [[ForwardDiff]] deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"] -git-tree-sha1 = "869540e4367122fbffaace383a5bdc34d6e5e5ac" +git-tree-sha1 = "1d090099fb82223abc48f7ce176d3f7696ede36d" uuid = "f6369f11-7733-5829-9624-2563aa707210" -version = "0.10.10" +version = "0.10.12" [[Future]] deps = ["Random"] @@ -130,9 +130,9 @@ version = "2018.6.22+0" [[NNlib]] deps = ["Libdl", "LinearAlgebra", "NNPACK_jll", "Pkg", "Requires", "Statistics"] -git-tree-sha1 = "04bae5dcd446ee45d6a3b9e84adca85ee33fb20c" +git-tree-sha1 = "dc93bd9acde9ea39aac3cd7bf5be1ec36ae3b1f9" uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" -version = "0.7.0" +version = "0.7.1" [[NaNMath]] git-tree-sha1 = "928b8ca9b2791081dc71a51c55347c27c618760f" From 6b956be85600bbc37c8682d64f50c7e8e2332dff Mon Sep 17 00:00:00 2001 From: Seth Axen Date: Mon, 6 Jul 2020 15:44:36 -0700 Subject: [PATCH 8/9] Update Manifest.toml --- Manifest.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index eed7bcca7..a26460be2 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -25,15 +25,15 @@ version = "0.1.0" [[ChainRules]] deps = ["ChainRulesCore", "LinearAlgebra", "Random", "Reexport", "Requires", "Statistics"] -git-tree-sha1 = "49a636fcd40d624124529871228c38ceeab8e46b" +git-tree-sha1 = "cb6638807e41b771337cf3dbb7b67c5be16e2018" uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2" -version = "0.7.5" +version = "0.7.6" [[ChainRulesCore]] deps = ["MuladdMacro"] -git-tree-sha1 = "bd1e56ac59d408c63ea26ab23aab78f827f13511" +git-tree-sha1 = "4177411bef28d680948562abd25059dceb4d53ed" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "0.9.1" +version = "0.9.2" [[CommonSubexpressions]] deps = ["MacroTools", "Test"] From a771b015b9f6d9e2faf7238cf2262c38e8bcbbbc Mon Sep 17 00:00:00 2001 From: Seth Axen Date: Fri, 8 Jan 2021 16:11:34 -0800 Subject: [PATCH 9/9] Update Manifest.toml for Julia 1.3, to run Zygote CI --- Manifest.toml | 130 ++++++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 63 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index a26460be2..2c8d09ff1 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -2,15 +2,15 @@ [[AbstractFFTs]] deps = ["LinearAlgebra"] -git-tree-sha1 = "051c95d6836228d120f5f4b984dd5aba1624f716" +git-tree-sha1 = "8ed9de2f1b1a9b1dee48582ad477c6e67b83eb2c" uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" -version = "0.5.0" +version = "1.0.0" -[[ArrayLayouts]] -deps = ["FillArrays", "LinearAlgebra"] -git-tree-sha1 = "a3254b3780a3544838ca0b7e23b1e9b06eb71bd8" -uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "0.3.5" +[[Artifacts]] +deps = ["Pkg"] +git-tree-sha1 = "c30985d8821e0cd73870b17b0ed0ce6dc44cb744" +uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" +version = "1.3.0" [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -24,16 +24,16 @@ uuid = "f06dc053-dc01-43d6-9774-6ac660c29876" version = "0.1.0" [[ChainRules]] -deps = ["ChainRulesCore", "LinearAlgebra", "Random", "Reexport", "Requires", "Statistics"] -git-tree-sha1 = "cb6638807e41b771337cf3dbb7b67c5be16e2018" +deps = ["ChainRulesCore", "Compat", "LinearAlgebra", "Random", "Reexport", "Requires", "Statistics"] +git-tree-sha1 = "31b28f5123afa5e5ca0c885e4051896032754578" uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2" -version = "0.7.6" +version = "0.7.45" [[ChainRulesCore]] -deps = ["MuladdMacro"] -git-tree-sha1 = "4177411bef28d680948562abd25059dceb4d53ed" +deps = ["LinearAlgebra", "MuladdMacro", "SparseArrays"] +git-tree-sha1 = "15081c431bb25848ad9b0d172a65794f3a3e197a" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "0.9.2" +version = "0.9.24" [[CommonSubexpressions]] deps = ["MacroTools", "Test"] @@ -41,27 +41,37 @@ git-tree-sha1 = "7b8a93dba8af7e3b42fecabf646260105ac373f7" uuid = "bbf7d656-a473-5ed7-a52c-81e309532950" version = "0.3.0" +[[Compat]] +deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] +git-tree-sha1 = "919c7f3151e79ff196add81d7f4e45d91bbf420b" +uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" +version = "3.25.0" + [[CompilerSupportLibraries_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "7c4f882c41faa72118841185afc58a2eb00ef612" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "8e695f735fca77e9708e795eda62afdb869cbb70" uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -version = "0.3.3+0" +version = "0.3.4+0" [[Dates]] deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" +[[DelimitedFiles]] +deps = ["Mmap"] +uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" + [[DiffResults]] deps = ["StaticArrays"] -git-tree-sha1 = "da24935df8e0c6cf28de340b958f6aac88eaa0cc" +git-tree-sha1 = "c18e98cba888c6c25d1c3b048e4b3380ca956805" uuid = "163ba53b-c6d8-5494-b064-1a9d43ac40c5" -version = "1.0.2" +version = "1.0.3" [[DiffRules]] deps = ["NaNMath", "Random", "SpecialFunctions"] -git-tree-sha1 = "eb0c34204c8410888844ada5359ac8b96292cfd1" +git-tree-sha1 = "214c3fcac57755cfda163d91c58893a8723f93e9" uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" -version = "1.0.1" +version = "1.0.2" [[Distributed]] deps = ["Random", "Serialization", "Sockets"] @@ -69,32 +79,32 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays"] -git-tree-sha1 = "4783bbbeade37f2a8bd82af6c112510fde78e532" +git-tree-sha1 = "8bd8e47ff5d34b20f0aa9641988eb660590008bc" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "0.8.12" +version = "0.11.0" [[ForwardDiff]] deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"] -git-tree-sha1 = "1d090099fb82223abc48f7ce176d3f7696ede36d" +git-tree-sha1 = "8de2519a83c6c1c2442c2f481dd9a8364855daf4" uuid = "f6369f11-7733-5829-9624-2563aa707210" -version = "0.10.12" - -[[Future]] -deps = ["Random"] -uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" +version = "0.10.14" [[IRTools]] deps = ["InteractiveUtils", "MacroTools", "Test"] -git-tree-sha1 = "6875ae3cfcb9a50af80553d5cc825f406e8d13bc" +git-tree-sha1 = "c67e7515a11f726f44083e74f218d134396d6510" uuid = "7869d1d1-7146-5819-86e3-90919afe41df" -version = "0.4.0" +version = "0.4.2" [[InteractiveUtils]] deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" +[[JLLWrappers]] +git-tree-sha1 = "04b49c556240b62d5a799e94c63d5fc14d3c07cd" +uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" +version = "1.1.4" + [[LibGit2]] -deps = ["Printf"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" [[Libdl]] @@ -109,44 +119,35 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" [[MacroTools]] deps = ["Markdown", "Random"] -git-tree-sha1 = "f7d2e3f654af75f01ec49be82c231c382214223a" +git-tree-sha1 = "6a8a2a625ab0dea913aba95c11370589e0239ff0" uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" -version = "0.5.5" +version = "0.5.6" [[Markdown]] deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" +[[Mmap]] +uuid = "a63ad114-7e13-5084-954f-fe012c677804" + [[MuladdMacro]] git-tree-sha1 = "c6190f9a7fc5d9d5915ab29f2134421b12d24a68" uuid = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" version = "0.2.2" -[[NNPACK_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "c3d1a616362645754b18e12dbba96ec311b0867f" -uuid = "a6bfbf70-4841-5cb9-aa18-3a8ad3c413ee" -version = "2018.6.22+0" - -[[NNlib]] -deps = ["Libdl", "LinearAlgebra", "NNPACK_jll", "Pkg", "Requires", "Statistics"] -git-tree-sha1 = "dc93bd9acde9ea39aac3cd7bf5be1ec36ae3b1f9" -uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" -version = "0.7.1" - [[NaNMath]] -git-tree-sha1 = "928b8ca9b2791081dc71a51c55347c27c618760f" +git-tree-sha1 = "bfe47e760d60b82b66b61d2d44128b62e3a369fb" uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" -version = "0.3.3" +version = "0.3.5" [[OpenSpecFun_jll]] -deps = ["CompilerSupportLibraries_jll", "Libdl", "Pkg"] -git-tree-sha1 = "d51c416559217d974a1113522d5919235ae67a87" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "9db77584158d0ab52307f8c04f8e7c08ca76b5b3" uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" -version = "0.5.3+3" +version = "0.5.3+4" [[Pkg]] -deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] +deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Test", "UUIDs"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" [[Printf]] @@ -162,16 +163,15 @@ deps = ["Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" [[Reexport]] -deps = ["Pkg"] -git-tree-sha1 = "7b1d07f411bc8ddb7977ec7f377b97b158514fe0" +git-tree-sha1 = "57d8440b0c7d98fc4f889e478e80f268d534c9d5" uuid = "189a3867-3050-52da-a836-e630ba90ab69" -version = "0.2.0" +version = "1.0.0" [[Requires]] deps = ["UUIDs"] -git-tree-sha1 = "d37400976e98018ee840e0ca4f9d20baa231dc6b" +git-tree-sha1 = "cfbac6c1ed70c002ec6361e7fd334f02820d6419" uuid = "ae029012-a4dd-5104-9daa-d747884805df" -version = "1.0.1" +version = "1.1.2" [[SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" @@ -179,6 +179,10 @@ uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" +[[SharedArrays]] +deps = ["Distributed", "Mmap", "Random", "Serialization"] +uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" + [[Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" @@ -187,16 +191,16 @@ deps = ["LinearAlgebra", "Random"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[SpecialFunctions]] -deps = ["OpenSpecFun_jll"] -git-tree-sha1 = "d8d8b8a9f4119829410ecd706da4cc8594a1e020" +deps = ["ChainRulesCore", "OpenSpecFun_jll"] +git-tree-sha1 = "75394dbe2bd346beeed750fb02baa6445487b862" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "0.10.3" +version = "1.2.1" [[StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "5c06c0aeb81bef54aed4b3f446847905eb6cbda0" +git-tree-sha1 = "9da72ed50e94dbff92036da395275ed114e04d49" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "0.12.3" +version = "1.0.1" [[Statistics]] deps = ["LinearAlgebra", "SparseArrays"] @@ -215,6 +219,6 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" [[ZygoteRules]] deps = ["MacroTools"] -git-tree-sha1 = "b3b4882cc9accf6731a08cc39543fbc6b669dca8" +git-tree-sha1 = "9e7a1e8ca60b742e508a315c17eef5211e7fbfd7" uuid = "700de1a5-db45-46bc-99cf-38207098b444" -version = "0.2.0" +version = "0.2.1"