diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 8d7a19b..da7f6d0 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,25 +1,50 @@ steps: - - label: "Benchmarks" + - label: "Benchmarks" plugins: - JuliaCI/julia#v1: version: 1.6 env: - CODESPEED_PROJECT: "$BUILDKITE_PIPELINE_NAME" + CODESPEED_PROJECT: "FluxBench" CODESPEED_BRANCH: "$BUILDKITE_BRANCH" CODESPEED_COMMIT: "$BUILDKITE_COMMIT" CODESPEED_EXECUTABLE: "Julia 1.6" + SECRET_CODESPEED_SERVER: "DyBxj9TMW7C69tAefpRCieKLvsMEOJKE3RXzj0o2zSRvWFnsVrocrV1bSnD1ApTp0yuYutfj/0RdrKWBKuZTuMVDg1yOslQqTmJBL+zfDmwRrxmo5AkaLLAIzkL15l9Z7FJuEBszvtEOhA9uJfsdN2R4OHcGZzfKJ8KfTIzyFtjZpAoxoYao292IhmkUA9rf13JSMSnKwd4Od1XkuF9Dhz0KRpIvagVDTQKG06WEKYX1CArXF/3DP/FMC7ZrFEllO2KinxiNv7SPq3e/0IUgKGPWEaaMR60N6Dfibg0EXpZ5O/H5SkSN8oDhzmdYKQcyhVLVvLazlQkLGwA3hcViVQ==;U2FsdGVkX1+2GfXSirm0qTNaQDyeGFowE3VdIpUgymprMoWFUF7O/K6MxycX9nOv4QZJ//qwmEhdAKUc5KlnEA==" command: | julia --project -e ' - ENV["CODESPEED_ENVIRONMENT"] = ENV["BUILDKITE_AGENT_NAME"] + ENV["CODESPEED_ENVIRONMENT"] = "FluxBench" # ENV["BUILDKITE_AGENT_NAME"] println("Preparing Environment") using Pkg - Pkg.activate() - pkg"add Flux#$(BUILDKITE_COMMIT)" Pkg.instantiate() - # push!(LOAD_PATH, @__DIR__) println("Starting Benchmarks") using FluxBench - FluxBench.bench()' + FluxBench.submit(true)' agents: queue: "benchmark" cuda: "*" + if: build.message !~ /\[skip benchmarks\]/ && + build.branch =~ /^master$$/ + + - label: "Benchmarks (Trial)" + plugins: + - JuliaCI/julia#v1: + version: 1.6 + env: + CODESPEED_PROJECT: "FluxBench" + CODESPEED_BRANCH: "$BUILDKITE_BRANCH" + CODESPEED_COMMIT: "$BUILDKITE_COMMIT" + CODESPEED_EXECUTABLE: "Julia 1.6" + SECRET_CODESPEED_SERVER: "DyBxj9TMW7C69tAefpRCieKLvsMEOJKE3RXzj0o2zSRvWFnsVrocrV1bSnD1ApTp0yuYutfj/0RdrKWBKuZTuMVDg1yOslQqTmJBL+zfDmwRrxmo5AkaLLAIzkL15l9Z7FJuEBszvtEOhA9uJfsdN2R4OHcGZzfKJ8KfTIzyFtjZpAoxoYao292IhmkUA9rf13JSMSnKwd4Od1XkuF9Dhz0KRpIvagVDTQKG06WEKYX1CArXF/3DP/FMC7ZrFEllO2KinxiNv7SPq3e/0IUgKGPWEaaMR60N6Dfibg0EXpZ5O/H5SkSN8oDhzmdYKQcyhVLVvLazlQkLGwA3hcViVQ==;U2FsdGVkX1+2GfXSirm0qTNaQDyeGFowE3VdIpUgymprMoWFUF7O/K6MxycX9nOv4QZJ//qwmEhdAKUc5KlnEA==" + command: | + julia --project -e ' + ENV["CODESPEED_ENVIRONMENT"] = "FluxBench" # ENV["BUILDKITE_AGENT_NAME"] + println("Preparing Environment") + using Pkg + Pkg.instantiate() + println("Starting Benchmarks") + using FluxBench + FluxBench.submit(false)' + agents: + queue: "juliagpu" + cuda: "*" + if: build.message !~ /\[skip benchmarks\]/ && + build.branch !~ /^master$$/ diff --git a/Manifest.toml b/Manifest.toml index 599d33a..1449c89 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -1,11 +1,5 @@ # This file is machine-generated - editing it directly is not advised -[[AbstractAlgebra]] -deps = ["InteractiveUtils", "LinearAlgebra", "Markdown", "Random", "RandomExtensions", "SparseArrays", "Test"] -git-tree-sha1 = "919d4d78d4fc415ed989e21dc74aef981052a22d" -uuid = "c3fe647b-3220-5bb0-a1ea-a7954cac585d" -version = "0.15.1" - [[AbstractFFTs]] deps = ["LinearAlgebra"] git-tree-sha1 = "485ee0867925449198280d4af84bdb46a2a404d0" @@ -19,9 +13,9 @@ version = "0.3.4" [[Adapt]] deps = ["LinearAlgebra"] -git-tree-sha1 = "ffcfa2d345aaee0ef3d8346a073d5dd03c983ebe" +git-tree-sha1 = "84918055d15b3114ede17ac6a7182f68870c16f7" uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" -version = "3.2.0" +version = "3.3.1" [[ArgTools]] uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" @@ -34,9 +28,9 @@ version = "0.1.0" [[ArrayInterface]] deps = ["IfElse", "LinearAlgebra", "Requires", "SparseArrays", "Static"] -git-tree-sha1 = "ce17bad65d0842b34a15fffc8879a9f68f08a67f" +git-tree-sha1 = "cdb00a6fb50762255021e5571cf95df3e1797a51" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" -version = "3.1.6" +version = "3.1.23" [[Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" @@ -49,9 +43,9 @@ version = "1.0.0" [[AxisArrays]] deps = ["Dates", "IntervalSets", "IterTools", "RangeArrays"] -git-tree-sha1 = "f31f50712cbdf40ee8287f0443b57503e34122ef" +git-tree-sha1 = "d127d5e4d86c7680b20c35d40b503c74b9a39b5e" uuid = "39de3d68-74b9-583c-8d2d-e117c070f3a9" -version = "0.4.3" +version = "0.4.4" [[BFloat16s]] deps = ["LinearAlgebra", "Test"] @@ -60,9 +54,9 @@ uuid = "ab4f0b2a-ad5b-11e8-123f-65d77653426b" version = "0.1.0" [[BSON]] -git-tree-sha1 = "dd36d7cf3d185eeaaf64db902c15174b22f5dafb" +git-tree-sha1 = "92b8a8479128367aaab2620b8e73dff632f5ae69" uuid = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0" -version = "0.2.6" +version = "0.3.3" [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -84,11 +78,17 @@ git-tree-sha1 = "215a9aa4a1f23fbd05b92769fdd62559488d70e9" uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82" version = "0.4.1" +[[CPUSummary]] +deps = ["Hwloc", "IfElse", "Static"] +git-tree-sha1 = "147bcca99e098c0da48d7d9e108210704138f0f9" +uuid = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9" +version = "0.1.2" + [[CUDA]] -deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CompilerSupportLibraries_jll", "DataStructures", "ExprTools", "GPUArrays", "GPUCompiler", "LLVM", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "MacroTools", "NNlib", "Printf", "Random", "Reexport", "Requires", "SparseArrays", "Statistics", "TimerOutputs"] -git-tree-sha1 = "4198abaa675203d91a39b78011169e38392dc07f" +deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CompilerSupportLibraries_jll", "DataStructures", "ExprTools", "GPUArrays", "GPUCompiler", "LLVM", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "SpecialFunctions", "TimerOutputs"] +git-tree-sha1 = "8c665cc72fc741376951d27ca08c7b782d852626" uuid = "052768ef-5323-5732-b1bb-66c8b64840ba" -version = "2.6.0" +version = "3.3.6" [[CatIndices]] deps = ["CustomUnitRanges", "OffsetArrays"] @@ -97,16 +97,22 @@ uuid = "aafaddc9-749c-510e-ac4f-586e18779b91" version = "0.2.2" [[ChainRules]] -deps = ["ChainRulesCore", "Compat", "LinearAlgebra", "Random", "Reexport", "Requires", "Statistics"] -git-tree-sha1 = "dd5993010683f7f1256f68cd81e40bbd8304fb03" +deps = ["ChainRulesCore", "Compat", "LinearAlgebra", "Random", "Statistics"] +git-tree-sha1 = "aa1019559831f9bf0b829cb87e7c8cf931f0f2c6" uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2" -version = "0.7.57" +version = "1.10.0" [[ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "7d4252faf7323f3c614c9a564a31f22c547995cc" +git-tree-sha1 = "bdc0937269321858ab2a4f288486cb258b9a0af7" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "0.9.36" +version = "1.3.0" + +[[CloseOpenIntervals]] +deps = ["ArrayInterface", "Static"] +git-tree-sha1 = "4fcacb5811c9e4eb6f9adde4afc0e9c4a7a92f5a" +uuid = "fb6a15b2-703c-40df-9091-08a04967cfa9" +version = "0.1.1" [[CodecZlib]] deps = ["TranscodingStreams", "Zlib_jll"] @@ -127,15 +133,10 @@ uuid = "c3611d14-8923-5661-9e6a-0046d554d3a4" version = "0.8.7" [[Colors]] -deps = ["ColorTypes", "FixedPointNumbers", "InteractiveUtils", "Reexport"] -git-tree-sha1 = "ac5f2213e56ed8a34a3dd2f681f4df1166b34929" +deps = ["ColorTypes", "FixedPointNumbers", "Reexport"] +git-tree-sha1 = "417b0ed7b8b838aa6ca0a87aadf1bb9eb111ce40" uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" -version = "0.12.6" - -[[Combinatorics]] -git-tree-sha1 = "08c8b6831dc00bfea825826be0bc8336fc369860" -uuid = "861a8166-3701-5b0c-9a16-15d98fcdc6aa" -version = "1.0.2" +version = "0.12.8" [[CommonSolve]] git-tree-sha1 = "68a0743f578349ada8bc911a5cbd5a2ef6ed6d1f" @@ -150,9 +151,9 @@ 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" +git-tree-sha1 = "727e463cfebd0c7b999bbf3e9e7e16f254b94193" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.25.0" +version = "3.34.0" [[CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] @@ -163,17 +164,11 @@ git-tree-sha1 = "52cb3ec90e8a8bea0e62e275ba577ad0f74821f7" uuid = "ed09eef8-17a6-5b46-8889-db040fac31e3" version = "0.3.2" -[[ConsoleProgressMonitor]] -deps = ["Logging", "ProgressMeter"] -git-tree-sha1 = "3ab7b2136722890b9af903859afcf457fa3059e8" -uuid = "88cd18e8-d9cc-4ea6-8889-5259c0d15c8b" -version = "0.1.2" - [[ConstructionBase]] deps = ["LinearAlgebra"] -git-tree-sha1 = "48920211c95a6da1914a06c44ec94be70e84ffff" +git-tree-sha1 = "f74e9d5388b8620b4cee35d4c5a618dd4dc547f4" uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" -version = "1.1.0" +version = "1.3.0" [[CoordinateTransformations]] deps = ["LinearAlgebra", "StaticArrays"] @@ -193,26 +188,26 @@ uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f" version = "4.0.4" [[CustomUnitRanges]] -git-tree-sha1 = "537c988076d001469093945f3bd0b300b8d3a7f3" +git-tree-sha1 = "1a3f97f907e6dd8983b744d2642651bb162a3f7a" uuid = "dc8bdbbb-1ca9-579f-8c36-e416f6a65cce" -version = "1.0.1" +version = "1.0.2" + +[[DEDataArrays]] +deps = ["ArrayInterface", "DocStringExtensions", "LinearAlgebra", "RecursiveArrayTools", "SciMLBase", "StaticArrays"] +git-tree-sha1 = "31186e61936fbbccb41d809ad4338c9f7addf7ae" +uuid = "754358af-613d-5f8d-9788-280bf1605d4c" +version = "0.2.0" [[DataAPI]] -git-tree-sha1 = "dfb3b7e89e395be1e25c2ad6d7690dc29cc53b1d" +git-tree-sha1 = "ee400abb2298bd13bfc3df1c412ed228061a2385" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.6.0" - -[[DataInterpolations]] -deps = ["ChainRulesCore", "LinearAlgebra", "Optim", "RecipesBase", "RecursiveArrayTools", "Reexport"] -git-tree-sha1 = "75b89fbfa3a5be3ee10890aa6d801214dd808f96" -uuid = "82cc6244-b520-54b8-b5a6-8a565e85f1d0" -version = "3.3.1" +version = "1.7.0" [[DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] -git-tree-sha1 = "4437b64df1e0adccc3e5d1adbc3ac741095e4677" +git-tree-sha1 = "7d9d316f04214f7efdbb6398d545446e246eff02" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.18.9" +version = "0.18.10" [[DataValueInterfaces]] git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" @@ -228,40 +223,22 @@ deps = ["Mmap"] uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" [[DiffEqBase]] -deps = ["ArrayInterface", "ChainRulesCore", "DataStructures", "DocStringExtensions", "FunctionWrappers", "IterativeSolvers", "LabelledArrays", "LinearAlgebra", "Logging", "MuladdMacro", "NonlinearSolve", "Parameters", "Printf", "RecursiveArrayTools", "RecursiveFactorization", "Reexport", "Requires", "SciMLBase", "SparseArrays", "StaticArrays", "Statistics", "SuiteSparse", "ZygoteRules"] -git-tree-sha1 = "d9d0456a43a386180d3dd20e48400a387d2e8f1b" +deps = ["ArrayInterface", "ChainRulesCore", "DEDataArrays", "DataStructures", "Distributions", "DocStringExtensions", "FastBroadcast", "ForwardDiff", "FunctionWrappers", "IterativeSolvers", "LabelledArrays", "LinearAlgebra", "Logging", "MuladdMacro", "NonlinearSolve", "Parameters", "PreallocationTools", "Printf", "RecursiveArrayTools", "RecursiveFactorization", "Reexport", "Requires", "SciMLBase", "Setfield", "SparseArrays", "StaticArrays", "Statistics", "SuiteSparse", "ZygoteRules"] +git-tree-sha1 = "f52aa1dfbb028768dc952bd4d798646c3538d363" uuid = "2b5f629d-d688-5b77-993f-72d75c75574e" -version = "6.58.0" - -[[DiffEqCallbacks]] -deps = ["DataStructures", "DiffEqBase", "ForwardDiff", "LinearAlgebra", "NLsolve", "OrdinaryDiffEq", "RecipesBase", "RecursiveArrayTools", "StaticArrays"] -git-tree-sha1 = "0972ca167952dc426b5438fc188b846b7a66a1f3" -uuid = "459566f4-90b8-5000-8ac3-15dfb0a30def" -version = "2.16.1" - -[[DiffEqFlux]] -deps = ["Adapt", "ConsoleProgressMonitor", "DataInterpolations", "DiffEqBase", "DiffEqSensitivity", "DiffResults", "Distributions", "DistributionsAD", "Flux", "ForwardDiff", "GalacticOptim", "LinearAlgebra", "Logging", "LoggingExtras", "Printf", "ProgressLogging", "RecursiveArrayTools", "Requires", "StaticArrays", "TerminalLoggers", "Zygote", "ZygoteRules"] -git-tree-sha1 = "7e1938baf636d1862c699a671c94baa5e3029ae0" -uuid = "aae7a2af-3d4f-5e19-a356-7da93b79d9d0" -version = "1.35.1" +version = "6.73.0" [[DiffEqJump]] -deps = ["ArrayInterface", "Compat", "DataStructures", "DiffEqBase", "FunctionWrappers", "LinearAlgebra", "PoissonRandom", "Random", "RandomNumbers", "RecursiveArrayTools", "StaticArrays", "TreeViews", "UnPack"] -git-tree-sha1 = "3ec8d5eeb792897b28ef79a851d834ce1415498f" +deps = ["ArrayInterface", "Compat", "DataStructures", "DiffEqBase", "FunctionWrappers", "LightGraphs", "LinearAlgebra", "PoissonRandom", "Random", "RandomNumbers", "RecursiveArrayTools", "Reexport", "StaticArrays", "TreeViews", "UnPack"] +git-tree-sha1 = "99a65172d95e5ccc016c9be0542fa3858cf97a18" uuid = "c894b116-72e5-5b58-be3c-e6d8d4ac2b12" -version = "6.13.0" +version = "7.3.0" [[DiffEqNoiseProcess]] -deps = ["DiffEqBase", "Distributions", "LinearAlgebra", "Optim", "PoissonRandom", "QuadGK", "Random", "Random123", "RandomNumbers", "RecipesBase", "RecursiveArrayTools", "Requires", "ResettableStacks", "StaticArrays", "Statistics"] -git-tree-sha1 = "d42d174081b04a9ce47d9c307107eaed6b7f8f8c" +deps = ["DiffEqBase", "Distributions", "LinearAlgebra", "Optim", "PoissonRandom", "QuadGK", "Random", "Random123", "RandomNumbers", "RecipesBase", "RecursiveArrayTools", "Requires", "ResettableStacks", "SciMLBase", "StaticArrays", "Statistics"] +git-tree-sha1 = "d6839a44a268c69ef0ed927b22a6f43c8a4c2e73" uuid = "77a26b50-5914-5dd7-bc55-306e6241c503" -version = "5.7.1" - -[[DiffEqSensitivity]] -deps = ["Adapt", "DiffEqBase", "DiffEqCallbacks", "DiffEqNoiseProcess", "Distributions", "FFTW", "FiniteDiff", "ForwardDiff", "GlobalSensitivity", "LinearAlgebra", "Parameters", "QuadGK", "QuasiMonteCarlo", "RecursiveArrayTools", "Reexport", "Requires", "ReverseDiff", "SharedArrays", "Statistics", "StochasticDiffEq", "Tracker", "Zygote", "ZygoteRules"] -git-tree-sha1 = "a35bc2f01230c249da348d02853735ffa0a3c506" -uuid = "41bf760c-e81c-5289-8e54-58b1f1f8abe2" -version = "6.43.1" +version = "5.9.0" [[DiffResults]] deps = ["StaticArrays"] @@ -271,15 +248,15 @@ version = "1.0.3" [[DiffRules]] deps = ["NaNMath", "Random", "SpecialFunctions"] -git-tree-sha1 = "214c3fcac57755cfda163d91c58893a8723f93e9" +git-tree-sha1 = "3ed8fa7178a10d1cd0f1ca524f249ba6937490c0" uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" -version = "1.0.2" +version = "1.3.0" [[Distances]] -deps = ["LinearAlgebra", "Statistics"] -git-tree-sha1 = "366715149014943abd71aa647a07a43314158b2d" +deps = ["LinearAlgebra", "Statistics", "StatsAPI"] +git-tree-sha1 = "abe4ad222b26af3337262b8afb28fab8d215e9f8" uuid = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7" -version = "0.10.2" +version = "0.10.3" [[Distributed]] deps = ["Random", "Serialization", "Sockets"] @@ -287,21 +264,15 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[Distributions]] deps = ["FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns"] -git-tree-sha1 = "e64debe8cd174cc52d7dd617ebc5492c6f8b698c" +git-tree-sha1 = "3889f646423ce91dd1055a76317e9a1d3a23fff1" uuid = "31c24e10-a181-5473-b8eb-7969acd0382f" -version = "0.24.15" - -[[DistributionsAD]] -deps = ["Adapt", "ChainRules", "ChainRulesCore", "Compat", "DiffRules", "Distributions", "FillArrays", "ForwardDiff", "LinearAlgebra", "NaNMath", "PDMats", "Random", "Requires", "SpecialFunctions", "StaticArrays", "StatsBase", "StatsFuns", "ZygoteRules"] -git-tree-sha1 = "82114a46076978339f2671d572d6304584da9d43" -uuid = "ced4e74d-a319-5a8a-b0ac-84af2272839c" -version = "0.6.21" +version = "0.25.11" [[DocStringExtensions]] -deps = ["LibGit2", "Markdown", "Pkg", "Test"] -git-tree-sha1 = "9d4f64f79012636741cf01133158a54b24924c32" +deps = ["LibGit2"] +git-tree-sha1 = "a32185f5428d3986f47c2ab78b1f216d5e6cc96f" uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.8.4" +version = "0.8.5" [[Downloads]] deps = ["ArgTools", "LibCURL", "NetworkOptions"] @@ -314,15 +285,15 @@ uuid = "da5c29d0-fa7d-589e-88eb-ea29b0a81949" version = "1.1.0" [[ExponentialUtilities]] -deps = ["LinearAlgebra", "Printf", "Requires", "SparseArrays"] -git-tree-sha1 = "712cb5af8db62836913970ee035a5fa742986f00" +deps = ["ArrayInterface", "LinearAlgebra", "Printf", "Requires", "SparseArrays"] +git-tree-sha1 = "7a541ee92e2f8b16356ed6066d0c44b85984b780" uuid = "d4d017d3-3776-5f7e-afef-a10c40355c18" -version = "1.8.1" +version = "1.9.0" [[ExprTools]] -git-tree-sha1 = "10407a39b87f29d47ebaca8edbc75d7c302ff93e" +git-tree-sha1 = "b7e3d17636b348f005f11040025ae8c6f645fe92" uuid = "e2ba6199-217a-4e67-a87a-7c52f15ade04" -version = "0.1.3" +version = "0.1.6" [[FFTViews]] deps = ["CustomUnitRanges", "FFTW"] @@ -331,16 +302,22 @@ uuid = "4f61f5a4-77b1-5117-aa51-3ab5ef4ef0cd" version = "0.3.1" [[FFTW]] -deps = ["AbstractFFTs", "FFTW_jll", "IntelOpenMP_jll", "Libdl", "LinearAlgebra", "MKL_jll", "Reexport"] -git-tree-sha1 = "1b48dbde42f307e48685fa9213d8b9f8c0d87594" +deps = ["AbstractFFTs", "FFTW_jll", "LinearAlgebra", "MKL_jll", "Preferences", "Reexport"] +git-tree-sha1 = "f985af3b9f4e278b1d24434cbb546d6092fca661" uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "1.3.2" +version = "1.4.3" [[FFTW_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "5a0d4b6a22a34d17d53543bd124f4b08ed78e8b0" +git-tree-sha1 = "3676abafff7e4ff07bbd2c42b3d8201f31653dcc" uuid = "f5851436-0d7a-5f13-b9de-f02708fd171a" -version = "3.3.9+7" +version = "3.3.9+8" + +[[FastBroadcast]] +deps = ["LinearAlgebra"] +git-tree-sha1 = "26be48918640ce002f5833e8fc537b2ba7ed0234" +uuid = "7034ab61-46d4-4ed7-9d0f-46aef9175898" +version = "0.1.8" [[FastClosures]] git-tree-sha1 = "acebe244d53ee1b461970f8910c235b259e772ef" @@ -349,21 +326,21 @@ version = "0.3.2" [[FileIO]] deps = ["Pkg", "Requires", "UUIDs"] -git-tree-sha1 = "b4fdad5fe06e0226348301b5163925ac1ae8b64b" +git-tree-sha1 = "937c29268e405b6808d958a9ac41bfe1a31b08e7" uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.6.5" +version = "1.11.0" [[FillArrays]] -deps = ["LinearAlgebra", "Random", "SparseArrays"] -git-tree-sha1 = "31939159aeb8ffad1d4d8ee44d07f8558273120a" +deps = ["LinearAlgebra", "Random", "SparseArrays", "Statistics"] +git-tree-sha1 = "7c365bdef6380b29cfc5caaf99688cd7489f9b87" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "0.11.7" +version = "0.12.2" [[FiniteDiff]] deps = ["ArrayInterface", "LinearAlgebra", "Requires", "SparseArrays", "StaticArrays"] -git-tree-sha1 = "f6f80c8f934efd49a286bb5315360be66956dfc4" +git-tree-sha1 = "8b3c09b56acaf3c0e581c66638b85c8650ee9dca" uuid = "6a86dc24-6348-571c-b903-95158fe2bd41" -version = "2.8.0" +version = "2.8.1" [[FixedPointNumbers]] deps = ["Statistics"] @@ -372,10 +349,11 @@ uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93" version = "0.8.4" [[Flux]] -deps = ["AbstractTrees", "Adapt", "CUDA", "CodecZlib", "Colors", "DelimitedFiles", "Functors", "Juno", "LinearAlgebra", "MacroTools", "NNlib", "Pkg", "Printf", "Random", "Reexport", "SHA", "Statistics", "StatsBase", "Test", "ZipFile", "Zygote"] -git-tree-sha1 = "c443bf5a8329573a68364106b2c29bb6938dc6f5" +deps = ["AbstractTrees", "Adapt", "ArrayInterface", "CUDA", "CodecZlib", "Colors", "DelimitedFiles", "Functors", "Juno", "LinearAlgebra", "MacroTools", "NNlib", "NNlibCUDA", "Pkg", "Printf", "Random", "Reexport", "SHA", "Statistics", "StatsBase", "Test", "ZipFile", "Zygote"] +git-tree-sha1 = "1286e5dd0b4c306108747356a7a5d39a11dc4080" +pinned = true uuid = "587475ba-b771-5e3f-ad9e-33799f191a9c" -version = "0.11.6" +version = "0.12.6" [[Formatting]] deps = ["Printf"] @@ -384,10 +362,10 @@ uuid = "59287772-0a20-5a39-b81b-1366585eb4c0" version = "0.4.2" [[ForwardDiff]] -deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"] -git-tree-sha1 = "c68fb7481b71519d313114dca639b35262ff105f" +deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "LinearAlgebra", "NaNMath", "Printf", "Random", "SpecialFunctions", "StaticArrays"] +git-tree-sha1 = "b5e930ac60b613ef3406da6d4f42c35d8dc51419" uuid = "f6369f11-7733-5829-9624-2563aa707210" -version = "0.10.17" +version = "0.10.19" [[FunctionWrappers]] git-tree-sha1 = "241552bc2209f0fa068b6415b1942cc0aa486bcc" @@ -395,44 +373,31 @@ uuid = "069b7b12-0de2-55c6-9aab-29f3d0a68a2e" version = "1.1.2" [[Functors]] -deps = ["MacroTools"] -git-tree-sha1 = "f40adc6422f548176bb4351ebd29e4abf773040a" +git-tree-sha1 = "39007773fd6097164ab537f78d3ac78ad2b8b695" uuid = "d9f16b24-f501-4c13-a1f2-28368ffc5196" -version = "0.1.0" +version = "0.2.4" [[Future]] deps = ["Random"] uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" [[GPUArrays]] -deps = ["AbstractFFTs", "Adapt", "LinearAlgebra", "Printf", "Random", "Serialization"] -git-tree-sha1 = "f99a25fe0313121f2f9627002734c7d63b4dd3bd" +deps = ["Adapt", "LinearAlgebra", "Printf", "Random", "Serialization", "Statistics"] +git-tree-sha1 = "8fac1cf7d6ce0f2249c7acaf25d22e1e85c4a07f" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "6.2.0" +version = "8.0.2" [[GPUCompiler]] -deps = ["DataStructures", "InteractiveUtils", "LLVM", "Libdl", "Logging", "Scratch", "Serialization", "TimerOutputs", "UUIDs"] -git-tree-sha1 = "48b77713d172107d2da557e39971cb6682ae0f83" +deps = ["ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "TimerOutputs", "UUIDs"] +git-tree-sha1 = "4ed2616d5e656c8716736b64da86755467f26cf5" uuid = "61eb1bfa-7361-4325-ad38-22787b887f55" -version = "0.9.2" - -[[GalacticOptim]] -deps = ["ArrayInterface", "ConsoleProgressMonitor", "DiffEqBase", "DiffResults", "DocStringExtensions", "FiniteDiff", "Flux", "ForwardDiff", "Logging", "LoggingExtras", "ModelingToolkit", "Optim", "Printf", "ProgressLogging", "Reexport", "Requires", "ReverseDiff", "SciMLBase", "TerminalLoggers", "Tracker", "Zygote"] -git-tree-sha1 = "ae556757b4ef7016af934094c8ea7cde15dc7c37" -uuid = "a75be94c-b780-496d-a8a9-0878b188d577" -version = "1.1.0" +version = "0.12.9" [[GitHub]] deps = ["Base64", "Dates", "HTTP", "JSON", "MbedTLS", "Sockets", "SodiumSeal"] -git-tree-sha1 = "a4f61fc1b1724e6eec1d9333eac2d4b01d8fcc8f" +git-tree-sha1 = "9e62f3eae4a2514d1de65cc2ac9d1669032a4595" uuid = "bc5e4493-9b4d-5f90-b8aa-2b2bcaad7a26" -version = "5.4.0" - -[[GlobalSensitivity]] -deps = ["Distributions", "FFTW", "ForwardDiff", "KernelDensity", "LinearAlgebra", "Parameters", "QuasiMonteCarlo", "Random", "RecursiveArrayTools", "Statistics", "StatsBase", "Trapz"] -git-tree-sha1 = "2a0e0d7501b78ab7068ba9cb7cf5ddcb6241782b" -uuid = "af5da776-676b-467e-8baf-acd8249e4f0f" -version = "1.0.0" +version = "5.6.0" [[Graphics]] deps = ["Colors", "LinearAlgebra", "NaNMath"] @@ -441,16 +406,34 @@ uuid = "a2bd30eb-e257-5431-a919-1863eab51364" version = "1.1.0" [[HTTP]] -deps = ["Base64", "Dates", "IniFile", "MbedTLS", "NetworkOptions", "Sockets", "URIs"] -git-tree-sha1 = "c9f380c76d8aaa1fa7ea9cf97bddbc0d5b15adc2" +deps = ["Base64", "Dates", "IniFile", "Logging", "MbedTLS", "NetworkOptions", "Sockets", "URIs"] +git-tree-sha1 = "44e3b40da000eab4ccb1aecdc4801c040026aeb5" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "0.9.5" +version = "0.9.13" + +[[HostCPUFeatures]] +deps = ["IfElse", "Libdl", "Static"] +git-tree-sha1 = "e86382a874edd4ff47fd1373e03f38302af93345" +uuid = "3e5b6fbb-0976-4d2c-9146-d79de83f2fb0" +version = "0.1.2" + +[[Hwloc]] +deps = ["Hwloc_jll"] +git-tree-sha1 = "92d99146066c5c6888d5a3abc871e6a214388b91" +uuid = "0e44f5e4-bd66-52a0-8798-143a42290a1d" +version = "2.0.0" + +[[Hwloc_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "3395d4d4aeb3c9d31f5929d32760d8baeee88aaf" +uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" +version = "2.5.0+0" [[IRTools]] deps = ["InteractiveUtils", "MacroTools", "Test"] -git-tree-sha1 = "c67e7515a11f726f44083e74f218d134396d6510" +git-tree-sha1 = "95215cd0076a150ef46ff7928892bc341864c73c" uuid = "7869d1d1-7146-5819-86e3-90919afe41df" -version = "0.4.2" +version = "0.4.3" [[IdentityRanges]] deps = ["OffsetArrays"] @@ -465,57 +448,75 @@ version = "0.1.0" [[ImageAxes]] deps = ["AxisArrays", "ImageCore", "Reexport", "SimpleTraits"] -git-tree-sha1 = "1592c7fd668ac9cdcef73f704ca457ccdaac2933" +git-tree-sha1 = "794ad1d922c432082bc1aaa9fa8ffbd1fe74e621" uuid = "2803e5a7-5153-5ecf-9a86-9b4c37f5f5ac" -version = "0.6.8" +version = "0.6.9" [[ImageContrastAdjustment]] deps = ["ColorVectorSpace", "ImageCore", "ImageTransformations", "Parameters"] -git-tree-sha1 = "210f8fb370d4b97fa12d65322c62df06f3e5563b" +git-tree-sha1 = "2e6084db6cccab11fe0bc3e4130bd3d117092ed9" uuid = "f332f351-ec65-5f6a-b3d1-319c6670881a" -version = "0.3.6" +version = "0.3.7" [[ImageCore]] deps = ["AbstractFFTs", "Colors", "FixedPointNumbers", "Graphics", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "Reexport"] -git-tree-sha1 = "da98af44e78a2a9dd131ac12cf19b574f551dace" +git-tree-sha1 = "db645f20b59f060d8cfae696bc9538d13fd86416" uuid = "a09fc81d-aa75-5fe9-8630-4744c3626534" -version = "0.8.21" +version = "0.8.22" [[ImageDistances]] deps = ["ColorVectorSpace", "Distances", "ImageCore", "ImageMorphology", "LinearAlgebra", "Statistics"] -git-tree-sha1 = "efa1ef9cd46fc04e8c1d520fa3612e1c56a1eeae" +git-tree-sha1 = "6378c34a3c3a216235210d19b9f495ecfff2f85f" uuid = "51556ac3-7006-55f5-8cb3-34580c88182d" -version = "0.2.12" +version = "0.2.13" [[ImageDraw]] deps = ["Distances", "ImageCore", "LinearAlgebra"] -git-tree-sha1 = "f391e0d5bc42df52a7004dd2c656736667e85115" +git-tree-sha1 = "6ed6e945d909f87c3013e391dcd3b2a56e48b331" uuid = "4381153b-2b60-58ae-a1ba-fd683676385f" -version = "0.2.4" +version = "0.2.5" [[ImageFiltering]] deps = ["CatIndices", "ColorVectorSpace", "ComputationalResources", "DataStructures", "FFTViews", "FFTW", "ImageCore", "LinearAlgebra", "OffsetArrays", "Requires", "SparseArrays", "StaticArrays", "Statistics", "TiledIteration"] -git-tree-sha1 = "81b493f57c67a8dff822e43cb2abefece7b52131" +git-tree-sha1 = "bf96839133212d3eff4a1c3a80c57abc7cfbf0ce" uuid = "6a3955dd-da59-5b1f-98d4-e7296123deb5" -version = "0.6.20" +version = "0.6.21" + +[[ImageIO]] +deps = ["FileIO", "Netpbm", "OpenEXR", "PNGFiles", "TiffImages", "UUIDs"] +git-tree-sha1 = "13c826abd23931d909e4c5538643d9691f62a617" +uuid = "82e4d734-157c-48bb-816b-45c225c6df19" +version = "0.5.8" + +[[ImageMagick]] +deps = ["FileIO", "ImageCore", "ImageMagick_jll", "InteractiveUtils", "Libdl", "Pkg", "Random"] +git-tree-sha1 = "5bc1cb62e0c5f1005868358db0692c994c3a13c6" +uuid = "6218d12a-5da1-5696-b52f-db25d2ecc6d1" +version = "1.2.1" + +[[ImageMagick_jll]] +deps = ["JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pkg", "Zlib_jll", "libpng_jll"] +git-tree-sha1 = "1c0a2295cca535fabaf2029062912591e9b61987" +uuid = "c73af94c-d91f-53ed-93a7-00f77d67a9d7" +version = "6.9.10-12+3" [[ImageMetadata]] deps = ["AxisArrays", "ColorVectorSpace", "ImageAxes", "ImageCore", "IndirectArrays"] -git-tree-sha1 = "ff77c7f234e7d8a618958fcf23b6959f2cbef2c6" +git-tree-sha1 = "ae76038347dc4edcdb06b541595268fca65b6a42" uuid = "bc367c6b-8a6b-528e-b4bd-a4b897500b49" -version = "0.9.4" +version = "0.9.5" [[ImageMorphology]] deps = ["ColorVectorSpace", "ImageCore", "LinearAlgebra", "TiledIteration"] -git-tree-sha1 = "113df7743f1e18da5f5ea5f98eb59ceb77092734" +git-tree-sha1 = "68e7cbcd7dfaa3c2f74b0a8ab3066f5de8f2b71d" uuid = "787d08f9-d448-5407-9aad-5290dd7ab264" -version = "0.2.9" +version = "0.2.11" [[ImageQualityIndexes]] deps = ["ColorVectorSpace", "ImageCore", "ImageDistances", "ImageFiltering", "OffsetArrays", "Statistics"] -git-tree-sha1 = "80484f9e1beae36860ed8022f195d04c751cfec6" +git-tree-sha1 = "1198f85fa2481a3bb94bf937495ba1916f12b533" uuid = "2996bd0c-7a13-11e9-2da2-2f5ce47296a9" -version = "0.2.1" +version = "0.2.2" [[ImageShow]] deps = ["Base64", "FileIO", "ImageCore", "Requires"] @@ -525,9 +526,9 @@ version = "0.2.3" [[ImageTransformations]] deps = ["AxisAlgorithms", "ColorVectorSpace", "CoordinateTransformations", "IdentityRanges", "ImageCore", "Interpolations", "OffsetArrays", "Rotations", "StaticArrays"] -git-tree-sha1 = "15abe58e8b9bbb9b3c8cb1e3fd04a9010a82281a" +git-tree-sha1 = "e4cc551e4295a5c96545bb3083058c24b78d4cf0" uuid = "02fcd773-0e25-5acc-982a-7f6622650795" -version = "0.8.10" +version = "0.8.13" [[Images]] deps = ["AxisArrays", "Base64", "ColorVectorSpace", "FileIO", "Graphics", "ImageAxes", "ImageContrastAdjustment", "ImageCore", "ImageDistances", "ImageFiltering", "ImageMetadata", "ImageMorphology", "ImageQualityIndexes", "ImageShow", "ImageTransformations", "IndirectArrays", "OffsetArrays", "Random", "Reexport", "SparseArrays", "StaticArrays", "Statistics", "StatsBase", "TiledIteration"] @@ -535,6 +536,12 @@ git-tree-sha1 = "535bcaae047f017f4fd7331ee859b75f2b27e505" uuid = "916415d5-f1e6-5110-898d-aaa5f9f070e0" version = "0.23.3" +[[Imath_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "87f7662e03a649cffa2e05bf19c303e168732d3e" +uuid = "905a6f67-0a94-5f89-b386-d35d92009cd1" +version = "3.1.2+0" + [[IndirectArrays]] git-tree-sha1 = "c2a145a145dc03a7620af1444e0264ef907bd44f" uuid = "9b13fd28-a010-5f03-acff-a1bbcff69959" @@ -562,10 +569,10 @@ deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" [[Interpolations]] -deps = ["AxisAlgorithms", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "SharedArrays", "SparseArrays", "StaticArrays", "WoodburyMatrices"] -git-tree-sha1 = "eb1dd6d5b2275faaaa18533e0fc5f9171cec25fa" +deps = ["AxisAlgorithms", "ChainRulesCore", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "Requires", "SharedArrays", "SparseArrays", "StaticArrays", "WoodburyMatrices"] +git-tree-sha1 = "61aa005707ea2cebf47c8d780da8dc9bc4e0c512" uuid = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59" -version = "0.13.1" +version = "0.13.4" [[IntervalSets]] deps = ["Dates", "EllipsisNotation", "Statistics"] @@ -573,6 +580,11 @@ git-tree-sha1 = "3cc368af3f110a767ac786560045dceddfc16758" uuid = "8197267c-284f-5f27-9208-e0e47529a953" version = "0.5.3" +[[IrrationalConstants]] +git-tree-sha1 = "f76424439413893a832026ca355fe273e93bce94" +uuid = "92d709cd-6900-40b7-9082-c6be49f344b6" +version = "0.1.0" + [[IterTools]] git-tree-sha1 = "05110a2ab1fc5f932622ffea2a003221f4782c18" uuid = "c8e1da08-722c-5040-9ed9-7db0dc04731e" @@ -580,9 +592,9 @@ version = "1.3.0" [[IterativeSolvers]] deps = ["LinearAlgebra", "Printf", "Random", "RecipesBase", "SparseArrays"] -git-tree-sha1 = "6f5ef3206d9dc6510a8b8e2334b96454a2ade590" +git-tree-sha1 = "1a8c6237e78b714e901e406c096fc8a65528af7d" uuid = "42fd0dbc-a981-5370-80f2-aaf504508153" -version = "0.9.0" +version = "0.9.1" [[IteratorInterfaceExtensions]] git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856" @@ -590,15 +602,22 @@ uuid = "82899510-4779-5014-852e-03e436cf321d" version = "1.0.0" [[JLLWrappers]] -git-tree-sha1 = "a431f5f2ca3f4feef3bd7a5e94b8b8d4f2f647a0" +deps = ["Preferences"] +git-tree-sha1 = "642a199af8b68253517b80bd3bfd17eb4e84df6e" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.2.0" +version = "1.3.0" [[JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] -git-tree-sha1 = "81690084b6198a2e1da36fcfda16eeca9f9f24e4" +git-tree-sha1 = "8076680b162ada2a031f707ac7b4953e30667a37" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -version = "0.21.1" +version = "0.21.2" + +[[JpegTurbo_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "d735490ac75c5cb9f1b00d8b5509c11984dc6943" +uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8" +version = "2.1.0+0" [[Juno]] deps = ["Base64", "Logging", "Media", "Profile"] @@ -606,46 +625,23 @@ git-tree-sha1 = "07cb43290a840908a771552911a6274bc6c072c7" uuid = "e5e0dc1b-0480-54bc-9374-aad01c23163d" version = "0.8.4" -[[KernelDensity]] -deps = ["Distributions", "DocStringExtensions", "FFTW", "Interpolations", "StatsBase"] -git-tree-sha1 = "09aeec87bdc9c1fa70d0b508dfa94a21acd280d9" -uuid = "5ab0869b-81aa-558d-bb23-cbf5423bbe9b" -version = "0.6.2" - [[LLVM]] -deps = ["CEnum", "Libdl", "Printf", "Unicode"] -git-tree-sha1 = "b616937c31337576360cb9fb872ec7633af7b194" +deps = ["CEnum", "LLVMExtra_jll", "Libdl", "Printf", "Unicode"] +git-tree-sha1 = "23a47d417a3cd9c2e73c854bac7dd4731c105ef7" uuid = "929cbde3-209d-540e-8aea-75f648917ca0" -version = "3.6.0" +version = "4.4.0" -[[LaTeXStrings]] -git-tree-sha1 = "c7f1c695e06c01b95a67f0cd1d34994f3e7db104" -uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" -version = "1.2.1" +[[LLVMExtra_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "9c360e5ce980b88bb31a7b086dbb19469008154b" +uuid = "dad2f222-ce93-54a1-a47d-0025e8a3acab" +version = "0.0.10+0" [[LabelledArrays]] deps = ["ArrayInterface", "LinearAlgebra", "MacroTools", "StaticArrays"] -git-tree-sha1 = "df09e970c816637191ef8794ef5c5c9f8950db88" +git-tree-sha1 = "bdde43e002847c34c206735b1cf860bc3abd35e7" uuid = "2ee39098-c373-598a-b85f-a56591580800" -version = "1.6.0" - -[[Latexify]] -deps = ["Formatting", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "Printf", "Requires"] -git-tree-sha1 = "8ae6b1783459eb5b23864986aaac2dd31f9ac60e" -uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316" -version = "0.15.0" - -[[LatinHypercubeSampling]] -deps = ["Random", "StableRNGs", "StatsBase", "Test"] -git-tree-sha1 = "42938ab65e9ed3c3029a8d2c58382ca75bdab243" -uuid = "a5e1c1ea-c99a-51d3-a14d-a9a37257b02d" -version = "1.8.0" - -[[LatticeRules]] -deps = ["Random"] -git-tree-sha1 = "7f5b02258a3ca0221a6a9710b0a0a2e8fb4957fe" -uuid = "73f95e8e-ec14-4e6a-8b18-0d2e271c4e55" -version = "0.0.1" +version = "1.6.4" [[LazyArtifacts]] deps = ["Artifacts", "Pkg"] @@ -676,6 +672,12 @@ uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" [[Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" +[[Libtiff_jll]] +deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"] +git-tree-sha1 = "340e257aada13f95f98ee352d316c3bed37c8ab9" +uuid = "89763e89-9b03-5906-acba-b20f662cd828" +version = "4.3.0+0" + [[LightGraphs]] deps = ["ArnoldiMethod", "DataStructures", "Distributed", "Inflate", "LinearAlgebra", "Random", "SharedArrays", "SimpleTraits", "SparseArrays", "Statistics"] git-tree-sha1 = "432428df5f360964040ed60418dd5601ecd240b6" @@ -692,14 +694,20 @@ version = "7.1.1" deps = ["Libdl"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +[[LogExpFunctions]] +deps = ["DocStringExtensions", "IrrationalConstants", "LinearAlgebra"] +git-tree-sha1 = "3d682c07e6dd250ed082f883dc88aee7996bf2cc" +uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688" +version = "0.3.0" + [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" -[[LoggingExtras]] -deps = ["Dates", "Logging"] -git-tree-sha1 = "59b45fd91b743dff047313bb7af0f84167aef80d" -uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36" -version = "0.4.6" +[[LoopVectorization]] +deps = ["ArrayInterface", "DocStringExtensions", "IfElse", "LinearAlgebra", "OffsetArrays", "Polyester", "Requires", "SLEEFPirates", "Static", "StrideArraysCore", "ThreadingUtilities", "UnPack", "VectorizationBase"] +git-tree-sha1 = "dcaae6d7c8223946e2838ea97888e1db4ceb42eb" +uuid = "bdcacae8-1622-11e9-2a5c-532679323890" +version = "0.12.66" [[MKL_jll]] deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "Pkg"] @@ -709,15 +717,19 @@ version = "2021.1.1+1" [[MacroTools]] deps = ["Markdown", "Random"] -git-tree-sha1 = "6a8a2a625ab0dea913aba95c11370589e0239ff0" +git-tree-sha1 = "0fb723cd8c45858c22169b2e42269e53271a6df7" uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" -version = "0.5.6" +version = "0.5.7" + +[[ManualMemory]] +git-tree-sha1 = "9cb207b18148b2199db259adfa923b45593fe08e" +uuid = "d125e4d3-2237-4719-b19c-fa641b8a4667" +version = "0.1.6" [[MappedArrays]] -deps = ["FixedPointNumbers"] -git-tree-sha1 = "b92bd220c95a8bbe89af28f11201fd080e0e3fe7" +git-tree-sha1 = "e8b359ef06ec72e8c030463fe02efe5527ee5142" uuid = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900" -version = "0.3.0" +version = "0.4.1" [[Markdown]] deps = ["Base64"] @@ -741,30 +753,24 @@ version = "0.5.0" [[Metalhead]] deps = ["BSON", "ColorTypes", "Flux", "ImageFiltering", "Images", "REPL", "Requires", "Statistics"] -git-tree-sha1 = "f977250f801e0f61ba11425bbb1d83778eae5c4b" +git-tree-sha1 = "81a8915df161f28813ea38abc824fa67b1ad0d63" uuid = "dbeba491-748d-5e0e-a39e-b530a07fa0cc" -version = "0.5.2" +version = "0.5.3" [[Missings]] deps = ["DataAPI"] -git-tree-sha1 = "f8c673ccc215eb50fcadb285f522420e29e69e1c" +git-tree-sha1 = "2ca267b08821e86c5ef4376cffed98a46c2cb205" uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28" -version = "0.4.5" +version = "1.0.1" [[Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" -[[ModelingToolkit]] -deps = ["AbstractTrees", "ArrayInterface", "ConstructionBase", "DataStructures", "DiffEqBase", "DiffEqJump", "DiffRules", "Distributed", "Distributions", "DocStringExtensions", "IfElse", "LabelledArrays", "Latexify", "Libdl", "LightGraphs", "LinearAlgebra", "MacroTools", "NaNMath", "NonlinearSolve", "RecursiveArrayTools", "Reexport", "Requires", "RuntimeGeneratedFunctions", "SafeTestsets", "SciMLBase", "Serialization", "Setfield", "SparseArrays", "SpecialFunctions", "StaticArrays", "SymbolicUtils", "Symbolics", "UnPack", "Unitful"] -git-tree-sha1 = "796bfa91fa9e3851de30f497dccd27f26f527b99" -uuid = "961ee093-0014-501f-94e3-6117800e7a78" -version = "5.14.0" - [[MosaicViews]] -deps = ["MappedArrays", "OffsetArrays", "PaddedViews"] -git-tree-sha1 = "614e8d77264d20c1db83661daadfab38e8e4b77e" +deps = ["MappedArrays", "OffsetArrays", "PaddedViews", "StackViews"] +git-tree-sha1 = "b34e3bc3ca7c94914418637cb10cc4d1d80d877d" uuid = "e94cdb99-869f-56ef-bcf0-1ae2bcbe0389" -version = "0.2.4" +version = "0.3.3" [[MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" @@ -776,9 +782,9 @@ version = "0.2.2" [[NLSolversBase]] deps = ["DiffResults", "Distributed", "FiniteDiff", "ForwardDiff"] -git-tree-sha1 = "50608f411a1e178e0129eab4110bd56efd08816f" +git-tree-sha1 = "144bab5b1443545bc4e791536c9f1eacb4eed06a" uuid = "d41bc354-129a-5804-8e4c-c37616107c6c" -version = "7.8.0" +version = "7.8.1" [[NLsolve]] deps = ["Distances", "LineSearches", "LinearAlgebra", "NLSolversBase", "Printf", "Reexport"] @@ -787,71 +793,102 @@ uuid = "2774e3e8-f4cf-5e23-947b-6d7e65073b56" version = "4.5.1" [[NNlib]] -deps = ["ChainRulesCore", "Compat", "LinearAlgebra", "Pkg", "Requires", "Statistics"] -git-tree-sha1 = "ab1d43fead2ecb9aa5ae460d3d547c2cf8d89461" +deps = ["Adapt", "ChainRulesCore", "Compat", "LinearAlgebra", "Pkg", "Requires", "Statistics"] +git-tree-sha1 = "3bc876dbff74cc9c4ece84ef9326da8ccd71c98f" uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" -version = "0.7.17" +version = "0.7.28" + +[[NNlibCUDA]] +deps = ["CUDA", "LinearAlgebra", "NNlib", "Random", "Statistics"] +git-tree-sha1 = "a7de026dc0ff9f47551a16ad9a710da66881b953" +uuid = "a00861dc-f156-4864-bf3c-e6376f28a68d" +version = "0.1.7" [[NaNMath]] git-tree-sha1 = "bfe47e760d60b82b66b61d2d44128b62e3a369fb" uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" version = "0.3.5" +[[Netpbm]] +deps = ["ColorVectorSpace", "FileIO", "ImageCore"] +git-tree-sha1 = "09589171688f0039f13ebe0fdcc7288f50228b52" +uuid = "f09324ee-3d7c-5217-9330-fc30815ba969" +version = "1.0.1" + [[NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" [[NonlinearSolve]] deps = ["ArrayInterface", "FiniteDiff", "ForwardDiff", "IterativeSolvers", "LinearAlgebra", "RecursiveArrayTools", "RecursiveFactorization", "Reexport", "SciMLBase", "Setfield", "StaticArrays", "UnPack"] -git-tree-sha1 = "ef18e47df4f3917af35be5e5d7f5d97e8a83b0ec" +git-tree-sha1 = "f2530482ef6447c8ae24c660914436f1ae3917e0" uuid = "8913a72c-1f9b-4ce2-8d82-65094dcecaec" -version = "0.3.8" +version = "0.3.9" [[ObjectDetector]] deps = ["BenchmarkTools", "Flux", "ImageCore", "ImageDraw", "ImageFiltering", "ImageTransformations", "LazyArtifacts", "Pkg", "PrettyTables"] -git-tree-sha1 = "404acf980c3a9707483b13cc60b6a17ba4312848" +git-tree-sha1 = "6d2c87611281925c21eade76a8150dbb95a230bf" uuid = "3dfc1049-5314-49cf-8447-288dfd02f9fb" -version = "0.2.0" +version = "0.2.4" [[OffsetArrays]] deps = ["Adapt"] -git-tree-sha1 = "b3dfef5f2be7d7eb0e782ba9146a5271ee426e90" +git-tree-sha1 = "c0f4a4836e5f3e0763243b8324200af6d0e0f90c" uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "1.6.2" +version = "1.10.5" + +[[OpenEXR]] +deps = ["Colors", "FileIO", "OpenEXR_jll"] +git-tree-sha1 = "327f53360fdb54df7ecd01e96ef1983536d1e633" +uuid = "52e1d378-f018-4a11-a4be-720524705ac7" +version = "0.3.2" + +[[OpenEXR_jll]] +deps = ["Artifacts", "Imath_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] +git-tree-sha1 = "923319661e9a22712f24596ce81c54fc0366f304" +uuid = "18a262bb-aa17-5467-a713-aee519bc75cb" +version = "3.1.1+0" [[OpenSpecFun_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "9db77584158d0ab52307f8c04f8e7c08ca76b5b3" +git-tree-sha1 = "13652491f6856acfd2db29360e1bbcd4565d04f1" uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" -version = "0.5.3+4" +version = "0.5.5+0" [[Optim]] deps = ["Compat", "FillArrays", "LineSearches", "LinearAlgebra", "NLSolversBase", "NaNMath", "Parameters", "PositiveFactorizations", "Printf", "SparseArrays", "StatsBase"] -git-tree-sha1 = "d34366a3abc25c41f88820762ef7dfdfe9306711" +git-tree-sha1 = "7863df65dbb2a0fa8f85fcaf0a41167640d2ebed" uuid = "429524aa-4258-5aef-a3af-852621145aeb" -version = "1.3.0" +version = "1.4.1" [[OrderedCollections]] -git-tree-sha1 = "4fa2ba51070ec13fcc7517db714445b4ab986bdf" +git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.4.0" +version = "1.4.1" [[OrdinaryDiffEq]] -deps = ["Adapt", "ArrayInterface", "DataStructures", "DiffEqBase", "ExponentialUtilities", "FastClosures", "FiniteDiff", "ForwardDiff", "LinearAlgebra", "Logging", "MacroTools", "MuladdMacro", "NLsolve", "RecursiveArrayTools", "Reexport", "SparseArrays", "SparseDiffTools", "StaticArrays", "UnPack"] -git-tree-sha1 = "d22a75b8ae5b77543c4e1f8eae1ff01ce1f64453" +deps = ["Adapt", "ArrayInterface", "DataStructures", "DiffEqBase", "DocStringExtensions", "ExponentialUtilities", "FastClosures", "FiniteDiff", "ForwardDiff", "LinearAlgebra", "Logging", "LoopVectorization", "MacroTools", "MuladdMacro", "NLsolve", "Polyester", "RecursiveArrayTools", "Reexport", "SparseArrays", "SparseDiffTools", "StaticArrays", "UnPack"] +git-tree-sha1 = "ecd9520da81628cd846c9d9be5f4ccd9f76943b2" +pinned = true uuid = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" -version = "5.52.2" +version = "5.63.2" [[PDMats]] deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"] -git-tree-sha1 = "f82a0e71f222199de8e9eb9a09977bd0767d52a0" +git-tree-sha1 = "4dd403333bcf0909341cfe57ec115152f937d7d8" uuid = "90014a1f-27ba-587c-ab20-58faa44d9150" -version = "0.11.0" +version = "0.11.1" + +[[PNGFiles]] +deps = ["Base64", "CEnum", "ImageCore", "IndirectArrays", "OffsetArrays", "libpng_jll"] +git-tree-sha1 = "520e28d4026d16dcf7b8c8140a3041f0e20a9ca8" +uuid = "f57f5aa1-a3ce-4bc8-8ab9-96f992907883" +version = "0.3.7" [[PaddedViews]] deps = ["OffsetArrays"] -git-tree-sha1 = "0fa5e78929aebc3f6b56e1a88cf505bb00a354c4" +git-tree-sha1 = "646eed6f6a5d8df6708f15ea7e02a7a2c4fe4800" uuid = "5432bcbf-9aad-5242-b902-cca2824c8663" -version = "0.5.8" +version = "0.5.10" [[Parameters]] deps = ["OrderedCollections", "UnPack"] @@ -861,9 +898,9 @@ version = "0.12.2" [[Parsers]] deps = ["Dates"] -git-tree-sha1 = "c8abc88faa3f7a3950832ac5d6e690881590d6dc" +git-tree-sha1 = "438d35d2d95ae2c5e8780b330592b6de8494e779" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "1.1.0" +version = "2.0.3" [[Pkg]] deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] @@ -875,23 +912,47 @@ git-tree-sha1 = "6e2856f677f8dcab289ded9c3ffb018fad38f29c" uuid = "32113eaa-f34f-5b0d-bd6c-c81e245fc73d" version = "0.2.10" +[[PkgVersion]] +deps = ["Pkg"] +git-tree-sha1 = "a7a7e1a88853564e551e4eba8650f8c38df79b37" +uuid = "eebad327-c553-4316-9ea0-9fa01ccd7688" +version = "0.1.1" + [[PoissonRandom]] deps = ["Random", "Statistics", "Test"] git-tree-sha1 = "44d018211a56626288b5d3f8c6497d28c26dc850" uuid = "e409e4f3-bfea-5376-8464-e040bb5c01ab" version = "0.4.0" +[[Polyester]] +deps = ["ArrayInterface", "IfElse", "ManualMemory", "Requires", "Static", "StrideArraysCore", "ThreadingUtilities", "VectorizationBase"] +git-tree-sha1 = "3ced65f2f182e5b5335a573eaa98f883eba3678b" +uuid = "f517fe37-dbe3-4b94-8317-1923a5111588" +version = "0.3.9" + [[PositiveFactorizations]] deps = ["LinearAlgebra"] git-tree-sha1 = "17275485f373e6673f7e7f97051f703ed5b15b20" uuid = "85a6dd25-e78a-55b7-8502-1745935b8125" version = "0.2.4" +[[PreallocationTools]] +deps = ["ArrayInterface", "ForwardDiff", "LabelledArrays"] +git-tree-sha1 = "9e917b108c4aaf47e8606542325bd2ccbcac7ca4" +uuid = "d236fae5-4411-538c-8e31-a6e3d9e00b46" +version = "0.1.0" + +[[Preferences]] +deps = ["TOML"] +git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a" +uuid = "21216c6a-2e73-6563-6e65-726566657250" +version = "1.2.2" + [[PrettyTables]] deps = ["Crayons", "Formatting", "Markdown", "Reexport", "Tables"] -git-tree-sha1 = "574a6b3ea95f04e8757c0280bb9c29f1a5e35138" +git-tree-sha1 = "0d1245a357cc61c8cd61934c07447aa569ff22e6" uuid = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" -version = "0.11.1" +version = "1.1.0" [[Printf]] deps = ["Unicode"] @@ -909,9 +970,9 @@ version = "0.1.4" [[ProgressMeter]] deps = ["Distributed", "Printf"] -git-tree-sha1 = "6e9c89cba09f6ef134b00e10625590746ba1e036" +git-tree-sha1 = "afadeba63d90ff223a6a48d2009434ecee2ec9e8" uuid = "92933f4c-e287-5a05-a399-4b506db050ca" -version = "1.5.0" +version = "1.7.1" [[QuadGK]] deps = ["DataStructures", "LinearAlgebra"] @@ -919,12 +980,6 @@ git-tree-sha1 = "12fbe86da16df6679be7521dfb39fbc861e1dc7b" uuid = "1fd47b50-473d-5c70-9696-f719f8f3bcdc" version = "2.4.1" -[[QuasiMonteCarlo]] -deps = ["Distributions", "LatinHypercubeSampling", "LatticeRules", "Sobol"] -git-tree-sha1 = "3a23b68992061c9c7aa359db0d592229f55b6eb1" -uuid = "8a4e6c94-4038-4cdc-81c3-7e6ffdb2a71b" -version = "0.2.2" - [[REPL]] deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" @@ -935,15 +990,9 @@ uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" [[Random123]] deps = ["Libdl", "Random", "RandomNumbers"] -git-tree-sha1 = "7c6710c8198fd4444b5eb6a3840b7d47bd3593c5" +git-tree-sha1 = "0e8b146557ad1c6deb1367655e052276690e71a3" uuid = "74087812-796a-5b5d-8853-05524746bad3" -version = "1.3.1" - -[[RandomExtensions]] -deps = ["Random", "SparseArrays"] -git-tree-sha1 = "062986376ce6d394b23d5d90f01d81426113a3c9" -uuid = "fb686558-2515-59ef-acaa-46db3789a887" -version = "0.4.3" +version = "1.4.2" [[RandomNumbers]] deps = ["Random", "Requires"] @@ -957,31 +1006,32 @@ uuid = "b3c3ace0-ae52-54e7-9d0b-2c1406fd6b9d" version = "0.3.2" [[Ratios]] -git-tree-sha1 = "37d210f612d70f3f7d57d488cb3b6eff56ad4e41" +deps = ["Requires"] +git-tree-sha1 = "7dff99fbc740e2f8228c6878e2aad6d7c2678098" uuid = "c84ed2f1-dad5-54f0-aa8e-dbefe2724439" -version = "0.4.0" +version = "0.4.1" [[RecipesBase]] -git-tree-sha1 = "b3fb709f3c97bfc6e948be68beeecb55a0b340ae" +git-tree-sha1 = "44a75aa7a527910ee3d1751d1f0e4148698add9e" uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" -version = "1.1.1" +version = "1.1.2" [[RecursiveArrayTools]] -deps = ["ArrayInterface", "LinearAlgebra", "RecipesBase", "Requires", "StaticArrays", "Statistics", "ZygoteRules"] -git-tree-sha1 = "271a36e18c8806332b7bd0f57e50fcff0d428b11" +deps = ["ArrayInterface", "ChainRulesCore", "DocStringExtensions", "LinearAlgebra", "RecipesBase", "Requires", "StaticArrays", "Statistics", "ZygoteRules"] +git-tree-sha1 = "00bede2eb099dcc1ddc3f9ec02180c326b420ee2" uuid = "731186ca-8d62-57ce-b412-fbd966d074cd" -version = "2.11.0" +version = "2.17.2" [[RecursiveFactorization]] -deps = ["LinearAlgebra"] -git-tree-sha1 = "6761a5d1f9646affb2a369ff932841fff77934a3" +deps = ["LinearAlgebra", "LoopVectorization", "Polyester", "StrideArraysCore", "TriangularSolve"] +git-tree-sha1 = "9ac54089f52b0d0c37bebca35b9505720013a108" uuid = "f2c3362d-daeb-58d1-803e-2bc74f2840b4" -version = "0.1.0" +version = "0.2.2" [[Reexport]] -git-tree-sha1 = "57d8440b0c7d98fc4f889e478e80f268d534c9d5" +git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b" uuid = "189a3867-3050-52da-a836-e630ba90ab69" -version = "1.0.0" +version = "1.2.2" [[Requires]] deps = ["UUIDs"] @@ -991,15 +1041,9 @@ version = "1.1.3" [[ResettableStacks]] deps = ["StaticArrays"] -git-tree-sha1 = "622b3e491fb0a85fbfeed6f17dc320a9f46d8929" +git-tree-sha1 = "256eeeec186fa7f26f2801732774ccf277f05db9" uuid = "ae5879a3-cd67-5da8-be7f-38c6eb64a37b" -version = "1.1.0" - -[[ReverseDiff]] -deps = ["DiffResults", "DiffRules", "ForwardDiff", "FunctionWrappers", "LinearAlgebra", "MacroTools", "NaNMath", "Random", "SpecialFunctions", "StaticArrays", "Statistics"] -git-tree-sha1 = "a4a45bcdc393c560fc13839dc1d19f3063fcb3b9" -uuid = "37e2e3b7-166d-5795-8a7a-e32c996b4267" -version = "1.7.0" +version = "1.1.1" [[Rmath]] deps = ["Random", "Rmath_jll"] @@ -1019,41 +1063,29 @@ git-tree-sha1 = "2ed8d8a16d703f900168822d83699b8c3c1a5cd8" uuid = "6038ab10-8711-5258-84ad-4b1120ba62dc" version = "1.0.2" -[[RuntimeGeneratedFunctions]] -deps = ["ExprTools", "SHA", "Serialization"] -git-tree-sha1 = "e02f14dfe3a8d3b8fc92ca80c1882bfdbc015e07" -uuid = "7e49a35a-f44a-4d26-94aa-eba1b4ca6b47" -version = "0.5.1" - [[SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" -[[SafeTestsets]] -deps = ["Test"] -git-tree-sha1 = "36ebc5622c82eb9324005cc75e7e2cc51181d181" -uuid = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" -version = "0.0.1" +[[SLEEFPirates]] +deps = ["IfElse", "Static", "VectorizationBase"] +git-tree-sha1 = "bfdf9532c33db35d2ce9df4828330f0e92344a52" +uuid = "476501e8-09a2-5ece-8869-fb82de89a1fa" +version = "0.6.25" [[SciMLBase]] -deps = ["ArrayInterface", "CommonSolve", "Distributed", "DocStringExtensions", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "RecipesBase", "RecursiveArrayTools", "StaticArrays", "Statistics", "Tables", "TreeViews"] -git-tree-sha1 = "5a009fda922a1329773e525b49b6c60b73fd5118" +deps = ["ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "RecipesBase", "RecursiveArrayTools", "StaticArrays", "Statistics", "Tables", "TreeViews"] +git-tree-sha1 = "ff686e0c79dbe91767f4c1e44257621a5455b1c6" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "1.10.0" - -[[Scratch]] -deps = ["Dates"] -git-tree-sha1 = "ad4b278adb62d185bbcb6864dc24959ab0627bf6" -uuid = "6c6a2e73-6563-6170-7368-637461726353" -version = "1.0.3" +version = "1.18.7" [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" [[Setfield]] deps = ["ConstructionBase", "Future", "MacroTools", "Requires"] -git-tree-sha1 = "d5640fc570fb1b6c54512f0bd3853866bd298b3e" +git-tree-sha1 = "fca29e68c5062722b5b4435594c3d1ba557072a3" uuid = "efcf1570-3423-57d1-acb7-fd33fddbac46" -version = "0.7.0" +version = "0.7.1" [[SharedArrays]] deps = ["Distributed", "Mmap", "Random", "Serialization"] @@ -1061,15 +1093,9 @@ uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" [[SimpleTraits]] deps = ["InteractiveUtils", "MacroTools"] -git-tree-sha1 = "daf7aec3fe3acb2131388f93a4c409b8c7f62226" +git-tree-sha1 = "5d7e3f4e11935503d3ecaf7186eac40602e7d231" uuid = "699a6c99-e7fa-54fc-8d76-47d257e15c1d" -version = "0.9.3" - -[[Sobol]] -deps = ["DelimitedFiles", "Random"] -git-tree-sha1 = "c267048df70f47d47d5272fe1a63a66c51c53014" -uuid = "ed01d8cd-4d21-5b2a-85b4-cc3bdc58bad4" -version = "1.4.0" +version = "0.9.4" [[Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" @@ -1081,83 +1107,83 @@ uuid = "2133526b-2bfb-4018-ac12-889fb3908a75" version = "0.1.1" [[SortingAlgorithms]] -deps = ["DataStructures", "Random", "Test"] -git-tree-sha1 = "03f5898c9959f8115e30bc7226ada7d0df554ddd" +deps = ["DataStructures"] +git-tree-sha1 = "b3363d7460f7d098ca0912c69b082f75625d7508" uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c" -version = "0.3.1" +version = "1.0.1" [[SparseArrays]] deps = ["LinearAlgebra", "Random"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[SparseDiffTools]] -deps = ["Adapt", "ArrayInterface", "Compat", "DataStructures", "FiniteDiff", "ForwardDiff", "LightGraphs", "LinearAlgebra", "Requires", "SparseArrays", "VertexSafeGraphs"] -git-tree-sha1 = "d05bc362e3fa1b0e2361594a706fc63ffbd140f3" +deps = ["Adapt", "ArrayInterface", "Compat", "DataStructures", "FiniteDiff", "ForwardDiff", "LightGraphs", "LinearAlgebra", "Requires", "SparseArrays", "StaticArrays", "VertexSafeGraphs"] +git-tree-sha1 = "aebcead0644d3b3396c205a09544590b5115e282" uuid = "47a9eef4-7e08-11e9-0b38-333d64bd3804" -version = "1.13.0" +version = "1.16.4" [[SpecialFunctions]] -deps = ["ChainRulesCore", "OpenSpecFun_jll"] -git-tree-sha1 = "5919936c0e92cff40e57d0ddf0ceb667d42e5902" +deps = ["ChainRulesCore", "LogExpFunctions", "OpenSpecFun_jll"] +git-tree-sha1 = "a322a9493e49c5f3a10b50df3aedaf1cdb3244b7" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "1.3.0" +version = "1.6.1" -[[StableRNGs]] -deps = ["Random", "Test"] -git-tree-sha1 = "3be7d49667040add7ee151fefaf1f8c04c8c8276" -uuid = "860ef19b-820b-49d6-a774-d7a799459cd3" -version = "1.0.0" +[[StackViews]] +deps = ["OffsetArrays"] +git-tree-sha1 = "46e589465204cd0c08b4bd97385e4fa79a0c770c" +uuid = "cae243ae-269e-4f55-b966-ac2d0dc13c15" +version = "0.1.1" [[Static]] deps = ["IfElse"] -git-tree-sha1 = "ddec5466a1d2d7e58adf9a427ba69763661aacf6" +git-tree-sha1 = "62701892d172a2fa41a1f829f66d2b0db94a9a63" uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" -version = "0.2.4" +version = "0.3.0" [[StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "2f01a51c23eed210ff4a1be102c4cc8236b66e5b" +git-tree-sha1 = "3240808c6d463ac46f1c1cd7638375cd22abbccb" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.1.0" +version = "1.2.12" [[Statistics]] deps = ["LinearAlgebra", "SparseArrays"] uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" +[[StatsAPI]] +git-tree-sha1 = "1958272568dc176a1d881acb797beb909c785510" +uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0" +version = "1.0.0" + [[StatsBase]] -deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics"] -git-tree-sha1 = "a83fa3021ac4c5a918582ec4721bc0cf70b495a9" +deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] +git-tree-sha1 = "fed1ec1e65749c4d96fc20dd13bea72b55457e62" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.33.4" +version = "0.33.9" [[StatsFuns]] -deps = ["Rmath", "SpecialFunctions"] -git-tree-sha1 = "ced55fd4bae008a8ea12508314e725df61f0ba45" +deps = ["IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"] +git-tree-sha1 = "20d1bb720b9b27636280f751746ba4abb465f19d" uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c" -version = "0.9.7" +version = "0.9.9" [[StochasticDiffEq]] -deps = ["ArrayInterface", "DataStructures", "DiffEqBase", "DiffEqJump", "DiffEqNoiseProcess", "FillArrays", "FiniteDiff", "ForwardDiff", "LinearAlgebra", "Logging", "MuladdMacro", "NLsolve", "OrdinaryDiffEq", "Random", "RandomNumbers", "RecursiveArrayTools", "Reexport", "SparseArrays", "SparseDiffTools", "StaticArrays", "UnPack"] -git-tree-sha1 = "3109ce733c907b941eea4345b0644308e2c6da2d" +deps = ["ArrayInterface", "DataStructures", "DiffEqBase", "DiffEqJump", "DiffEqNoiseProcess", "DocStringExtensions", "FillArrays", "FiniteDiff", "ForwardDiff", "LinearAlgebra", "Logging", "MuladdMacro", "NLsolve", "OrdinaryDiffEq", "Random", "RandomNumbers", "RecursiveArrayTools", "Reexport", "SparseArrays", "SparseDiffTools", "StaticArrays", "UnPack"] +git-tree-sha1 = "1d5dff61a15532dd6c67fafebc52f2feaa2b3b82" +pinned = true uuid = "789caeaf-c7a9-5a7d-9973-96adeb23e2a0" -version = "6.33.1" +version = "6.37.1" + +[[StrideArraysCore]] +deps = ["ArrayInterface", "ManualMemory", "Requires", "ThreadingUtilities", "VectorizationBase"] +git-tree-sha1 = "9ab16bda5fe1212e0af0bea80f1d11096aeb3248" +uuid = "7792a7ef-975c-4747-a70f-980b88e8d1da" +version = "0.1.18" [[SuiteSparse]] deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"] uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9" -[[SymbolicUtils]] -deps = ["AbstractAlgebra", "AbstractTrees", "Combinatorics", "ConstructionBase", "DataStructures", "IfElse", "LabelledArrays", "NaNMath", "Setfield", "SparseArrays", "SpecialFunctions", "StaticArrays", "TimerOutputs"] -git-tree-sha1 = "574d23e2da61572169c90df373e98be2deacd270" -uuid = "d1185830-fcd6-423d-90d6-eec64667417b" -version = "0.9.4" - -[[Symbolics]] -deps = ["AbstractAlgebra", "DiffRules", "Distributions", "DocStringExtensions", "IfElse", "Latexify", "Libdl", "LinearAlgebra", "MacroTools", "NaNMath", "RecipesBase", "Reexport", "RuntimeGeneratedFunctions", "SciMLBase", "Setfield", "SparseArrays", "SpecialFunctions", "SymbolicUtils", "TreeViews"] -git-tree-sha1 = "37a643a2ce6de0d16e426256227841f97d5ac1f1" -uuid = "0c5d862f-8b57-4792-8d23-62f2024744c7" -version = "0.1.13" - [[TOML]] deps = ["Dates"] uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76" @@ -1170,9 +1196,9 @@ version = "1.0.1" [[Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] -git-tree-sha1 = "a9ff3dfec713c6677af435d6a6d65f9744feef67" +git-tree-sha1 = "d0c690d37c73aeb5ca063056283fde5585a41710" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.4.1" +version = "1.5.0" [[Tar]] deps = ["ArgTools", "SHA"] @@ -1180,42 +1206,43 @@ uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e" [[TerminalLoggers]] deps = ["LeftChildRightSiblingTrees", "Logging", "Markdown", "Printf", "ProgressLogging", "UUIDs"] -git-tree-sha1 = "e185a19bb9172f0cf5bc71233fab92a46f7ae154" +git-tree-sha1 = "d620a061cb2a56930b52bdf5cf908a5c4fa8e76a" uuid = "5d786b92-1e48-4d6f-9151-6b4477ca9bed" -version = "0.1.3" +version = "0.1.4" [[Test]] deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +[[ThreadingUtilities]] +deps = ["ManualMemory"] +git-tree-sha1 = "03013c6ae7f1824131b2ae2fc1d49793b51e8394" +uuid = "8290d209-cae3-49c0-8002-c8c24d57dab5" +version = "0.4.6" + +[[TiffImages]] +deps = ["ColorTypes", "DocStringExtensions", "FileIO", "FixedPointNumbers", "IndirectArrays", "Inflate", "OffsetArrays", "OrderedCollections", "PkgVersion", "ProgressMeter"] +git-tree-sha1 = "03fb246ac6e6b7cb7abac3b3302447d55b43270e" +uuid = "731e570b-9d59-4bfa-96dc-6df516fadf69" +version = "0.4.1" + [[TiledIteration]] deps = ["OffsetArrays"] -git-tree-sha1 = "05f74c5b3c00d5336bc109416df2df907e3bd91d" +git-tree-sha1 = "52c5f816857bfb3291c7d25420b1f4aca0a74d18" uuid = "06e1c1a7-607b-532d-9fad-de7d9aa2abac" -version = "0.2.5" +version = "0.3.0" [[TimerOutputs]] -deps = ["Printf"] -git-tree-sha1 = "32cdbe6cd2d214c25a0b88f985c9e0092877c236" +deps = ["ExprTools", "Printf"] +git-tree-sha1 = "209a8326c4f955e2442c07b56029e88bb48299c7" uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f" -version = "0.5.8" - -[[Tracker]] -deps = ["Adapt", "DiffRules", "ForwardDiff", "LinearAlgebra", "MacroTools", "NNlib", "NaNMath", "Printf", "Random", "Requires", "SpecialFunctions", "Statistics"] -git-tree-sha1 = "bf4adf36062afc921f251af4db58f06235504eff" -uuid = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" -version = "0.2.16" +version = "0.5.12" [[TranscodingStreams]] deps = ["Random", "Test"] -git-tree-sha1 = "7c53c35547de1c5b9d46a4797cf6d8253807108c" +git-tree-sha1 = "216b95ea110b5972db65aa90f88d8d89dcb8851c" uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" -version = "0.9.5" - -[[Trapz]] -git-tree-sha1 = "aff96deaaa38e3b52a5af1dd3da376d49bf6ec9a" -uuid = "592b5752-818d-11e9-1e9a-2b8ca4a44cd1" -version = "2.0.2" +version = "0.9.6" [[TreeViews]] deps = ["Test"] @@ -1223,10 +1250,16 @@ git-tree-sha1 = "8d0d7a3fe2f30d6a7f833a5f19f7c7a5b396eae6" uuid = "a2a6695c-b41b-5b7d-aed9-dbfdeacea5d7" version = "0.3.0" +[[TriangularSolve]] +deps = ["CloseOpenIntervals", "IfElse", "LinearAlgebra", "LoopVectorization", "Polyester", "Static", "VectorizationBase"] +git-tree-sha1 = "cb80cf5e0dfb1aedd4c6dbca09b5faaa9a300c62" +uuid = "d5829a12-d9aa-46ab-831f-fb7c9ab06edf" +version = "0.1.3" + [[URIs]] -git-tree-sha1 = "7855809b88d7b16e9b029afd17880930626f54a2" +git-tree-sha1 = "97bbe755a53fe859669cd907f2d96aee8d2c1355" uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" -version = "1.2.0" +version = "1.3.0" [[UUIDs]] deps = ["Random", "SHA"] @@ -1240,11 +1273,11 @@ version = "1.0.2" [[Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" -[[Unitful]] -deps = ["ConstructionBase", "LinearAlgebra", "Random"] -git-tree-sha1 = "fdfbea79b5b9a305bf226eb4730321f603281290" -uuid = "1986cc42-f94f-5a68-af5c-568840ba703d" -version = "1.6.0" +[[VectorizationBase]] +deps = ["ArrayInterface", "CPUSummary", "HostCPUFeatures", "Hwloc", "IfElse", "Libdl", "LinearAlgebra", "Static"] +git-tree-sha1 = "777a3ca87b8d28eaa42bc58b125ab6ba08fb417e" +uuid = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f" +version = "0.20.37" [[VertexSafeGraphs]] deps = ["LightGraphs"] @@ -1270,15 +1303,16 @@ uuid = "83775a58-1f1d-513f-b197-d71354ab007a" [[Zstd_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "2c1332c54931e83f8f94d310fa447fd743e8d600" +git-tree-sha1 = "cc4bf3fdde8b7e3e9fa0351bdeedba1cf3b7f6e6" uuid = "3161d3a3-bdf6-5164-811a-617609db77b4" -version = "1.4.8+0" +version = "1.5.0+0" [[Zygote]] deps = ["AbstractFFTs", "ChainRules", "ChainRulesCore", "DiffRules", "Distributed", "FillArrays", "ForwardDiff", "IRTools", "InteractiveUtils", "LinearAlgebra", "MacroTools", "NaNMath", "Random", "Requires", "SpecialFunctions", "Statistics", "ZygoteRules"] -git-tree-sha1 = "b3b194dc30f94dacda4b4600d767145f8204fa1a" +git-tree-sha1 = "f01bac579bb397ab138aed7e9e3f80ef76d055f7" +pinned = true uuid = "e88e6eb3-aa80-5325-afca-941959d7151f" -version = "0.6.8" +version = "0.6.19" [[ZygoteRules]] deps = ["MacroTools"] @@ -1286,11 +1320,17 @@ git-tree-sha1 = "9e7a1e8ca60b742e508a315c17eef5211e7fbfd7" uuid = "700de1a5-db45-46bc-99cf-38207098b444" version = "0.2.1" +[[libpng_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] +git-tree-sha1 = "94d180a6d2b5e55e447e2d27a29ed04fe79eb30c" +uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" +version = "1.6.38+0" + [[libsodium_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "8ebe4f8eeb6ba5115eaf9a7301b635c3f3f28947" +git-tree-sha1 = "848ab3d00fe39d6fbc2a8641048f8f272af1c51e" uuid = "a9144af2-ca23-56d9-984f-0d03f7b5ccf8" -version = "1.0.19+0" +version = "1.0.20+0" [[nghttp2_jll]] deps = ["Artifacts", "Libdl"] diff --git a/Project.toml b/Project.toml index c1825dc..20bfb78 100644 --- a/Project.toml +++ b/Project.toml @@ -6,11 +6,12 @@ version = "0.1.0" [deps] BenchmarkCI = "20533458-34a3-403d-a444-e18f38190b5b" BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" -DiffEqFlux = "aae7a2af-3d4f-5e19-a356-7da93b79d9d0" Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c" HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3" +ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19" +ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1" JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" Metalhead = "dbeba491-748d-5e0e-a39e-b530a07fa0cc" ObjectDetector = "3dfc1049-5314-49cf-8447-288dfd02f9fb" @@ -19,3 +20,7 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" StochasticDiffEq = "789caeaf-c7a9-5a7d-9973-96adeb23e2a0" TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" + +[compat] +Flux = "0.12" +Zygote = "0.6" diff --git a/src/FluxBench.jl b/src/FluxBench.jl index cd33084..f7ef40b 100644 --- a/src/FluxBench.jl +++ b/src/FluxBench.jl @@ -1,7 +1,8 @@ module FluxBench -using Flux, Metalhead, ObjectDetector, DiffEqFlux -using OrdinaryDiffEq, StochasticDiffEq, Distributions +using Flux, Metalhead, ObjectDetector +# using DiffEqFlux +# using OrdinaryDiffEq, StochasticDiffEq, Distributions using BenchmarkTools, TimerOutputs using HTTP, JSON, FileIO using Flux.CUDA @@ -9,23 +10,32 @@ using Statistics using Zygote # using Torch - If we want to compare progress -const MODELS = (ResNet, DenseNet, GoogleNet, VGG19, SqueezeNet) +const MODELS = (ResNet, DenseNet, GoogleNet, VGG19) #, SqueezeNet) SUITE = BenchmarkGroup() include("benchmarkutils.jl") include("packages/objectdetector.jl") -include("packages/diffeqflux.jl") +# include("packages/diffeqflux.jl") include("bench.jl") -results = run(SUITE, verbose = true) -println(results) -flat_results = [] -flatten(results) +function submit(submit = false, SUITE = SUITE) + bench() + warmup(SUITE, verbose = true) + results = run(SUITE, verbose = true) + println(results) + + flat_results = flatten(results) -HTTP.post("$(ENV["CODESPEED_SERVER"])/result/add/json/", - ["Content-Type" => "application/x-www-form-urlencoded"], - HTTP.URIs.escapeuri(Dict("json" => JSON.json(flat_results)))) + print(JSON.json(flat_results)) + println() + + if submit + HTTP.post("$(ENV["CODESPEED_SERVER"])/result/add/json/", + ["Content-Type" => "application/x-www-form-urlencoded"], + HTTP.URIs.escapeuri(Dict("json" => JSON.json(flat_results)))) + end +end end # module diff --git a/src/bench.jl b/src/bench.jl index fc34a61..e897613 100644 --- a/src/bench.jl +++ b/src/bench.jl @@ -2,69 +2,55 @@ group = addgroup!(SUITE, "Metalhead") -function benchmark_cu(io, model, batchsize = 64) +function benchmark_cu(model, batchsize = 64) resnet = model ip = rand(Float32, 224, 224, 3, batchsize) - # gresnet = resnet |> gpu - # gip = gpu(ip) - - group["Forward Pass - $model with batchsize $batchsize"] = b = @benchmarkable( + group["Forward_Pass_$(model)_with_batchsize_$(batchsize)"] = b = @benchmarkable( fw(gresnet, gip), - setup=(gresnet = $resnet |> gpu; + setup = (gresnet = $resnet |> gpu; gip = gpu($ip)), - teardown=(GC.gc(); CUDA.reclaim())) - - # write(io, run(b)) - # write(io, "\n\n") + teardown = (GC.gc(); CUDA.reclaim())) end -function benchmark_bw_cu(io, model, batchsize = 64) +function benchmark_bw_cu(model, batchsize = 64) resnet = model ip = rand(Float32, 224, 224, 3, batchsize) - # gresnet = resnet |> gpu - # gip = gpu(ip) - - group["Backwards Pass - $model with batchsize $batchsize"] = b = @benchmarkable( + group["Backwards_Pass_$(model)_with_batchsize_$(batchsize)"] = b = @benchmarkable( bw(gresnet, gip), - setup=(gresnet = $resnet |> gpu; + setup = (gresnet = $resnet |> gpu; gip = gpu($ip)), - teardown=(GC.gc(); CUDA.reclaim())) + teardown = (GC.gc(); CUDA.reclaim())) - # write(io, run(b)) - # write() end function bench() - for model in MODELS, n in (5, 15, 32, 64, 96) - filename = "bench.txt" - to = TimerOutput() - # open(filename, "w") do io - benchmark_bw_cu(io, model(), n) - # end - - # open(filename, "w") do io - benchmark_cu(io, model(), n) - # end + for model in MODELS, n in (5, 15) + # we can go higher with the batchsize + # but the CI machines would have variable VRAM + # so be conservative + # TODO: add larger batchsize for full benchmarking runs + benchmark_bw_cu(model(), n) + benchmark_cu(model(), n) end # ObjectDetector - for model in [ObjectDetector.YOLO.v3_608_COCO, ObjectDetector.v3_tiny_416_COCO], batchsize in [1, 3] - objectdetector_add_yolo_fw(model = model, batchsize = batchsize) + for model in [ObjectDetector.YOLO.v3_608_COCO, ObjectDetector.YOLO.v3_tiny_416_COCO], batchsize in [1, 3] + objectdetector_add_yolo_fw(model, batchsize) end - # DiffEqFlux - ## NeuralODE - for tol in (1f-3, 1f-5, 1f-8), b in (4, 16, 64, 256) - diffeqflux_add_neuralode(tol, tol, tol > 1f-8 ? Tsit5() : Vern7(), b) - end - ## NeuralSDE - for b in (4, 16, 64), traj in (1, 10, 32) - diffeqflux_add_neuralsde(b, traj) - end - ## FFJORD - for b in (4, 16, 64, 256), ndims in (2, 4, 8) - diffeqflux_add_ffjord(b, ndims) - end + # # DiffEqFlux + # ## NeuralODE + # for tol in (1f-3, 1f-5, 1f-8), b in (4, 16, 64, 256) + # diffeqflux_add_neuralode(tol, tol, tol > 1f-8 ? Tsit5() : Vern7(), b) + # end + # ## NeuralSDE + # for b in (4, 16, 64), traj in (1, 10, 32) + # diffeqflux_add_neuralsde(b, traj) + # end + # ## FFJORD + # for b in (4, 16, 64, 256), ndims in (2, 4, 8) + # diffeqflux_add_ffjord(b, ndims) + # end end diff --git a/src/benchmarkutils.jl b/src/benchmarkutils.jl index 03aeb26..c93d8e7 100644 --- a/src/benchmarkutils.jl +++ b/src/benchmarkutils.jl @@ -11,18 +11,18 @@ macro async_benchmarkable(ex...) end basedata = Dict( - "branch" => ENV["CODESPEED_BRANCH"], - "commitid" => ENV["CODESPEED_COMMIT"], - "project" => ENV["CODESPEED_PROJECT"], - "environment" => ENV["CODESPEED_ENVIRONMENT"], - "executable" => ENV["CODESPEED_EXECUTABLE"] + "branch" => get(ENV, "CODESPEED_BRANCH", "default"), + "commitid" => get(ENV, "CODESPEED_COMMIT", "2132a29cd494de6f0166f52ca5ec1da0cf1aa098"), + "project" => get(ENV, "CODESPEED_PROJECT", "FluxBench"), + "environment" => get(ENV, "CODESPEED_ENVIRONMENT", "FluxBench"), + "executable" => get(ENV, "CODESPEED_EXECUTABLE", 1) ) # convert nested groups of benchmark to flat dictionaries of results -function flatten(results, prefix = "") +function flatten(results, prefix = "", flat_results = []) for (key,value) in results if value isa BenchmarkGroup - flatten(value, "$prefix$key/") + flat_results = flatten(value, "$prefix$key/", flat_results) else @assert value isa BenchmarkTools.Trial @@ -38,6 +38,7 @@ function flatten(results, prefix = "") "max" => maximum(value).time / 1e9)) end end + flat_results end # Do a forward pass diff --git a/src/packages/diffeqflux.jl b/src/packages/diffeqflux.jl index 8ff5a85..5f86b21 100644 --- a/src/packages/diffeqflux.jl +++ b/src/packages/diffeqflux.jl @@ -1,6 +1,7 @@ -group = addgroup!(SUITE, "DiffEqFlux") +# group = addgroup!(SUITE, "DiffEqFlux") function diffeqflux_add_neuralode(abstol = 1f-3, reltol = 1f-3, solver = Tsit5(), batchsize = 256) + group = addgroup!(SUITE, "DiffEqFlux") down = Chain(flatten, Dense(784, 512, tanh)) nn = Chain(Dense(512, 256, tanh), Dense(256, 256, tanh), @@ -18,18 +19,29 @@ function diffeqflux_add_neuralode(abstol = 1f-3, reltol = 1f-3, solver = Tsit5() ip = rand(Float32, 784, batchsize) - group["DiffEqFlux - Forward Pass - NeuralODE with abstol $abstol, reltol $reltol, batchsize $batchsize, and solver $solver"] = b = @benchmarkable( + group["DiffEqFlux_Forward_Pass_NeuralODE_with_abstol_$(abstol)_reltol_$(reltol)_batchsize_$(batchsize)_and_solver_$(solver)"] = b = @benchmarkable( fw(model, gip), - setup = (nn_gpu = $nn |> gpu; model = Chain($down, $nn_ode(nn_gpu), $diffeqarray_to_array, $fc); gip = $ip |> gpu), + setup = (nn_gpu = gpu($nn); + model = Chain($down, + $nn_ode(nn_gpu), + $diffeqarray_to_array, + $fc) |> gpu; + gip = gpu($ip)), teardown = (GC.gc(); CUDA.reclaim())) - group["DiffEqFlux - Backward Pass - NeuralODE with abstol $abstol, reltol $reltol, batchsize $batchsize, and solver $solver"] = b = @benchmarkable( + group["DiffEqFlux_Backward_Pass_NeuralODE_with_abstol_$(abstol)_reltol_$(reltol)_batchsize_$(batchsize)_and_solver_$(solver)"] = b = @benchmarkable( bw(model, gip), - setup = (nn_gpu = $nn |> gpu; model = Chain($down, $nn_ode(nn_gpu), $diffeqarray_to_array, $fc); gip = $ip |> gpu), + setup = (nn_gpu = $nn |> gpu; + model = Chain($down, + $nn_ode(nn_gpu), + $diffeqarray_to_array, + $fc) |> gpu; + gip = gpu($ip)), teardown = (GC.gc(); CUDA.reclaim())) end function diffeqflux_add_neuralsde(batchsize = 16, ntrajectories = 100) + group = addgroup!(SUITE, "DiffEqFlux") diffusion = Chain(Dense(2, 8, tanh), Dense(8, 2)) drift = Chain(Dense(2, 32, tanh), Dense(32, 32, tanh), Dense(32, 2)) nn_sde = (f, g) -> NeuralDSDE(f, g, (0.0f0, 1.0f0), SOSRI(), abstol = 1f-1, reltol = 1f-1) @@ -41,18 +53,27 @@ function diffeqflux_add_neuralsde(batchsize = 16, ntrajectories = 100) ip = repeat(rand(Float32, 2, batchsize), inner = (1, ntrajectories)) - group["DiffEqFlux - Forward Pass - NeuralSDE with batchsize $batchsize, and ntrajectories $ntrajectories"] = b = @benchmarkable( + group["DiffEqFlux_Forward_Pass_NeuralSDE_with_batchsize_$(batchsize)_and_ntrajectories_$(ntrajectories)"] = b = @benchmarkable( fw(model, gip), - setup = (drift_gpu = $drift |> gpu; diffusion_gpu = $diffusion; model = Chain($nn_sde(drift_gpu, diffusion_gpu), $sdesol_to_array); gip = $ip |> gpu), + setup = (drift_gpu = gpu($drift); + diffusion_gpu = gpu($diffusion); + model = Chain($nn_sde(drift_gpu, diffusion_gpu), + $sdesol_to_array); + gip = gpu($ip)), teardown = (GC.gc(); CUDA.reclaim())) - group["DiffEqFlux - Backward Pass - NeuralSDE with batchsize $batchsize, and ntrajectories $ntrajectories"] = b = @benchmarkable( + group["DiffEqFlux_Backward_Pass_NeuralSDE_with_batchsize_$(batchsize)_and_ntrajectories_$(ntrajectories)"] = b = @benchmarkable( bw(model, gip), - setup = (drift_gpu = $drift |> gpu; diffusion_gpu = $diffusion; model = Chain($nn_sde(drift_gpu, diffusion_gpu), $sdesol_to_array); gip = $ip |> gpu), + setup = (drift_gpu = gpu($drift); + diffusion_gpu = $diffusion; + model = Chain($nn_sde(drift_gpu, diffusion_gpu), + $sdesol_to_array) |> gpu; + gip = gpu($ip)), teardown = (GC.gc(); CUDA.reclaim())) end function diffeqflux_add_ffjord(ndims = 2, batchsize = 256) + group = addgroup!(SUITE, "DiffEqFlux") nn = Chain(Dense(ndims, ndims * 8, tanh), Dense(ndims * 8, ndims * 8, tanh), Dense(ndims * 8, ndims * 8, tanh), Dense(ndims * 8, ndims)) cnf_ffjord = f -> FFJORD(f, (0.0f0, 1.0f0), Tsit5(), monte_carlo = true) ffjordsol_to_logpx(x) = -mean(x[1])[1] @@ -71,18 +92,26 @@ function diffeqflux_add_ffjord(ndims = 2, batchsize = 256) x_gen = solve(prob, cnf_ffjord.args...; sensealg = InterpolatingAdjoint(), cnf_ffjord.kwargs...)[1:end-1, :, end] end - group["DiffEqFlux - Forward Pass - FFJORD with batchsize $batchsize, and ndims $ndims"] = b = @benchmarkable( + group["DiffEqFlux_Forward_Pass_FFJORD_with_batchsize_$(batchsize)_and_ndims_$(ndims)"] = b = @benchmarkable( fw(model, gip), - setup = (nn_gpu = $nn |> gpu; model = Chain($cnf_ffjord(nn_gpu), $ffjordsol_to_logpx); gip = $ip |> gpu), + setup = (nn_gpu = gpu($nn); + model = Chain($cnf_ffjord(nn_gpu), + $ffjordsol_to_logpx) |> gpu; + gip = gpu($ip)), teardown = (GC.gc(); CUDA.reclaim())) - group["DiffEqFlux - Backward Pass - FFJORD with batchsize $batchsize, and ndims $ndims"] = b = @benchmarkable( + group["DiffEqFlux_Backward_Pass_FFJORD_with_batchsize_$(batchsize)_and_ndims_$(ndims)"] = b = @benchmarkable( bw(model, gip), - setup = (nn_gpu = $nn |> gpu; model = Chain($cnf_ffjord(nn_gpu), $ffjordsol_to_logpx); gip = $ip |> gpu), + setup = (nn_gpu = gpu($nn); + model = Chain($cnf_ffjord(nn_gpu), + $ffjordsol_to_logpx) |> gpu; + gip = gpu($ip)), teardown = (GC.gc(); CUDA.reclaim())) - group["DiffEqFlux - Sampling - FFJORD with nsamples $nsamples, and ndims $ndims"] = b = @benchmarkable( + group["DiffEqFlux_Sampling_FFJORD_with_nsamples_$(nsamples)_and_ndims_$(ndims)"] = b = @benchmarkable( fw(sampler, model), - setup = (nn_gpu = $nn |> gpu; model = $cnf_ffjord(nn_gpu); sampler = $sample_from_learned_model), + setup = (nn_gpu = gpu($nn); + model = gpu($cnf_ffjord(nn_gpu)); + sampler = gpu($sample_from_learned_model)), teardown = (GC.gc(); CUDA.reclaim())) end diff --git a/src/packages/objectdetector.jl b/src/packages/objectdetector.jl index eb8ffa3..b69dbba 100644 --- a/src/packages/objectdetector.jl +++ b/src/packages/objectdetector.jl @@ -1,6 +1,5 @@ -group = addgroup!(SUITE, "ObjectDetector") - function objectdetector_add_yolo_fw(model = YOLO.v3_608_COCO, batchsize = 1) + group = addgroup!(SUITE, "ObjectDetector") yolomod = model(batch=batchsize, silent=true) # Load the YOLOv3-tiny model pretrained on COCO, with a batch size of 1 batch = emptybatch(yolomod) # Create a batch object. Automatically uses the GPU if available img = load(joinpath(pkgdir(ObjectDetector),"test","images","dog-cycle-car.png")) @@ -9,7 +8,9 @@ function objectdetector_add_yolo_fw(model = YOLO.v3_608_COCO, batchsize = 1) batch[:,:,:,i] = img_resize # Send resized image to the batch end - group["ObjectDetector - $model with batchsize $batchsize"] = b = @benchmarkable( + group["ObjectDetector_$(model)_with_batchsize_$(batchsize)"] = b = @benchmarkable( yolomod(batch, detectThresh=0.5, overlapThresh=0.8), + setup = (yolomod = gpu($yolomod); + batch = gpu($batch)), teardown=(GC.gc(); CUDA.reclaim())) end