From 057b85bb60c503eb6eac6607bad210029a243b48 Mon Sep 17 00:00:00 2001 From: Joost Date: Sun, 17 Jan 2021 13:34:14 +0100 Subject: [PATCH 1/5] vae_mnist: update and fix dependencies --- vision/vae_mnist/Manifest.toml | 1073 ++++++++++++++++++++++---------- vision/vae_mnist/Project.toml | 2 +- vision/vae_mnist/vae_mnist.jl | 7 +- vision/vae_mnist/vae_plot.jl | 2 +- 4 files changed, 733 insertions(+), 351 deletions(-) diff --git a/vision/vae_mnist/Manifest.toml b/vision/vae_mnist/Manifest.toml index fea4cef70..dd0578726 100644 --- a/vision/vae_mnist/Manifest.toml +++ b/vision/vae_mnist/Manifest.toml @@ -8,21 +8,21 @@ version = "0.5.0" [[AbstractTrees]] deps = ["Markdown"] -git-tree-sha1 = "86d092c2599f1f7bb01668bf8eb3412f98d61e47" +git-tree-sha1 = "33e450545eaf7699da1a6e755f9ea65f14077a45" uuid = "1520ce14-60c1-5f80-bbc7-55ef81b5835c" -version = "0.3.2" +version = "0.3.3" [[Adapt]] deps = ["LinearAlgebra"] -git-tree-sha1 = "c88cfc7f9c1f9f8633cddf0b56e86302b70f64c5" +git-tree-sha1 = "345a14764e43fe927d6f5c250fe4c8e4664e6ee8" uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" -version = "1.0.1" +version = "2.4.0" -[[ArrayLayouts]] -deps = ["FillArrays", "LinearAlgebra"] -git-tree-sha1 = "f8904599065b57f51715faf6278126f853aef6fc" -uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "0.2.4" +[[Artifacts]] +deps = ["Pkg"] +git-tree-sha1 = "c30985d8821e0cd73870b17b0ed0ce6dc44cb744" +uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" +version = "1.3.0" [[AxisAlgorithms]] deps = ["LinearAlgebra", "Random", "SparseArrays", "WoodburyMatrices"] @@ -32,35 +32,47 @@ version = "1.0.0" [[AxisArrays]] deps = ["Dates", "IntervalSets", "IterTools", "RangeArrays"] -git-tree-sha1 = "04f979dd266c708f478334e0a85785eab0558740" +git-tree-sha1 = "f31f50712cbdf40ee8287f0443b57503e34122ef" uuid = "39de3d68-74b9-583c-8d2d-e117c070f3a9" -version = "0.4.2" +version = "0.4.3" + +[[BFloat16s]] +deps = ["LinearAlgebra", "Test"] +git-tree-sha1 = "4af69e205efc343068dc8722b8dfec1ade89254a" +uuid = "ab4f0b2a-ad5b-11e8-123f-65d77653426b" +version = "0.1.0" [[BSON]] -git-tree-sha1 = "e794bd8f3f319218e8c8b46657631bdbea2807ca" +git-tree-sha1 = "dd36d7cf3d185eeaaf64db902c15174b22f5dafb" uuid = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0" -version = "0.2.5" +version = "0.2.6" [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" [[BinDeps]] deps = ["Libdl", "Pkg", "SHA", "URIParser", "Unicode"] -git-tree-sha1 = "66158ad56b4bf6cc8413b37d0b7bc52402682764" +git-tree-sha1 = "1289b57e8cf019aede076edab0587eb9644175bd" uuid = "9e28174c-4ba2-5203-b857-d8d62c4213ee" -version = "1.0.0" +version = "1.0.2" [[BinaryProvider]] -deps = ["Libdl", "SHA"] -git-tree-sha1 = "5b08ed6036d9d3f0ee6369410b830f8873d4024c" +deps = ["Libdl", "Logging", "SHA"] +git-tree-sha1 = "ecdec412a9abc8db54c0efc5548c64dfce072058" uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232" -version = "0.5.8" +version = "0.5.10" [[Blosc]] -deps = ["BinaryProvider", "CMakeWrapper", "Libdl"] -git-tree-sha1 = "9981f1795919b8f770dc064fe733ba09c2e7c7a9" +deps = ["Blosc_jll"] +git-tree-sha1 = "84cf7d0f8fd46ca6f1b3e0305b4b4a37afe50fd6" uuid = "a74b3585-a348-5f62-a45c-50e91977d574" -version = "0.6.0" +version = "0.7.0" + +[[Blosc_jll]] +deps = ["Libdl", "Lz4_jll", "Pkg", "Zlib_jll", "Zstd_jll"] +git-tree-sha1 = "aa9ef39b54a168c3df1b2911e7797e4feee50fbe" +uuid = "0b7ba130-8d10-5ba8-a3d6-c5182647fed9" +version = "1.14.3+1" [[BufferedStreams]] deps = ["Compat", "Test"] @@ -69,48 +81,30 @@ uuid = "e1450e63-4bb3-523b-b2a4-4ffa8c0fd77d" version = "1.0.0" [[Bzip2_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "3663bfffede2ef41358b6fc2e1d8a6d50b3c3904" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "c3598e525718abcc440f69cc6d5f60dda0a1b61e" uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0" -version = "1.0.6+2" +version = "1.0.6+5" [[CEnum]] -git-tree-sha1 = "62847acab40e6855a9b5905ccb99c2b5cf6b3ebb" +git-tree-sha1 = "215a9aa4a1f23fbd05b92769fdd62559488d70e9" uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82" -version = "0.2.0" - -[[CMake]] -deps = ["BinDeps"] -git-tree-sha1 = "50a8b41d2c562fccd9ab841085fc7d1e2706da82" -uuid = "631607c0-34d2-5d66-819e-eb0f9aa2061a" -version = "1.2.0" - -[[CMakeWrapper]] -deps = ["BinDeps", "CMake", "Libdl", "Parameters", "Test"] -git-tree-sha1 = "16d4acb3d37dc05b714977ffefa8890843dc8985" -uuid = "d5fb7624-851a-54ee-a528-d3f3bac0b4a0" -version = "0.2.3" +version = "0.4.1" [[CRC32c]] uuid = "8bf52ea8-c179-5cab-976a-9e18b702a9bc" -[[CUDAapi]] -deps = ["Libdl", "Logging"] -git-tree-sha1 = "831b825d10104bd29e28f6da93312a976830717b" -uuid = "3895d2a7-ec45-59b8-82bb-cfc6a382f9b3" -version = "4.0.0" +[[CUDA]] +deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CompilerSupportLibraries_jll", "DataStructures", "ExprTools", "GPUArrays", "GPUCompiler", "LLVM", "Libdl", "LinearAlgebra", "Logging", "MacroTools", "NNlib", "Pkg", "Printf", "Random", "Reexport", "Requires", "SparseArrays", "Statistics", "TimerOutputs"] +git-tree-sha1 = "39f6f584bec264ace76f924d1c8637c85617697e" +uuid = "052768ef-5323-5732-b1bb-66c8b64840ba" +version = "2.4.0" -[[CUDAdrv]] -deps = ["CEnum", "CUDAapi", "Printf"] -git-tree-sha1 = "e650cbaee92b60433313157926b1e80d0c3a0e2e" -uuid = "c5f51814-7f29-56b8-a69c-e4d8f6be1fde" -version = "6.2.2" - -[[CUDAnative]] -deps = ["Adapt", "BinaryProvider", "CEnum", "CUDAapi", "CUDAdrv", "Cthulhu", "DataStructures", "ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Pkg", "Printf", "TimerOutputs"] -git-tree-sha1 = "0da071ed49a6f5f62d5164de071daa07cedaa1e6" -uuid = "be33ccc6-a3ff-5ff2-a52e-74243cff1e17" -version = "3.0.4" +[[Cairo_jll]] +deps = ["Artifacts", "Bzip2_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"] +git-tree-sha1 = "e2f47f6d8337369411569fd45ae5753ca10394c6" +uuid = "83423d85-b0ee-5818-9007-b63ccbeb887a" +version = "1.16.0+6" [[CatIndices]] deps = ["CustomUnitRanges", "OffsetArrays"] @@ -118,53 +112,65 @@ git-tree-sha1 = "0c91e4fcda51bbd881c5d49ef784460750abcac0" uuid = "aafaddc9-749c-510e-ac4f-586e18779b91" version = "0.2.1" -[[CodeTracking]] -deps = ["InteractiveUtils", "UUIDs"] -git-tree-sha1 = "0becdab7e6fbbcb7b88d8de5b72e5bb2f28239f3" -uuid = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2" -version = "0.5.8" +[[ChainRules]] +deps = ["ChainRulesCore", "Compat", "LinearAlgebra", "Random", "Reexport", "Requires", "Statistics"] +git-tree-sha1 = "0af5c12e5528fc2df87a5f084195f10bfbf03a28" +uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2" +version = "0.7.48" + +[[ChainRulesCore]] +deps = ["Compat", "LinearAlgebra", "SparseArrays"] +git-tree-sha1 = "89a0b14325d0f02f9caed7c8ba91181a5d254874" +uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" +version = "0.9.26" [[CodecZlib]] -deps = ["BinaryProvider", "Libdl", "TranscodingStreams"] -git-tree-sha1 = "05916673a2627dd91b4969ff8ba6941bc85a960e" +deps = ["TranscodingStreams", "Zlib_jll"] +git-tree-sha1 = "ded953804d019afa9a3f98981d99b33e3db7b6da" uuid = "944b1d66-785c-5afd-91f1-9de20f533193" -version = "0.6.0" +version = "0.7.0" + +[[ColorSchemes]] +deps = ["ColorTypes", "Colors", "FixedPointNumbers", "Random", "StaticArrays"] +git-tree-sha1 = "3141757b5832ee7a0386db87997ee5a23ff20f4d" +uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4" +version = "3.10.2" [[ColorTypes]] deps = ["FixedPointNumbers", "Random"] -git-tree-sha1 = "c4c1cca28748906265ed62c788d6fe6f0134d264" +git-tree-sha1 = "4bffea7ed1a9f0f3d1a131bbcd4b925548d75288" uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" -version = "0.10.0" +version = "0.10.9" [[ColorVectorSpace]] deps = ["ColorTypes", "Colors", "FixedPointNumbers", "LinearAlgebra", "SpecialFunctions", "Statistics", "StatsBase"] -git-tree-sha1 = "bd0c0c81a39923bc03f9c3b61d89ad816e741002" +git-tree-sha1 = "4d17724e99f357bfd32afa0a9e2dda2af31a9aea" uuid = "c3611d14-8923-5661-9e6a-0046d554d3a4" -version = "0.8.5" +version = "0.8.7" [[Colors]] deps = ["ColorTypes", "FixedPointNumbers", "InteractiveUtils", "Reexport"] -git-tree-sha1 = "2fdeb981ebcf52cd800ddb6a0aa5eac34153552d" +git-tree-sha1 = "ac5f2213e56ed8a34a3dd2f681f4df1166b34929" uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" -version = "0.12.0" +version = "0.12.6" [[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" [[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 = "0198d18b28c093bef39872a22f1a897218a925f5" +git-tree-sha1 = "919c7f3151e79ff196add81d7f4e45d91bbf420b" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.8.0" +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" [[ComputationalResources]] git-tree-sha1 = "52cb3ec90e8a8bea0e62e275ba577ad0f74821f7" @@ -173,27 +179,15 @@ version = "0.3.2" [[Contour]] deps = ["StaticArrays"] -git-tree-sha1 = "6d56f927b33d3820561b8f89d7de311718683846" +git-tree-sha1 = "9f02045d934dc030edad45944ea80dbd1f0ebea7" uuid = "d38c429a-6771-53c6-b99e-75d170b6e991" -version = "0.5.2" +version = "0.5.7" [[CoordinateTransformations]] -deps = ["LinearAlgebra", "Rotations", "StaticArrays"] -git-tree-sha1 = "71333ea3f841bca6c1aa2863f11758eb9b37bfbc" +deps = ["LinearAlgebra", "StaticArrays"] +git-tree-sha1 = "6d1c23e740a586955645500bbec662476204a52c" uuid = "150eb455-5306-5404-9cee-2592286d6298" -version = "0.5.1" - -[[Cthulhu]] -deps = ["CodeTracking", "InteractiveUtils", "REPL", "Unicode"] -git-tree-sha1 = "a4849ec61df9659423cc63b298ed895904ee9743" -uuid = "f68482b8-f384-11e8-15f7-abe071a5a75f" -version = "1.0.2" - -[[CuArrays]] -deps = ["AbstractFFTs", "Adapt", "CEnum", "CUDAapi", "CUDAdrv", "CUDAnative", "DataStructures", "GPUArrays", "Libdl", "LinearAlgebra", "MacroTools", "NNlib", "Pkg", "Printf", "Random", "Reexport", "Requires", "SparseArrays", "Statistics", "TimerOutputs"] -git-tree-sha1 = "e8c55b38dcca955f5aed8ec4479cdc95810db1e1" -uuid = "3a865a2d-5b23-5a0f-bc46-62713ec82fae" -version = "2.0.1" +version = "0.6.1" [[CustomUnitRanges]] git-tree-sha1 = "0d42a23be3acfb3c58569b28ed3ab8bd67af5ced" @@ -201,21 +195,26 @@ uuid = "dc8bdbbb-1ca9-579f-8c36-e416f6a65cce" version = "1.0.0" [[DataAPI]] -git-tree-sha1 = "674b67f344687a88310213ddfa8a2b3c76cc4252" +git-tree-sha1 = "ad84f52c0b8f05aa20839484dbaf01690b41ff84" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.1.0" +version = "1.4.0" [[DataDeps]] -deps = ["HTTP", "Reexport", "SHA"] -git-tree-sha1 = "f2be642d7a94e7f0cabcd2106fee4c6715d452d1" +deps = ["BinaryProvider", "HTTP", "Libdl", "Reexport", "SHA", "p7zip_jll"] +git-tree-sha1 = "9f69dd052eaf292edd42d4bed999dfbd291927a0" uuid = "124859b0-ceae-595e-8997-d05f6a7a8dfe" -version = "0.7.2" +version = "0.7.6" [[DataStructures]] -deps = ["InteractiveUtils", "OrderedCollections"] -git-tree-sha1 = "73eb18320fe3ba58790c8b8f6f89420f0a622773" +deps = ["Compat", "InteractiveUtils", "OrderedCollections"] +git-tree-sha1 = "fb0aa371da91c1ff9dc7fbed6122d3e411420b9c" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.17.11" +version = "0.18.8" + +[[DataValueInterfaces]] +git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" +uuid = "e2d170a0-9d28-54be-80f0-106bbe20a464" +version = "1.0.0" [[Dates]] deps = ["Printf"] @@ -227,53 +226,65 @@ 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" [[Distances]] deps = ["LinearAlgebra", "Statistics"] -git-tree-sha1 = "23717536c81b63e250f682b0e0933769eecd1411" +git-tree-sha1 = "e8b13ba5f166e11df2de6fc283e5db7864245df0" uuid = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7" -version = "0.8.2" +version = "0.10.0" [[Distributed]] deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[DrWatson]] -deps = ["FileIO", "LibGit2", "Pkg", "Random", "Requires"] -git-tree-sha1 = "088ce4bce400017097f0f94039e0d5026ffef1d4" +deps = ["Dates", "FileIO", "LibGit2", "Pkg", "Random", "Requires", "UnPack"] +git-tree-sha1 = "026cfaa2341860e7436256b8272d73d4f91a5c18" uuid = "634d3b9d-ee7a-5ddf-bec9-22491ea816e1" -version = "1.10.2" +version = "1.16.6" + +[[EarCut_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "92d8f9f208637e8d2d28c664051a00569c01493d" +uuid = "5ae413db-bbd1-5e63-b57d-d24a61df00f5" +version = "2.1.5+1" [[EllipsisNotation]] -git-tree-sha1 = "65dad386e877850e6fce4fc77f60fe75a468ce9d" +git-tree-sha1 = "18ee049accec8763be17a933737c1dd0fdf8673a" uuid = "da5c29d0-fa7d-589e-88eb-ea29b0a81949" -version = "0.4.0" +version = "1.0.0" + +[[Expat_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "1402e52fcda25064f51c77a9655ce8680b76acf0" +uuid = "2e619515-83b5-522b-bb60-26c02a35a201" +version = "2.2.7+6" [[ExprTools]] -git-tree-sha1 = "08c1f74d9ad03acf0ee84c12c9e665ab1a9a6e33" +git-tree-sha1 = "10407a39b87f29d47ebaca8edbc75d7c302ff93e" uuid = "e2ba6199-217a-4e67-a87a-7c52f15ade04" -version = "0.1.0" +version = "0.1.3" [[FFMPEG]] -deps = ["FFMPEG_jll"] -git-tree-sha1 = "c82bef6fc01e30d500f588cd01d29bdd44f1924e" +deps = ["FFMPEG_jll", "x264_jll"] +git-tree-sha1 = "9a73ffdc375be61b0e4516d83d880b265366fe1f" uuid = "c87230d0-a227-11e9-1b43-d7ebe4e7570a" -version = "0.3.0" +version = "0.4.0" [[FFMPEG_jll]] -deps = ["Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "LAME_jll", "LibVPX_jll", "Libdl", "Ogg_jll", "OpenSSL_jll", "Opus_jll", "Pkg", "Zlib_jll", "libass_jll", "libfdk_aac_jll", "libvorbis_jll", "x264_jll", "x265_jll"] -git-tree-sha1 = "814bf7865005bee373521cb49cad46182bec53b4" +deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "LAME_jll", "LibVPX_jll", "Libdl", "Ogg_jll", "OpenSSL_jll", "Opus_jll", "Pkg", "Zlib_jll", "libass_jll", "libfdk_aac_jll", "libvorbis_jll", "x264_jll", "x265_jll"] +git-tree-sha1 = "3cc57ad0a213808473eafef4845a74766242e05f" uuid = "b22a6f82-2f65-5046-a5b2-351ab43fb4e5" -version = "4.1.0+2" +version = "4.3.1+4" [[FFTViews]] deps = ["CustomUnitRanges", "FFTW"] @@ -283,68 +294,105 @@ version = "0.3.1" [[FFTW]] deps = ["AbstractFFTs", "FFTW_jll", "IntelOpenMP_jll", "Libdl", "LinearAlgebra", "MKL_jll", "Reexport"] -git-tree-sha1 = "109d82fa4b00429f9afcce873e9f746f11f018d3" +git-tree-sha1 = "8fda0934cb99db617171f7296dc361f4d6fa5424" uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "1.2.0" +version = "1.3.0" [[FFTW_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "6c975cd606128d45d1df432fb812d6eb10fee00b" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "5a0d4b6a22a34d17d53543bd124f4b08ed78e8b0" uuid = "f5851436-0d7a-5f13-b9de-f02708fd171a" -version = "3.3.9+5" +version = "3.3.9+7" [[FileIO]] deps = ["Pkg"] -git-tree-sha1 = "3d7cb2c4c850439f19c4d6d3fbe1dce6481cddb1" +git-tree-sha1 = "fee8955b9dfa7bec67117ef48085fb2b559b9c22" uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.2.4" +version = "1.4.5" [[FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays"] -git-tree-sha1 = "51cc2f9bc4eb9c6c0e81ec2f779d1085583cc956" +git-tree-sha1 = "8bd8e47ff5d34b20f0aa9641988eb660590008bc" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "0.8.7" +version = "0.11.0" [[FixedPointNumbers]] -git-tree-sha1 = "3ba9ea634d4c8b289d590403b4a06f8e227a6238" +deps = ["Statistics"] +git-tree-sha1 = "335bfdceacc84c5cdf16aadc768aa5ddfc5383cc" uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93" -version = "0.8.0" +version = "0.8.4" [[Flux]] -deps = ["AbstractTrees", "Adapt", "CodecZlib", "Colors", "CuArrays", "DelimitedFiles", "Juno", "MacroTools", "NNlib", "Pkg", "Printf", "Random", "Reexport", "SHA", "Statistics", "StatsBase", "Test", "ZipFile", "Zygote"] -git-tree-sha1 = "eb5801eea6294851dc2b16b20669f91776e79a3b" +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 = "f688d61b40b345aa9f0a4a41d3ca7750ad9cb1f6" uuid = "587475ba-b771-5e3f-ad9e-33799f191a9c" -version = "0.10.4" +version = "0.11.4" + +[[Fontconfig_jll]] +deps = ["Artifacts", "Bzip2_jll", "Expat_jll", "FreeType2_jll", "JLLWrappers", "Libdl", "Libuuid_jll", "Pkg", "Zlib_jll"] +git-tree-sha1 = "35895cf184ceaab11fd778b4590144034a167a2f" +uuid = "a3f928ae-7b40-5064-980b-68af3947d34b" +version = "2.13.1+14" + +[[Formatting]] +deps = ["Printf"] +git-tree-sha1 = "8339d61043228fdd3eb658d86c926cb282ae72a8" +uuid = "59287772-0a20-5a39-b81b-1366585eb4c0" +version = "0.4.2" [[ForwardDiff]] deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"] -git-tree-sha1 = "869540e4367122fbffaace383a5bdc34d6e5e5ac" +git-tree-sha1 = "8de2519a83c6c1c2442c2f481dd9a8364855daf4" uuid = "f6369f11-7733-5829-9624-2563aa707210" -version = "0.10.10" +version = "0.10.14" [[FreeType2_jll]] -deps = ["Bzip2_jll", "Libdl", "Pkg", "Zlib_jll"] -git-tree-sha1 = "7d900f32a3788d4eacac2bfa3bf5c770179c8afd" +deps = ["Artifacts", "Bzip2_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] +git-tree-sha1 = "cbd58c9deb1d304f5a245a0b7eb841a2560cfec6" uuid = "d7e528f0-a631-5988-bf34-fe36492bcfd7" -version = "2.10.1+2" +version = "2.10.1+5" [[FriBidi_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "e479537bf8a8f060c546553c14fd0633978dda7e" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "0d20aed5b14dd4c9a2453c1b601d08e1149679cc" uuid = "559328eb-81f9-559d-9380-de523a88c83c" -version = "1.0.5+2" +version = "1.0.5+6" + +[[Functors]] +deps = ["MacroTools"] +git-tree-sha1 = "f40adc6422f548176bb4351ebd29e4abf773040a" +uuid = "d9f16b24-f501-4c13-a1f2-28368ffc5196" +version = "0.1.0" + +[[GLFW_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Pkg", "Xorg_libXcursor_jll", "Xorg_libXi_jll", "Xorg_libXinerama_jll", "Xorg_libXrandr_jll"] +git-tree-sha1 = "a1bbf700b5388bffc3d882f4f4d625cf1c714fd7" +uuid = "0656b61e-2033-5cc2-a64a-77c0f6c09b89" +version = "3.3.2+1" [[GPUArrays]] deps = ["AbstractFFTs", "Adapt", "LinearAlgebra", "Printf", "Random", "Serialization"] -git-tree-sha1 = "d586762b08dcda13228df8967119b9cb6f22ade5" +git-tree-sha1 = "f99a25fe0313121f2f9627002734c7d63b4dd3bd" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "3.1.0" +version = "6.2.0" + +[[GPUCompiler]] +deps = ["DataStructures", "InteractiveUtils", "LLVM", "Libdl", "Scratch", "Serialization", "TimerOutputs", "UUIDs"] +git-tree-sha1 = "c853c810b52a80f9aad79ab109207889e57f41ef" +uuid = "61eb1bfa-7361-4325-ad38-22787b887f55" +version = "0.8.3" [[GR]] -deps = ["Base64", "DelimitedFiles", "LinearAlgebra", "Printf", "Random", "Serialization", "Sockets", "Test", "UUIDs"] -git-tree-sha1 = "7ea6f715b7caa10d7ee16f1cfcd12f3ccc74116a" +deps = ["Base64", "DelimitedFiles", "GR_jll", "HTTP", "JSON", "LinearAlgebra", "Pkg", "Printf", "Random", "Serialization", "Sockets", "Test", "UUIDs"] +git-tree-sha1 = "b90b826782cb3ac5b7a7f41b3fd0113180257ed4" uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" -version = "0.48.0" +version = "0.53.0" + +[[GR_jll]] +deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Pkg", "Qt_jll", "Zlib_jll", "libpng_jll"] +git-tree-sha1 = "8aee6fa096b0cbdb05e71750c978b96a08c78951" +uuid = "d2c73de3-f751-5644-a686-071e5b155ba9" +version = "0.53.0+0" [[GZip]] deps = ["Libdl"] @@ -352,11 +400,23 @@ git-tree-sha1 = "039be665faf0b8ae36e089cd694233f5dee3f7d6" uuid = "92fee26a-97fe-5a0c-ad85-20a5f3185b63" version = "0.5.1" -[[GeometryTypes]] -deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "StaticArrays"] -git-tree-sha1 = "96fd99cf83b1952a7d8cb54f4c585a648275805a" -uuid = "4d00f742-c7ba-57c2-abde-4428a4b178cb" -version = "0.8.2" +[[GeometryBasics]] +deps = ["EarCut_jll", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"] +git-tree-sha1 = "876f77f0d3253e882ff588af1c95d0e4a86c9766" +uuid = "5c1252a2-5f33-56bf-86c9-59e7332b4326" +version = "0.3.5" + +[[Gettext_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"] +git-tree-sha1 = "8c14294a079216000a0bdca5ec5a447f073ddc9d" +uuid = "78b55507-aeef-58d4-861c-77aaff3498b1" +version = "0.20.1+7" + +[[Glib_jll]] +deps = ["Artifacts", "Gettext_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Libiconv_jll", "Libmount_jll", "PCRE_jll", "Pkg", "Zlib_jll"] +git-tree-sha1 = "04690cc5008b38ecbdfede949220bc7d9ba26397" +uuid = "7746bdde-850d-59dc-9ae8-88ece973131d" +version = "2.59.0+4" [[Graphics]] deps = ["Colors", "LinearAlgebra", "NaNMath"] @@ -364,23 +424,34 @@ git-tree-sha1 = "45d684ead5b65c043ad46bd5be750d61c39d7ef8" uuid = "a2bd30eb-e257-5431-a919-1863eab51364" version = "1.0.2" +[[Grisu]] +git-tree-sha1 = "03d381f65183cb2d0af8b3425fde97263ce9a995" +uuid = "42e2da0e-8278-4e71-bc24-59509adca0fe" +version = "1.0.0" + [[HDF5]] -deps = ["BinaryProvider", "Blosc", "CMakeWrapper", "Libdl", "Mmap"] -git-tree-sha1 = "d3ea5532668bf9bdd5e8d5f16571e0b520cbbb9f" +deps = ["Blosc", "Compat", "HDF5_jll", "Libdl", "Mmap", "Random", "Requires"] +git-tree-sha1 = "8be8b31df938483ba2ab27f38a8bc91a9e43ae92" uuid = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f" -version = "0.12.5" +version = "0.14.3" + +[[HDF5_jll]] +deps = ["Artifacts", "JLLWrappers", "LibCURL_jll", "Libdl", "OpenSSL_jll", "Pkg", "Zlib_jll"] +git-tree-sha1 = "fd83fa0bde42e01952757f01149dd968c06c4dba" +uuid = "0234f1f7-429e-5d53-9886-15a909be8d59" +version = "1.12.0+1" [[HTTP]] deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"] -git-tree-sha1 = "cd60d9a575d3b70c026d7e714212fd4ecf86b4bb" +git-tree-sha1 = "c7ec02c4c6a039a98a15f955462cd7aea5df4508" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "0.8.13" +version = "0.8.19" [[IRTools]] deps = ["InteractiveUtils", "MacroTools", "Test"] -git-tree-sha1 = "1a4355e4b5b50be2311ebb644f34f3306dbd0410" +git-tree-sha1 = "c67e7515a11f726f44083e74f218d134396d6510" uuid = "7869d1d1-7146-5819-86e3-90919afe41df" -version = "0.3.1" +version = "0.4.2" [[IdentityRanges]] deps = ["OffsetArrays"] @@ -389,70 +460,70 @@ uuid = "bbac6d45-d8f3-5730-bfe4-7a449cd117ca" version = "0.3.1" [[ImageAxes]] -deps = ["AxisArrays", "ImageCore", "MappedArrays", "Reexport", "SimpleTraits"] -git-tree-sha1 = "c0aca8db7e9fddda18c9cebff5d147b0e799d676" +deps = ["AxisArrays", "ImageCore", "Reexport", "SimpleTraits"] +git-tree-sha1 = "1592c7fd668ac9cdcef73f704ca457ccdaac2933" uuid = "2803e5a7-5153-5ecf-9a86-9b4c37f5f5ac" -version = "0.6.4" +version = "0.6.8" [[ImageContrastAdjustment]] -deps = ["ColorVectorSpace", "ImageCore", "ImageTransformations", "MappedArrays", "Parameters"] -git-tree-sha1 = "d22d89e03c8f617e0ae31886ca60e291b548cf59" +deps = ["ColorVectorSpace", "ImageCore", "ImageTransformations", "Parameters"] +git-tree-sha1 = "210f8fb370d4b97fa12d65322c62df06f3e5563b" uuid = "f332f351-ec65-5f6a-b3d1-319c6670881a" -version = "0.3.5" +version = "0.3.6" [[ImageCore]] -deps = ["Colors", "FixedPointNumbers", "Graphics", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "Reexport", "Requires"] -git-tree-sha1 = "4aa7db337d48529a0a9f6e31ed5ed0a805b6fd7c" +deps = ["AbstractFFTs", "Colors", "FixedPointNumbers", "Graphics", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "Reexport"] +git-tree-sha1 = "79badd979fbee9b8980cd995cd5a86a9e93b8ad7" uuid = "a09fc81d-aa75-5fe9-8630-4744c3626534" -version = "0.8.13" +version = "0.8.20" [[ImageDistances]] -deps = ["ColorVectorSpace", "Distances", "ImageCore", "LinearAlgebra", "MappedArrays", "Statistics"] -git-tree-sha1 = "cf9b02b9f5e33c768c223de6d8f7d1b6d0cf4136" +deps = ["ColorVectorSpace", "Distances", "ImageCore", "LinearAlgebra", "Statistics"] +git-tree-sha1 = "c6dcdcf7e3088603fa9151fdb63f90082ec3b4db" uuid = "51556ac3-7006-55f5-8cb3-34580c88182d" -version = "0.2.7" +version = "0.2.9" [[ImageFiltering]] -deps = ["CatIndices", "ColorVectorSpace", "ComputationalResources", "DataStructures", "FFTViews", "FFTW", "ImageCore", "ImageMetadata", "LinearAlgebra", "MappedArrays", "OffsetArrays", "Requires", "StaticArrays", "Statistics", "TiledIteration"] -git-tree-sha1 = "c8aebfbdbb2f12665448de007f635a1910b476e4" +deps = ["CatIndices", "ColorVectorSpace", "ComputationalResources", "DataStructures", "FFTViews", "FFTW", "ImageCore", "ImageMetadata", "LinearAlgebra", "OffsetArrays", "Requires", "SparseArrays", "StaticArrays", "Statistics", "TiledIteration"] +git-tree-sha1 = "ac8321781d375dd0ac8571072f538866c279a216" uuid = "6a3955dd-da59-5b1f-98d4-e7296123deb5" -version = "0.6.11" +version = "0.6.18" [[ImageIO]] -deps = ["FileIO", "PNGFiles"] -git-tree-sha1 = "124651759b8958e1f2340ea52a84e745813f8e7e" +deps = ["FileIO", "Netpbm", "PNGFiles"] +git-tree-sha1 = "0d6d09c28d67611c68e25af0c2df7269c82b73c7" uuid = "82e4d734-157c-48bb-816b-45c225c6df19" -version = "0.1.1" +version = "0.4.1" [[ImageMagick]] deps = ["FileIO", "ImageCore", "ImageMagick_jll", "InteractiveUtils", "Libdl", "Pkg", "Random"] -git-tree-sha1 = "0563e9b247de1d2950ebaf06971b1e771b0cd8ca" +git-tree-sha1 = "02558f83932fde6ebd3ab007dbff6bd8740a8247" uuid = "6218d12a-5da1-5696-b52f-db25d2ecc6d1" -version = "1.1.3" +version = "1.1.6" [[ImageMagick_jll]] deps = ["JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pkg", "Zlib_jll", "libpng_jll"] -git-tree-sha1 = "b363bb9be6948455a55cfd98813e77c6c2abf856" +git-tree-sha1 = "1c0a2295cca535fabaf2029062912591e9b61987" uuid = "c73af94c-d91f-53ed-93a7-00f77d67a9d7" -version = "6.9.10-12+1" +version = "6.9.10-12+3" [[ImageMetadata]] deps = ["AxisArrays", "ColorVectorSpace", "ImageAxes", "ImageCore", "IndirectArrays"] -git-tree-sha1 = "5bedd77cb80ce2c51889414cd2de9e300217ee8d" +git-tree-sha1 = "ff77c7f234e7d8a618958fcf23b6959f2cbef2c6" uuid = "bc367c6b-8a6b-528e-b4bd-a4b897500b49" -version = "0.9.0" +version = "0.9.4" [[ImageMorphology]] -deps = ["ImageCore"] -git-tree-sha1 = "e41dd25ebf8de738a8ff4f1058a1823a7fe509cf" +deps = ["ColorVectorSpace", "ImageCore", "LinearAlgebra", "TiledIteration"] +git-tree-sha1 = "113df7743f1e18da5f5ea5f98eb59ceb77092734" uuid = "787d08f9-d448-5407-9aad-5290dd7ab264" -version = "0.2.5" +version = "0.2.9" [[ImageQualityIndexes]] -deps = ["ColorVectorSpace", "ImageCore", "ImageDistances", "ImageFiltering", "MappedArrays", "Statistics"] -git-tree-sha1 = "3af30042a8fe85612a6a106cb20ca2fa1eb67bd6" +deps = ["ColorVectorSpace", "ImageCore", "ImageDistances", "ImageFiltering", "OffsetArrays", "Statistics"] +git-tree-sha1 = "80484f9e1beae36860ed8022f195d04c751cfec6" uuid = "2996bd0c-7a13-11e9-2da2-2f5ce47296a9" -version = "0.1.4" +version = "0.2.1" [[ImageShow]] deps = ["Base64", "FileIO", "ImageCore", "Requires"] @@ -461,16 +532,16 @@ uuid = "4e3cecfd-b093-5904-9786-8bbb286a6a31" version = "0.2.3" [[ImageTransformations]] -deps = ["AxisAlgorithms", "ColorVectorSpace", "CoordinateTransformations", "IdentityRanges", "ImageCore", "Interpolations", "OffsetArrays", "StaticArrays"] -git-tree-sha1 = "34e3b7549af44043e37ba321334afa322ec63a9d" +deps = ["AxisAlgorithms", "ColorVectorSpace", "CoordinateTransformations", "IdentityRanges", "ImageCore", "Interpolations", "OffsetArrays", "Rotations", "StaticArrays"] +git-tree-sha1 = "b9ed11686a335d7f981e97ddc588f81b1a6f5fa3" uuid = "02fcd773-0e25-5acc-982a-7f6622650795" -version = "0.8.4" +version = "0.8.8" [[Images]] -deps = ["AxisArrays", "Base64", "ColorVectorSpace", "FileIO", "Graphics", "ImageAxes", "ImageContrastAdjustment", "ImageCore", "ImageDistances", "ImageFiltering", "ImageMetadata", "ImageMorphology", "ImageQualityIndexes", "ImageShow", "ImageTransformations", "IndirectArrays", "MappedArrays", "OffsetArrays", "Random", "Reexport", "SparseArrays", "StaticArrays", "Statistics", "StatsBase", "TiledIteration"] -git-tree-sha1 = "30618bbbb5cbae4ce14f4adf0cdce71f9be4e9b6" +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"] +git-tree-sha1 = "535bcaae047f017f4fd7331ee859b75f2b27e505" uuid = "916415d5-f1e6-5110-898d-aaa5f9f070e0" -version = "0.22.1" +version = "0.23.3" [[IndirectArrays]] git-tree-sha1 = "c2a145a145dc03a7620af1444e0264ef907bd44f" @@ -495,69 +566,150 @@ uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" [[Interpolations]] deps = ["AxisAlgorithms", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "SharedArrays", "SparseArrays", "StaticArrays", "WoodburyMatrices"] -git-tree-sha1 = "3af735234d9b1ff9ff1af89875735cd9549c0c5f" +git-tree-sha1 = "eb1dd6d5b2275faaaa18533e0fc5f9171cec25fa" uuid = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59" -version = "0.12.9" +version = "0.13.1" [[IntervalSets]] deps = ["Dates", "EllipsisNotation", "Statistics"] -git-tree-sha1 = "8a83c4788fdc2e32d08d90214834ec2dc1a54f57" +git-tree-sha1 = "93a6d78525feb0d3ee2a2ae83a7d04db1db5663f" uuid = "8197267c-284f-5f27-9208-e0e47529a953" -version = "0.4.0" +version = "0.5.2" [[IterTools]] git-tree-sha1 = "05110a2ab1fc5f932622ffea2a003221f4782c18" uuid = "c8e1da08-722c-5040-9ed9-7db0dc04731e" version = "1.3.0" +[[IteratorInterfaceExtensions]] +git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856" +uuid = "82899510-4779-5014-852e-03e436cf321d" +version = "1.0.0" + +[[JLLWrappers]] +git-tree-sha1 = "a431f5f2ca3f4feef3bd7a5e94b8b8d4f2f647a0" +uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" +version = "1.2.0" + [[JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] -git-tree-sha1 = "b34d7cef7b337321e97d22242c3c2b91f476748e" +git-tree-sha1 = "81690084b6198a2e1da36fcfda16eeca9f9f24e4" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -version = "0.21.0" +version = "0.21.1" [[JpegTurbo_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "b007cedc10bb017cdae3af0062fe4dd29b483c70" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "9aff0587d9603ea0de2c6f6300d9f9492bbefbd3" uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8" -version = "2.0.1+0" +version = "2.0.1+3" [[Juno]] deps = ["Base64", "Logging", "Media", "Profile"] -git-tree-sha1 = "e1ba2a612645b3e07c773c3a208f215745081fe6" +git-tree-sha1 = "07cb43290a840908a771552911a6274bc6c072c7" uuid = "e5e0dc1b-0480-54bc-9374-aad01c23163d" -version = "0.8.1" +version = "0.8.4" [[LAME_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "a46bff84977753fdba8db3c50db1435bb1eb4288" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "df381151e871f41ee86cee4f5f6fd598b8a68826" uuid = "c1c5ebd0-6772-5130-a774-d5fcae4a789d" -version = "3.100.0+0" +version = "3.100.0+3" [[LLVM]] deps = ["CEnum", "Libdl", "Printf", "Unicode"] -git-tree-sha1 = "b6b86801ae2f2682e0a4889315dc76b68db2de71" +git-tree-sha1 = "d0d99629d6ae4a3e211ae83d8870907bd842c811" uuid = "929cbde3-209d-540e-8aea-75f648917ca0" -version = "1.3.4" +version = "3.5.2" + +[[LZO_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "f128cd6cd05ffd6d3df0523ed99b90ff6f9b349a" +uuid = "dd4b983a-f0e5-5f8d-a1b7-129d4a5fb1ac" +version = "2.10.0+3" + +[[LaTeXStrings]] +git-tree-sha1 = "c7aebfecb1a60d59c0fe023a68ec947a208b1e6b" +uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" +version = "1.2.0" + +[[Latexify]] +deps = ["Formatting", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "Printf", "Requires"] +git-tree-sha1 = "3a0084cec7bf157edcb45a67fac0647f88fe5eaf" +uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316" +version = "0.14.7" + +[[LibCURL_jll]] +deps = ["LibSSH2_jll", "Libdl", "MbedTLS_jll", "Pkg", "Zlib_jll", "nghttp2_jll"] +git-tree-sha1 = "897d962c20031e6012bba7b3dcb7a667170dad17" +uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" +version = "7.70.0+2" [[LibGit2]] deps = ["Printf"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" +[[LibSSH2_jll]] +deps = ["Libdl", "MbedTLS_jll", "Pkg"] +git-tree-sha1 = "717705533148132e5466f2924b9a3657b16158e8" +uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" +version = "1.9.0+3" + [[LibVPX_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "e3549ca9bf35feb9d9d954f4c6a9032e92f46e7c" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "85fcc80c3052be96619affa2fe2e6d2da3908e11" uuid = "dd192d2f-8180-539f-9fb4-cc70b1dcf69a" -version = "1.8.1+1" +version = "1.9.0+1" [[Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" +[[Libffi_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "a2cd088a88c0d37eef7d209fd3d8712febce0d90" +uuid = "e9f186c6-92d2-5b65-8a66-fee21dc1b490" +version = "3.2.1+4" + +[[Libgcrypt_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgpg_error_jll", "Pkg"] +git-tree-sha1 = "b391a18ab1170a2e568f9fb8d83bc7c780cb9999" +uuid = "d4300ac3-e22c-5743-9152-c294e39db1e4" +version = "1.8.5+4" + +[[Libglvnd_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll", "Xorg_libXext_jll"] +git-tree-sha1 = "7739f837d6447403596a75d19ed01fd08d6f56bf" +uuid = "7e76a0d4-f3c7-5321-8279-8d96eeed0f29" +version = "1.3.0+3" + +[[Libgpg_error_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "ec7f2e8ad5c9fa99fc773376cdbc86d9a5a23cb7" +uuid = "7add5ba3-2f88-524e-9cd5-f83b8a55f7b8" +version = "1.36.0+3" + +[[Libiconv_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "8e924324b2e9275a51407a4e06deb3455b1e359f" +uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531" +version = "1.16.0+7" + +[[Libmount_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "51ad0c01c94c1ce48d5cad629425035ad030bfd5" +uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9" +version = "2.34.0+3" + [[Libtiff_jll]] -deps = ["JpegTurbo_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"] -git-tree-sha1 = "0764d2317bf99a0120325720f83d356f6016b05c" +deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"] +git-tree-sha1 = "291dd857901f94d683973cdf679984cdf73b56d0" uuid = "89763e89-9b03-5906-acba-b20f662cd828" -version = "4.0.10+1" +version = "4.1.0+2" + +[[Libuuid_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "f879ae9edbaa2c74c922e8b85bb83cc84ea1450b" +uuid = "38a345b3-de98-5d2b-a5d3-14cd9215e700" +version = "2.34.0+7" [[LinearAlgebra]] deps = ["Libdl"] @@ -566,34 +718,41 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" +[[Lz4_jll]] +deps = ["Libdl", "Pkg"] +git-tree-sha1 = "51b1db0732bbdcfabb60e36095cc3ed9c0016932" +uuid = "5ced341a-0733-55b8-9ab6-a4889d929147" +version = "1.9.2+2" + [[MAT]] deps = ["BufferedStreams", "CodecZlib", "HDF5", "SparseArrays"] -git-tree-sha1 = "33db0ab3000dabd036867b3dd09b41c29a31ed9a" +git-tree-sha1 = "61f049fe2f7168b8002d5794a1bb37f1f3bc92e4" uuid = "23992714-dd62-5051-b70f-ba57cb901cac" -version = "0.7.0" +version = "0.9.2" [[MKL_jll]] deps = ["IntelOpenMP_jll", "Libdl", "Pkg"] -git-tree-sha1 = "720629cc8cbd12c146ca01b661fd1a6cf66e2ff4" +git-tree-sha1 = "eb540ede3aabb8284cb482aa41d00d6ca850b1f8" uuid = "856f044c-d86e-5d09-b602-aeab76dc8ba7" -version = "2019.0.117+2" +version = "2020.2.254+0" [[MLDatasets]] deps = ["BinDeps", "ColorTypes", "DataDeps", "DelimitedFiles", "FixedPointNumbers", "GZip", "MAT", "Requires"] -git-tree-sha1 = "bb11b01db89f9f9a36cc8cf7f59857757627fd5e" +git-tree-sha1 = "163a628fb306280708baff9aa383c5469267e1c1" uuid = "eb30cadb-4394-5ae3-aed4-317e484a6458" -version = "0.5.1" +version = "0.5.3" [[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" [[MappedArrays]] -git-tree-sha1 = "e2a02fe7ee86a10c707ff1756ab1650b40b140bb" +deps = ["FixedPointNumbers"] +git-tree-sha1 = "b92bd220c95a8bbe89af28f11201fd080e0e3fe7" uuid = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900" -version = "0.2.2" +version = "0.3.0" [[Markdown]] deps = ["Base64"] @@ -601,15 +760,15 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[MbedTLS]] deps = ["Dates", "MbedTLS_jll", "Random", "Sockets"] -git-tree-sha1 = "a9e2221f06b42f56052f43ad7edecb01d0ef5ab4" +git-tree-sha1 = "1c38e51c3d08ef2278062ebceade0e46cefc96fe" uuid = "739be429-bea8-5141-9913-cc70e7f3736d" -version = "1.0.1" +version = "1.0.3" [[MbedTLS_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "c83f5a1d038f034ad0549f9ee4d5fac3fb429e33" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "0eef589dd1c26a3ac9d753fe1a8bcad63f956fa6" uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" -version = "2.16.0+2" +version = "2.16.8+1" [[Measures]] git-tree-sha1 = "e498ddeee6f9fdb4551ce855a46f54dbd900245f" @@ -624,88 +783,106 @@ version = "0.5.0" [[Missings]] deps = ["DataAPI"] -git-tree-sha1 = "de0a5ce9e5289f27df672ffabef4d1e5861247d5" +git-tree-sha1 = "ed61674a0864832495ffe0a7e889c0da76b0f4c8" uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28" -version = "0.4.3" +version = "0.4.4" [[Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" [[MosaicViews]] -deps = ["OffsetArrays", "PaddedViews"] -git-tree-sha1 = "b483b88403ac0ac01667778cbb29462b111b1deb" +deps = ["MappedArrays", "OffsetArrays", "PaddedViews"] +git-tree-sha1 = "614e8d77264d20c1db83661daadfab38e8e4b77e" uuid = "e94cdb99-869f-56ef-bcf0-1ae2bcbe0389" -version = "0.2.2" +version = "0.2.4" [[NNlib]] -deps = ["BinaryProvider", "Libdl", "LinearAlgebra", "Requires", "Statistics"] -git-tree-sha1 = "d9f196d911f55aeaff11b11f681b135980783824" +deps = ["ChainRulesCore", "LinearAlgebra", "Pkg", "Requires", "Statistics"] +git-tree-sha1 = "13fd29731c7f609cb82a3a544c5538584d22c153" uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" -version = "0.6.6" +version = "0.7.11" [[NaNMath]] -git-tree-sha1 = "928b8ca9b2791081dc71a51c55347c27c618760f" +git-tree-sha1 = "bfe47e760d60b82b66b61d2d44128b62e3a369fb" uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" -version = "0.3.3" +version = "0.3.5" + +[[Netpbm]] +deps = ["ColorVectorSpace", "FileIO", "ImageCore"] +git-tree-sha1 = "03472ec5ea8884b791c6340712f3261c0f393691" +uuid = "f09324ee-3d7c-5217-9330-fc30815ba969" +version = "1.0.0" [[OffsetArrays]] -git-tree-sha1 = "930db8ef90483570107f2396b1ffc6680f08e8b7" +deps = ["Adapt"] +git-tree-sha1 = "5b644e46f71e744fac0775b885809fd82c4ca904" uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "1.0.4" +version = "1.5.0" [[Ogg_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "f4d4d03c562f40652c0baabd3e4cb2e756e157b7" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "a42c0f138b9ebe8b58eba2271c5053773bde52d0" uuid = "e7412a2a-1a6e-54c0-be00-318e2571c051" -version = "1.3.3+0" +version = "1.3.4+2" [[OpenSSL_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "d2a6f25262d568b5a7e454cf7ff5066a79d16c7d" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "71bbbc616a1d710879f5a1021bcba65ffba6ce58" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "1.1.1+2" +version = "1.1.1+6" [[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" [[Opus_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "c9931bf2fcdb57b48c227395c61ea82603212f7d" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "f9d57f4126c39565e05a2b0264df99f497fc6f37" uuid = "91d4177d-7536-5919-b921-800302f37372" -version = "1.3.1+0" +version = "1.3.1+3" [[OrderedCollections]] -deps = ["Random", "Serialization", "Test"] -git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1" +git-tree-sha1 = "cf59cfed2e2c12e8a2ff0a4f1e9b2cd8650da6db" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.1.0" +version = "1.3.2" + +[[PCRE_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "1b556ad51dceefdbf30e86ffa8f528b73c7df2bb" +uuid = "2f80f16e-611a-54ab-bc61-aa92de5b98fc" +version = "8.42.0+4" [[PNGFiles]] -deps = ["CEnum", "ImageCore", "libpng_jll"] -git-tree-sha1 = "e3205c45c6f4d9cb85d05e5ef7d0ffe54c6992ac" +deps = ["Base64", "CEnum", "ImageCore", "IndirectArrays", "OffsetArrays", "libpng_jll"] +git-tree-sha1 = "aa6e87a2361c2fe5a63b1a6a4b567f13aa108991" uuid = "f57f5aa1-a3ce-4bc8-8ab9-96f992907883" -version = "0.1.3" +version = "0.3.5" [[PaddedViews]] deps = ["OffsetArrays"] -git-tree-sha1 = "b40a1b901468f343dce95b16a48b4023373caca0" +git-tree-sha1 = "91d229e113e8975a399e40d7c0b1ddf4da6d3c59" uuid = "5432bcbf-9aad-5242-b902-cca2824c8663" -version = "0.5.4" +version = "0.5.7" [[Parameters]] -deps = ["OrderedCollections"] -git-tree-sha1 = "b62b2558efb1eef1fa44e4be5ff58a515c287e38" +deps = ["OrderedCollections", "UnPack"] +git-tree-sha1 = "38b2e970043613c187bd56a995fe2e551821eb4a" uuid = "d96e819e-fc66-5662-9728-84c9c7592b0a" -version = "0.12.0" +version = "0.12.1" [[Parsers]] -deps = ["Dates", "Test"] -git-tree-sha1 = "f8f5d2d4b4b07342e5811d2b6428e45524e241df" +deps = ["Dates"] +git-tree-sha1 = "50c9a9ed8c714945e01cd53a21007ed3865ed714" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "1.0.2" +version = "1.0.15" + +[[Pixman_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "6a20a83c1ae86416f0a5de605eaea08a552844a3" +uuid = "30392449-352a-5448-841d-b1acce4e97dc" +version = "0.40.0+0" [[Pkg]] deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] @@ -713,21 +890,21 @@ uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" [[PlotThemes]] deps = ["PlotUtils", "Requires", "Statistics"] -git-tree-sha1 = "87a4ea7f8c350d87d3a8ca9052663b633c0b2722" +git-tree-sha1 = "c6f5ea535551b3b16835134697f0c65d06c94b91" uuid = "ccf2f8ad-2431-5c83-bf29-c5338b663b6a" -version = "1.0.3" +version = "2.0.0" [[PlotUtils]] -deps = ["Colors", "Dates", "Printf", "Random", "Reexport"] -git-tree-sha1 = "51e742162c97d35f714f9611619db6975e19384b" +deps = ["ColorSchemes", "Colors", "Dates", "Printf", "Random", "Reexport", "Statistics"] +git-tree-sha1 = "ae9a295ac761f64d8c2ec7f9f24d21eb4ffba34d" uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043" -version = "0.6.5" +version = "1.0.10" [[Plots]] -deps = ["Base64", "Contour", "Dates", "FFMPEG", "FixedPointNumbers", "GR", "GeometryTypes", "JSON", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs"] -git-tree-sha1 = "0dc2e86bb0dda71379a5122d32103b594b551dc9" +deps = ["Base64", "Contour", "Dates", "FFMPEG", "FixedPointNumbers", "GR", "GeometryBasics", "JSON", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs"] +git-tree-sha1 = "4797acb266b8d9ff316f4581924e71c6709f152d" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -version = "1.0.11" +version = "1.10.1" [[Printf]] deps = ["Unicode"] @@ -739,14 +916,21 @@ uuid = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79" [[ProgressMeter]] deps = ["Distributed", "Printf"] -git-tree-sha1 = "ea1f4fa0ff5e8b771bf130d87af5b7ef400760bd" +git-tree-sha1 = "45640774ee2efa24e52686dbdf895e88102e68fc" uuid = "92933f4c-e287-5a05-a399-4b506db050ca" -version = "1.2.0" +version = "1.4.1" [[ProtoBuf]] -git-tree-sha1 = "51b74991da46594fb411a715e7e092bef50b99ff" +deps = ["Compat", "Logging"] +git-tree-sha1 = "9ecf92287404ebe5666a1c0488c3aaf90bbb5ff4" uuid = "3349acd9-ac6a-5e09-bcdb-63829b23a429" -version = "0.8.0" +version = "0.10.0" + +[[Qt_jll]] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Fontconfig_jll", "Glib_jll", "JLLWrappers", "Libdl", "Libglvnd_jll", "OpenSSL_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libxcb_jll", "Xorg_xcb_util_image_jll", "Xorg_xcb_util_keysyms_jll", "Xorg_xcb_util_renderutil_jll", "Xorg_xcb_util_wm_jll", "Zlib_jll", "xkbcommon_jll"] +git-tree-sha1 = "7760cfea90bec61814e31dfb204fa4b81bba7b57" +uuid = "ede63266-ebff-546c-83e0-1c6fb6d0efc8" +version = "5.15.2+1" [[REPL]] deps = ["InteractiveUtils", "Markdown", "Sockets"] @@ -767,15 +951,15 @@ uuid = "c84ed2f1-dad5-54f0-aa8e-dbefe2724439" version = "0.4.0" [[RecipesBase]] -git-tree-sha1 = "d352369b00094cadb43d694333b051b3d55abaf2" +git-tree-sha1 = "b3fb709f3c97bfc6e948be68beeecb55a0b340ae" uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" -version = "1.0.0" +version = "1.1.1" [[RecipesPipeline]] -deps = ["Dates", "PlotUtils", "RecipesBase"] -git-tree-sha1 = "3d4ecb5aa24a8582a946a2cc0d2a65b085697750" +deps = ["Dates", "NaNMath", "PlotUtils", "RecipesBase"] +git-tree-sha1 = "9ea2f5bf1b26918b16e9f885bb8e05206bfc2144" uuid = "01d81517-befc-4cb6-b9ec-a95719d0359c" -version = "0.1.3" +version = "0.2.1" [[Reexport]] deps = ["Pkg"] @@ -785,19 +969,25 @@ version = "0.2.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" [[Rotations]] deps = ["LinearAlgebra", "StaticArrays", "Statistics"] -git-tree-sha1 = "d5f83867093db7319a9366d55f29280ecae9bcda" +git-tree-sha1 = "2ed8d8a16d703f900168822d83699b8c3c1a5cd8" uuid = "6038ab10-8711-5258-84ad-4b1120ba62dc" -version = "0.13.0" +version = "1.0.2" [[SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" +[[Scratch]] +deps = ["Dates"] +git-tree-sha1 = "ad4b278adb62d185bbcb6864dc24959ab0627bf6" +uuid = "6c6a2e73-6563-6170-7368-637461726353" +version = "1.0.3" + [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" @@ -806,16 +996,16 @@ deps = ["Distributed", "Mmap", "Random", "Serialization"] uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" [[Showoff]] -deps = ["Dates"] -git-tree-sha1 = "e032c9df551fb23c9f98ae1064de074111b7bc39" +deps = ["Dates", "Grisu"] +git-tree-sha1 = "ee010d8f103468309b8afac4abb9be2e18ff1182" uuid = "992d4aef-0814-514b-bc4d-f2e9a6c4116f" -version = "0.3.1" +version = "0.3.2" [[SimpleTraits]] deps = ["InteractiveUtils", "MacroTools"] -git-tree-sha1 = "2bdf3b6300a9d66fe29ee8bb51ba100c4df9ecbc" +git-tree-sha1 = "daf7aec3fe3acb2131388f93a4c409b8c7f62226" uuid = "699a6c99-e7fa-54fc-8d76-47d257e15c1d" -version = "0.9.1" +version = "0.9.3" [[Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" @@ -831,16 +1021,16 @@ deps = ["LinearAlgebra", "Random"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[SpecialFunctions]] -deps = ["OpenSpecFun_jll"] -git-tree-sha1 = "e19b98acb182567bcb7b75bb5d9eedf3a3b5ec6c" +deps = ["ChainRulesCore", "OpenSpecFun_jll"] +git-tree-sha1 = "75394dbe2bd346beeed750fb02baa6445487b862" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "0.10.0" +version = "1.2.1" [[StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "5a3bcb6233adabde68ebc97be66e95dcb787424c" +git-tree-sha1 = "9da72ed50e94dbff92036da395275ed114e04d49" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "0.12.1" +version = "1.0.1" [[Statistics]] deps = ["LinearAlgebra", "SparseArrays"] @@ -848,15 +1038,33 @@ uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" [[StatsBase]] deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics"] -git-tree-sha1 = "a6102b1f364befdb05746f386b67c6b7e3262c45" +git-tree-sha1 = "7bab7d4eb46b225b35179632852b595a3162cb61" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.33.0" +version = "0.33.2" + +[[StructArrays]] +deps = ["Adapt", "DataAPI", "Tables"] +git-tree-sha1 = "8099ed9fb90b6e754d6ba8c6ed8670f010eadca0" +uuid = "09ab397b-f2b6-538f-b94a-2f83cf4a842a" +version = "0.4.4" + +[[TableTraits]] +deps = ["IteratorInterfaceExtensions"] +git-tree-sha1 = "b1ad568ba658d8cbb3b892ed5380a6f3e781a81e" +uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c" +version = "1.0.0" + +[[Tables]] +deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] +git-tree-sha1 = "240d19b8762006ff04b967bdd833269ad642d550" +uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" +version = "1.2.2" [[TensorBoardLogger]] -deps = ["CRC32c", "ColorTypes", "FileIO", "ImageCore", "ProtoBuf", "Requires", "StatsBase"] -git-tree-sha1 = "86b7492c063484c6bf99f787d289c1dd4d9ca320" +deps = ["CRC32c", "ColorTypes", "FileIO", "FixedPointNumbers", "ImageCore", "ProtoBuf", "Requires", "StatsBase"] +git-tree-sha1 = "8781d27f107a6d1ff6d067694803c03d942b8cf6" uuid = "899adc3e-224a-11e9-021f-63837185c80f" -version = "0.1.5" +version = "0.1.13" [[Test]] deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] @@ -864,15 +1072,15 @@ uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [[TiledIteration]] deps = ["OffsetArrays"] -git-tree-sha1 = "98693daea9bb49aba71eaad6b168b152d2310358" +git-tree-sha1 = "05f74c5b3c00d5336bc109416df2df907e3bd91d" uuid = "06e1c1a7-607b-532d-9fad-de7d9aa2abac" -version = "0.2.4" +version = "0.2.5" [[TimerOutputs]] deps = ["Printf"] -git-tree-sha1 = "311765af81bbb48d7bad01fb016d9c328c6ede03" +git-tree-sha1 = "3318281dd4121ecf9713ce1383b9ace7d7476fdd" uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f" -version = "0.5.3" +version = "0.5.7" [[TranscodingStreams]] deps = ["Random", "Test"] @@ -881,86 +1089,259 @@ uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" version = "0.9.5" [[URIParser]] -deps = ["Test", "Unicode"] -git-tree-sha1 = "6ddf8244220dfda2f17539fa8c9de20d6c575b69" +deps = ["Unicode"] +git-tree-sha1 = "53a9f49546b8d2dd2e688d216421d050c9a31d0d" uuid = "30578b45-9adc-5946-b283-645ec420af67" -version = "0.4.0" +version = "0.4.1" [[UUIDs]] deps = ["Random", "SHA"] uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" +[[UnPack]] +git-tree-sha1 = "387c1f73762231e86e0c9c5443ce3b4a0a9a0c2b" +uuid = "3a884ed6-31ef-47d7-9d2a-63182c4928ed" +version = "1.0.2" + [[Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" +[[Wayland_jll]] +deps = ["Artifacts", "Expat_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg", "XML2_jll"] +git-tree-sha1 = "dc643a9b774da1c2781413fd7b6dcd2c56bb8056" +uuid = "a2964d1f-97da-50d4-b82a-358c7fce9d89" +version = "1.17.0+4" + +[[Wayland_protocols_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Wayland_jll"] +git-tree-sha1 = "2839f1c1296940218e35df0bbb220f2a79686670" +uuid = "2381bf8a-dfd0-557d-9999-79630e7b1b91" +version = "1.18.0+4" + [[WoodburyMatrices]] deps = ["LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "28ffe06d28b1ba8fdb2f36ec7bb079fac81bac0d" +git-tree-sha1 = "59e2ad8fd1591ea019a5259bd012d7aee15f995c" uuid = "efce3f68-66dc-5838-9240-27a6d6f5f9b6" -version = "0.5.2" +version = "0.5.3" + +[[XML2_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "Zlib_jll"] +git-tree-sha1 = "be0db24f70aae7e2b89f2f3092e93b8606d659a6" +uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a" +version = "2.9.10+3" + +[[XSLT_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgcrypt_jll", "Pkg", "XML2_jll"] +git-tree-sha1 = "2b3eac39df218762d2d005702d601cd44c997497" +uuid = "aed1982a-8fda-507f-9586-7b0439959a61" +version = "1.1.33+4" + +[[Xorg_libX11_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxcb_jll", "Xorg_xtrans_jll"] +git-tree-sha1 = "5be649d550f3f4b95308bf0183b82e2582876527" +uuid = "4f6342f7-b3d2-589e-9d20-edeb45f2b2bc" +version = "1.6.9+4" + +[[Xorg_libXau_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "4e490d5c960c314f33885790ed410ff3a94ce67e" +uuid = "0c0b7dd1-d40b-584c-a123-a41640f87eec" +version = "1.0.9+4" + +[[Xorg_libXcursor_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXfixes_jll", "Xorg_libXrender_jll"] +git-tree-sha1 = "12e0eb3bc634fa2080c1c37fccf56f7c22989afd" +uuid = "935fb764-8cf2-53bf-bb30-45bb1f8bf724" +version = "1.2.0+4" + +[[Xorg_libXdmcp_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "4fe47bd2247248125c428978740e18a681372dd4" +uuid = "a3789734-cfe1-5b06-b2d0-1dd0d9d62d05" +version = "1.1.3+4" + +[[Xorg_libXext_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"] +git-tree-sha1 = "b7c0aa8c376b31e4852b360222848637f481f8c3" +uuid = "1082639a-0dae-5f34-9b06-72781eeb8cb3" +version = "1.3.4+4" + +[[Xorg_libXfixes_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"] +git-tree-sha1 = "0e0dc7431e7a0587559f9294aeec269471c991a4" +uuid = "d091e8ba-531a-589c-9de9-94069b037ed8" +version = "5.0.3+4" + +[[Xorg_libXi_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll", "Xorg_libXfixes_jll"] +git-tree-sha1 = "89b52bc2160aadc84d707093930ef0bffa641246" +uuid = "a51aa0fd-4e3c-5386-b890-e753decda492" +version = "1.7.10+4" + +[[Xorg_libXinerama_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll"] +git-tree-sha1 = "26be8b1c342929259317d8b9f7b53bf2bb73b123" +uuid = "d1454406-59df-5ea1-beac-c340f2130bc3" +version = "1.1.4+4" + +[[Xorg_libXrandr_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll"] +git-tree-sha1 = "34cea83cb726fb58f325887bf0612c6b3fb17631" +uuid = "ec84b674-ba8e-5d96-8ba1-2a689ba10484" +version = "1.5.2+4" + +[[Xorg_libXrender_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"] +git-tree-sha1 = "19560f30fd49f4d4efbe7002a1037f8c43d43b96" +uuid = "ea2f1a96-1ddc-540d-b46f-429655e07cfa" +version = "0.9.10+4" + +[[Xorg_libpthread_stubs_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "6783737e45d3c59a4a4c4091f5f88cdcf0908cbb" +uuid = "14d82f49-176c-5ed1-bb49-ad3f5cbd8c74" +version = "0.1.0+3" + +[[Xorg_libxcb_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "XSLT_jll", "Xorg_libXau_jll", "Xorg_libXdmcp_jll", "Xorg_libpthread_stubs_jll"] +git-tree-sha1 = "daf17f441228e7a3833846cd048892861cff16d6" +uuid = "c7cfdc94-dc32-55de-ac96-5a1b8d977c5b" +version = "1.13.0+3" + +[[Xorg_libxkbfile_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"] +git-tree-sha1 = "926af861744212db0eb001d9e40b5d16292080b2" +uuid = "cc61e674-0454-545c-8b26-ed2c68acab7a" +version = "1.1.0+4" + +[[Xorg_xcb_util_image_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"] +git-tree-sha1 = "0fab0a40349ba1cba2c1da699243396ff8e94b97" +uuid = "12413925-8142-5f55-bb0e-6d7ca50bb09b" +version = "0.4.0+1" + +[[Xorg_xcb_util_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxcb_jll"] +git-tree-sha1 = "e7fd7b2881fa2eaa72717420894d3938177862d1" +uuid = "2def613f-5ad1-5310-b15b-b15d46f528f5" +version = "0.4.0+1" + +[[Xorg_xcb_util_keysyms_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"] +git-tree-sha1 = "d1151e2c45a544f32441a567d1690e701ec89b00" +uuid = "975044d2-76e6-5fbe-bf08-97ce7c6574c7" +version = "0.4.0+1" + +[[Xorg_xcb_util_renderutil_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"] +git-tree-sha1 = "dfd7a8f38d4613b6a575253b3174dd991ca6183e" +uuid = "0d47668e-0667-5a69-a72c-f761630bfb7e" +version = "0.3.9+1" + +[[Xorg_xcb_util_wm_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"] +git-tree-sha1 = "e78d10aab01a4a154142c5006ed44fd9e8e31b67" +uuid = "c22f9ab0-d5fe-5066-847c-f4bb1cd4e361" +version = "0.4.1+1" + +[[Xorg_xkbcomp_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxkbfile_jll"] +git-tree-sha1 = "4bcbf660f6c2e714f87e960a171b119d06ee163b" +uuid = "35661453-b289-5fab-8a00-3d9160c6a3a4" +version = "1.4.2+4" + +[[Xorg_xkeyboard_config_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xkbcomp_jll"] +git-tree-sha1 = "5c8424f8a67c3f2209646d4425f3d415fee5931d" +uuid = "33bec58e-1273-512f-9401-5d533626f822" +version = "2.27.0+4" + +[[Xorg_xtrans_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "79c31e7844f6ecf779705fbc12146eb190b7d845" +uuid = "c5fb5394-a638-5e4d-96e5-b29de1b5cf10" +version = "1.4.0+3" [[ZipFile]] deps = ["Libdl", "Printf", "Zlib_jll"] -git-tree-sha1 = "8748302cfdec02c4ae9c97b112cf10003f7f767f" +git-tree-sha1 = "c3a5637e27e914a7a445b8d0ad063d701931e9f7" uuid = "a5390f91-8eb1-5f08-bee0-b1d1ffed6cea" -version = "0.9.1" +version = "0.9.3" [[Zlib_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "2f6c3e15e20e036ee0a0965879b31442b7ec50fa" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "320228915c8debb12cb434c59057290f0834dbf6" uuid = "83775a58-1f1d-513f-b197-d71354ab007a" -version = "1.2.11+9" +version = "1.2.11+18" [[Zstd_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "aa97e3e240e86010da61254b0045b7175ead0659" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "6f1abcb0c44f184690912aa4b0ba861dd64f11b9" uuid = "3161d3a3-bdf6-5164-811a-617609db77b4" -version = "1.4.4+0" +version = "1.4.5+2" [[Zygote]] -deps = ["AbstractFFTs", "ArrayLayouts", "DiffRules", "FillArrays", "ForwardDiff", "IRTools", "InteractiveUtils", "LinearAlgebra", "MacroTools", "NNlib", "NaNMath", "Random", "Requires", "SpecialFunctions", "Statistics", "ZygoteRules"] -git-tree-sha1 = "014e1f208bd5b43e26448ca31d971053f58bc20a" +deps = ["AbstractFFTs", "ChainRules", "DiffRules", "Distributed", "FillArrays", "ForwardDiff", "IRTools", "InteractiveUtils", "LinearAlgebra", "MacroTools", "NaNMath", "Random", "Requires", "SpecialFunctions", "Statistics", "ZygoteRules"] +git-tree-sha1 = "52032f3eb3bf383df34f5455c031457632e8c6d4" uuid = "e88e6eb3-aa80-5325-afca-941959d7151f" -version = "0.4.15" +version = "0.6.1" [[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" [[libass_jll]] -deps = ["Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "Libdl", "Pkg", "Zlib_jll"] -git-tree-sha1 = "d0259e0624e08ae9ebae16c80257caabc25f2048" +deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] +git-tree-sha1 = "acc685bcf777b2202a904cdcb49ad34c2fa1880c" uuid = "0ac62f75-1d6f-5e53-bd7c-93b484bb37c0" -version = "0.14.0+1" +version = "0.14.0+4" [[libfdk_aac_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "0e4ace600c20714a8dd67700c4502714d8473e8e" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "7a5780a0d9c6864184b3a2eeeb833a0c871f00ab" uuid = "f638f0a6-7fb0-5443-88ba-1cc74229b280" -version = "0.1.6+1" +version = "0.1.6+4" [[libpng_jll]] -deps = ["Libdl", "Pkg", "Zlib_jll"] -git-tree-sha1 = "594cb058723c13941cf463fd09e5859499594f50" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] +git-tree-sha1 = "6abbc424248097d69c0c87ba50fcb0753f93e0ee" uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" -version = "1.6.37+3" +version = "1.6.37+6" [[libvorbis_jll]] -deps = ["Libdl", "Ogg_jll", "Pkg"] -git-tree-sha1 = "71e54fb89ac3e0344c7185d1876fd96b0f246952" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Ogg_jll", "Pkg"] +git-tree-sha1 = "fa14ac25af7a4b8a7f61b287a124df7aab601bcd" uuid = "f27f6e37-5d2b-51aa-960f-b287f2bc3b7a" -version = "1.3.6+2" +version = "1.3.6+6" -[[x264_jll]] +[[nghttp2_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "23664c0757c3740050ca0e22944c786c165ca25a" +git-tree-sha1 = "8e2c44ab4d49ad9518f359ed8b62f83ba8beede4" +uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" +version = "1.40.0+2" + +[[p7zip_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "ee65cfa19bea645698a0224bfa216f2b1c8b559f" +uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" +version = "16.2.0+3" + +[[x264_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "d713c1ce4deac133e3334ee12f4adff07f81778f" uuid = "1270edf5-f2f9-52d2-97e9-ab00b5d0237a" -version = "2019.5.25+1" +version = "2020.7.14+2" [[x265_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "9345e417084421a8e91373d6196bc58e660eed2a" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "487da2f8f2f0c8ee0e83f39d13037d6bbf0a45ab" uuid = "dfaa095f-4041-5dcd-9319-2fabd8486b76" -version = "3.0.0+0" +version = "3.0.0+3" + +[[xkbcommon_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Wayland_jll", "Wayland_protocols_jll", "Xorg_libxcb_jll", "Xorg_xkeyboard_config_jll"] +git-tree-sha1 = "ece2350174195bb31de1a63bea3a41ae1aa593b6" +uuid = "d8fb68d0-12a3-5cfd-a85a-d49703b185fd" +version = "0.9.1+5" diff --git a/vision/vae_mnist/Project.toml b/vision/vae_mnist/Project.toml index 2f7a6f20b..5ee788931 100644 --- a/vision/vae_mnist/Project.toml +++ b/vision/vae_mnist/Project.toml @@ -1,6 +1,6 @@ [deps] BSON = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0" -CUDAapi = "3895d2a7-ec45-59b8-82bb-cfc6a382f9b3" +CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" DrWatson = "634d3b9d-ee7a-5ddf-bec9-22491ea816e1" Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c" ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19" diff --git a/vision/vae_mnist/vae_mnist.jl b/vision/vae_mnist/vae_mnist.jl index 0f9f297a4..b3c72cfc2 100644 --- a/vision/vae_mnist/vae_mnist.jl +++ b/vision/vae_mnist/vae_mnist.jl @@ -6,10 +6,11 @@ using Base.Iterators: partition using BSON -using CUDAapi: has_cuda_gpu +using CUDA using DrWatson: struct2dict using Flux using Flux: logitbinarycrossentropy, chunk +using Flux.Losses: logitbinarycrossentropy using Flux.Data: DataLoader using Images using Logging: with_logger @@ -59,7 +60,7 @@ function model_loss(encoder, decoder, λ, x, device) # KL-divergence kl_q_p = 0.5f0 * sum(@. (exp(2f0 * logσ) + μ^2 -1f0 - 2f0 * logσ)) / len - logp_x_z = -sum(logitbinarycrossentropy.(decoder_z, x)) / len + logp_x_z = -sum(logitbinarycrossentropy(decoder_z, x)) / len # regularization reg = λ * sum(x->sum(x.^2), Flux.params(decoder)) @@ -93,7 +94,7 @@ function train(; kws...) args.seed > 0 && Random.seed!(args.seed) # GPU config - if args.cuda && has_cuda_gpu() + if args.cuda && CUDA.has_cuda() device = gpu @info "Training on GPU" else diff --git a/vision/vae_mnist/vae_plot.jl b/vision/vae_mnist/vae_plot.jl index f629246df..8550158ce 100644 --- a/vision/vae_mnist/vae_plot.jl +++ b/vision/vae_mnist/vae_plot.jl @@ -5,7 +5,7 @@ using Plots function plot_result() BSON.@load "output/model.bson" encoder decoder args args = Args(; args...) - device = args.cuda && has_cuda_gpu() ? gpu : cpu + device = args.cuda && CUDA.has_cuda() ? gpu : cpu encoder, decoder = encoder |> device, decoder |> device # load MNIST images loader = get_data(args.batch_size) From 024f30151f71202b8aefc81cc9a27cca7ca11aed Mon Sep 17 00:00:00 2001 From: Joost Date: Sun, 17 Jan 2021 13:34:56 +0100 Subject: [PATCH 2/5] vae_mnist: move encoder to cpu before saving --- vision/vae_mnist/vae_mnist.jl | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/vision/vae_mnist/vae_mnist.jl b/vision/vae_mnist/vae_mnist.jl index b3c72cfc2..4d0f42d26 100644 --- a/vision/vae_mnist/vae_mnist.jl +++ b/vision/vae_mnist/vae_mnist.jl @@ -9,7 +9,7 @@ using BSON using CUDA using DrWatson: struct2dict using Flux -using Flux: logitbinarycrossentropy, chunk +using Flux: @functor, chunk using Flux.Losses: logitbinarycrossentropy using Flux.Data: DataLoader using Images @@ -31,22 +31,24 @@ struct Encoder linear μ logσ - Encoder(input_dim, latent_dim, hidden_dim, device) = new( - Dense(input_dim, hidden_dim, tanh) |> device, # linear - Dense(hidden_dim, latent_dim) |> device, # μ - Dense(hidden_dim, latent_dim) |> device, # logσ - ) end +@functor Encoder + +Encoder(input_dim::Int, latent_dim::Int, hidden_dim::Int) = Encoder( + Dense(input_dim, hidden_dim, tanh), # linear + Dense(hidden_dim, latent_dim), # μ + Dense(hidden_dim, latent_dim), # logσ +) function (encoder::Encoder)(x) h = encoder.linear(x) encoder.μ(h), encoder.logσ(h) end -Decoder(input_dim, latent_dim, hidden_dim, device) = Chain( +Decoder(input_dim::Int, latent_dim::Int, hidden_dim::Int) = Chain( Dense(latent_dim, hidden_dim, tanh), Dense(hidden_dim, input_dim) -) |> device +) function reconstuct(encoder, decoder, x, device) μ, logσ = encoder(x) @@ -106,8 +108,8 @@ function train(; kws...) loader = get_data(args.batch_size) # initialize encoder and decoder - encoder = Encoder(args.input_dim, args.latent_dim, args.hidden_dim, device) - decoder = Decoder(args.input_dim, args.latent_dim, args.hidden_dim, device) + encoder = Encoder(args.input_dim, args.latent_dim, args.hidden_dim) |> device + decoder = Decoder(args.input_dim, args.latent_dim, args.hidden_dim) |> device # ADAM optimizer opt = ADAM(args.η) From 1c59f3811e614ffbb2adcf461026ab7c19c76a37 Mon Sep 17 00:00:00 2001 From: Joost <77570808+joost-ve@users.noreply.github.com> Date: Sun, 17 Jan 2021 18:30:09 +0100 Subject: [PATCH 3/5] Remove unused partition import --- vision/vae_mnist/vae_mnist.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/vision/vae_mnist/vae_mnist.jl b/vision/vae_mnist/vae_mnist.jl index 4d0f42d26..ccd013103 100644 --- a/vision/vae_mnist/vae_mnist.jl +++ b/vision/vae_mnist/vae_mnist.jl @@ -4,7 +4,6 @@ # Diederik P Kingma, Max Welling # https://arxiv.org/abs/1312.6114 -using Base.Iterators: partition using BSON using CUDA using DrWatson: struct2dict From b8decbcf203fefb228392ed82c4c0842c32e64a1 Mon Sep 17 00:00:00 2001 From: Joost Date: Tue, 19 Jan 2021 11:19:20 +0100 Subject: [PATCH 4/5] vae_mnist: fix gray output images --- vision/vae_mnist/vae_mnist.jl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vision/vae_mnist/vae_mnist.jl b/vision/vae_mnist/vae_mnist.jl index 4d0f42d26..5490fdac5 100644 --- a/vision/vae_mnist/vae_mnist.jl +++ b/vision/vae_mnist/vae_mnist.jl @@ -62,7 +62,7 @@ function model_loss(encoder, decoder, λ, x, device) # KL-divergence kl_q_p = 0.5f0 * sum(@. (exp(2f0 * logσ) + μ^2 -1f0 - 2f0 * logσ)) / len - logp_x_z = -sum(logitbinarycrossentropy(decoder_z, x)) / len + logp_x_z = -logitbinarycrossentropy(decoder_z, x, agg=sum) / len # regularization reg = λ * sum(x->sum(x.^2), Flux.params(decoder)) @@ -70,7 +70,7 @@ function model_loss(encoder, decoder, λ, x, device) end function convert_to_image(x, y_size) - Gray.(permutedims(vcat(reshape.(chunk(sigmoid.(x |> cpu), y_size), 28, :)...), (2, 1))) + Gray.(permutedims(vcat(reshape.(chunk(x |> cpu, y_size), 28, :)...), (2, 1))) end # arguments for the `train` function @@ -158,6 +158,7 @@ function train(; kws...) end # save image _, _, rec_original = reconstuct(encoder, decoder, original, device) + rec_original = sigmoid.(rec_original) image = convert_to_image(rec_original, args.sample_size) image_path = joinpath(args.save_path, "epoch_$(epoch).png") save(image_path, image) From 23ddc94d623c58aa66f5e3e66bed831b548c7cfb Mon Sep 17 00:00:00 2001 From: Joost Date: Tue, 19 Jan 2021 11:19:34 +0100 Subject: [PATCH 5/5] vae_mnist: add compat bounds --- vision/vae_mnist/Manifest.toml | 18 +++++++++--------- vision/vae_mnist/Project.toml | 5 +++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/vision/vae_mnist/Manifest.toml b/vision/vae_mnist/Manifest.toml index dd0578726..18f7e79a9 100644 --- a/vision/vae_mnist/Manifest.toml +++ b/vision/vae_mnist/Manifest.toml @@ -108,9 +108,9 @@ version = "1.16.0+6" [[CatIndices]] deps = ["CustomUnitRanges", "OffsetArrays"] -git-tree-sha1 = "0c91e4fcda51bbd881c5d49ef784460750abcac0" +git-tree-sha1 = "a0f80a09780eed9b1d106a1bf62041c2efc995bc" uuid = "aafaddc9-749c-510e-ac4f-586e18779b91" -version = "0.2.1" +version = "0.2.2" [[ChainRules]] deps = ["ChainRulesCore", "Compat", "LinearAlgebra", "Random", "Reexport", "Requires", "Statistics"] @@ -190,9 +190,9 @@ uuid = "150eb455-5306-5404-9cee-2592286d6298" version = "0.6.1" [[CustomUnitRanges]] -git-tree-sha1 = "0d42a23be3acfb3c58569b28ed3ab8bd67af5ced" +git-tree-sha1 = "537c988076d001469093945f3bd0b300b8d3a7f3" uuid = "dc8bdbbb-1ca9-579f-8c36-e416f6a65cce" -version = "1.0.0" +version = "1.0.1" [[DataAPI]] git-tree-sha1 = "ad84f52c0b8f05aa20839484dbaf01690b41ff84" @@ -555,10 +555,10 @@ uuid = "83e8ac13-25f8-5344-8a64-a9f2b223428f" version = "0.5.0" [[IntelOpenMP_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "fb8e1c7a5594ba56f9011310790e03b5384998d6" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "d979e54b71da82f3a65b62553da4fc3d18c9004c" uuid = "1d5cc7b8-4909-519e-a0f8-d0f5ad9712d0" -version = "2018.0.3+0" +version = "2018.0.3+2" [[InteractiveUtils]] deps = ["Markdown"] @@ -815,9 +815,9 @@ version = "1.0.0" [[OffsetArrays]] deps = ["Adapt"] -git-tree-sha1 = "5b644e46f71e744fac0775b885809fd82c4ca904" +git-tree-sha1 = "6247fe4b373b354b9b7fc155ae9c137267c9a07f" uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "1.5.0" +version = "1.5.1" [[Ogg_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] diff --git a/vision/vae_mnist/Project.toml b/vision/vae_mnist/Project.toml index 5ee788931..6fb598e01 100644 --- a/vision/vae_mnist/Project.toml +++ b/vision/vae_mnist/Project.toml @@ -11,3 +11,8 @@ Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a" Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca" TensorBoardLogger = "899adc3e-224a-11e9-021f-63837185c80f" + +[compat] +CUDA = "2.4.0" +Flux = "0.11.4" +julia = "1.5"