From b9cdc2ba4148a49e86a681fc4dbc71211c2e2a15 Mon Sep 17 00:00:00 2001 From: Joost Date: Sun, 17 Jan 2021 15:04:00 +0100 Subject: [PATCH 1/6] dcgan_mnist: fix mising latent_dim in generator constructor --- vision/dcgan_mnist/dcgan_mnist.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vision/dcgan_mnist/dcgan_mnist.jl b/vision/dcgan_mnist/dcgan_mnist.jl index 1d66eeca3..9a917a74a 100644 --- a/vision/dcgan_mnist/dcgan_mnist.jl +++ b/vision/dcgan_mnist/dcgan_mnist.jl @@ -41,9 +41,9 @@ function Discriminator() Dense(7 * 7 * 128, 1)) end -function Generator() +function Generator(latent_dim::Int) return Chain( - Dense(hparams.latent_dim, 7 * 7 * 256), + Dense(latent_dim, 7 * 7 * 256), BatchNorm(7 * 7 * 256, relu), x->reshape(x, 7, 7, 256, :), ConvTranspose((5, 5), 256 => 128; stride = 1, pad = 2), @@ -105,7 +105,7 @@ function train(; kws...) dscr = Discriminator() |> gpu # Generator - gen = Generator() |> gpu + gen = Generator(hparams.latent_dim) |> gpu # Optimizers opt_dscr = ADAM(hparams.lr_dscr) From 126ceb74520714b79ac2b0040d7be1e767196d4b Mon Sep 17 00:00:00 2001 From: Joost Date: Sun, 17 Jan 2021 15:03:23 +0100 Subject: [PATCH 2/6] dcgan_mnist: fix deprecated logitcrossentropy --- vision/dcgan_mnist/dcgan_mnist.jl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vision/dcgan_mnist/dcgan_mnist.jl b/vision/dcgan_mnist/dcgan_mnist.jl index 9a917a74a..2e994aec4 100644 --- a/vision/dcgan_mnist/dcgan_mnist.jl +++ b/vision/dcgan_mnist/dcgan_mnist.jl @@ -1,7 +1,7 @@ using Base.Iterators: partition using Flux using Flux.Optimise: update! -using Flux: logitbinarycrossentropy +using Flux.Losses: logitbinarycrossentropy using Images using MLDatasets using Statistics @@ -56,12 +56,12 @@ end # Loss functions function discriminator_loss(real_output, fake_output) - real_loss = mean(logitbinarycrossentropy.(real_output, 1f0)) - fake_loss = mean(logitbinarycrossentropy.(fake_output, 0f0)) + real_loss = mean(logitbinarycrossentropy(real_output, 1f0)) + fake_loss = mean(logitbinarycrossentropy(fake_output, 0f0)) return real_loss + fake_loss end -generator_loss(fake_output) = mean(logitbinarycrossentropy.(fake_output, 1f0)) +generator_loss(fake_output) = mean(logitbinarycrossentropy(fake_output, 1f0)) function train_discriminator!(gen, dscr, x, opt_dscr, hparams) noise = randn!(similar(x, (hparams.latent_dim, hparams.batch_size))) From d80a88fdcd5b898b970084862ab2655593d85d05 Mon Sep 17 00:00:00 2001 From: Joost Date: Mon, 18 Jan 2021 19:04:27 +0100 Subject: [PATCH 3/6] small fixes --- vision/dcgan_mnist/dcgan_mnist.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vision/dcgan_mnist/dcgan_mnist.jl b/vision/dcgan_mnist/dcgan_mnist.jl index 2e994aec4..fcbdab9ec 100644 --- a/vision/dcgan_mnist/dcgan_mnist.jl +++ b/vision/dcgan_mnist/dcgan_mnist.jl @@ -56,12 +56,12 @@ end # Loss functions function discriminator_loss(real_output, fake_output) - real_loss = mean(logitbinarycrossentropy(real_output, 1f0)) - fake_loss = mean(logitbinarycrossentropy(fake_output, 0f0)) + real_loss = logitbinarycrossentropy(real_output, 1) + fake_loss = logitbinarycrossentropy(fake_output, 0) return real_loss + fake_loss end -generator_loss(fake_output) = mean(logitbinarycrossentropy(fake_output, 1f0)) +generator_loss(fake_output) = logitbinarycrossentropy(fake_output, 1) function train_discriminator!(gen, dscr, x, opt_dscr, hparams) noise = randn!(similar(x, (hparams.latent_dim, hparams.batch_size))) From cc9fc9d84e97a26bb7f143c34e60bd9bd7c9b919 Mon Sep 17 00:00:00 2001 From: Joost Date: Mon, 18 Jan 2021 19:20:06 +0100 Subject: [PATCH 4/6] Workaround for 'symbol "__nv_tanhf" not found' error --- vision/dcgan_mnist/dcgan_mnist.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vision/dcgan_mnist/dcgan_mnist.jl b/vision/dcgan_mnist/dcgan_mnist.jl index fcbdab9ec..8d6c1155a 100644 --- a/vision/dcgan_mnist/dcgan_mnist.jl +++ b/vision/dcgan_mnist/dcgan_mnist.jl @@ -50,7 +50,8 @@ function Generator(latent_dim::Int) BatchNorm(128, relu), ConvTranspose((4, 4), 128 => 64; stride = 2, pad = 1), BatchNorm(64, relu), - ConvTranspose((4, 4), 64 => 1, tanh; stride = 2, pad = 1), + ConvTranspose((4, 4), 64 => 1; stride = 2, pad = 1), + x -> tanh.(x) ) end From ca9704e09182d03fdd7dae4376dd8d7c63d0cf9b Mon Sep 17 00:00:00 2001 From: Joost Date: Mon, 18 Jan 2021 19:21:46 +0100 Subject: [PATCH 5/6] Update deps --- vision/dcgan_mnist/Manifest.toml | 555 +++++++++++++++++-------------- 1 file changed, 302 insertions(+), 253 deletions(-) diff --git a/vision/dcgan_mnist/Manifest.toml b/vision/dcgan_mnist/Manifest.toml index 239369a67..056d1a6c7 100644 --- a/vision/dcgan_mnist/Manifest.toml +++ b/vision/dcgan_mnist/Manifest.toml @@ -14,15 +14,15 @@ 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"] @@ -36,26 +36,38 @@ git-tree-sha1 = "f31f50712cbdf40ee8287f0443b57503e34122ef" uuid = "39de3d68-74b9-583c-8d2d-e117c070f3a9" version = "0.4.3" +[[BFloat16s]] +deps = ["LinearAlgebra", "Test"] +git-tree-sha1 = "4af69e205efc343068dc8722b8dfec1ade89254a" +uuid = "ab4f0b2a-ad5b-11e8-123f-65d77653426b" +version = "0.1.0" + [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" [[BinDeps]] deps = ["Libdl", "Pkg", "SHA", "URIParser", "Unicode"] -git-tree-sha1 = "46cf2c1668ad07aba5a9d331bdeea994a1f13856" +git-tree-sha1 = "1289b57e8cf019aede076edab0587eb9644175bd" uuid = "9e28174c-4ba2-5203-b857-d8d62c4213ee" -version = "1.0.1" +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"] @@ -64,51 +76,33 @@ uuid = "e1450e63-4bb3-523b-b2a4-4ffa8c0fd77d" version = "1.0.0" [[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" - -[[CUDAapi]] -deps = ["Libdl", "Logging"] -git-tree-sha1 = "831b825d10104bd29e28f6da93312a976830717b" -uuid = "3895d2a7-ec45-59b8-82bb-cfc6a382f9b3" -version = "4.0.0" - -[[CUDAdrv]] -deps = ["CEnum", "CUDAapi", "Printf"] -git-tree-sha1 = "17248da4169c0cdd1699da542f8e110fe4168af6" -uuid = "c5f51814-7f29-56b8-a69c-e4d8f6be1fde" -version = "6.2.3" +version = "0.4.1" -[[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" +[[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" [[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"] +git-tree-sha1 = "0af5c12e5528fc2df87a5f084195f10bfbf03a28" +uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2" +version = "0.7.48" -[[CodeTracking]] -deps = ["InteractiveUtils", "UUIDs"] -git-tree-sha1 = "c8f94de86731698373f3c82a8aa40d8ab765c50c" -uuid = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2" -version = "0.5.9" +[[ChainRulesCore]] +deps = ["Compat", "LinearAlgebra", "SparseArrays"] +git-tree-sha1 = "89a0b14325d0f02f9caed7c8ba91181a5d254874" +uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" +version = "0.9.26" [[CodecZlib]] deps = ["TranscodingStreams", "Zlib_jll"] @@ -118,39 +112,39 @@ version = "0.7.0" [[ColorTypes]] deps = ["FixedPointNumbers", "Random"] -git-tree-sha1 = "f746d4fc892fdf683b5c22064c8e99b2f5b990e7" +git-tree-sha1 = "4bffea7ed1a9f0f3d1a131bbcd4b925548d75288" uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" -version = "0.10.2" +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" @@ -158,44 +152,32 @@ uuid = "ed09eef8-17a6-5b46-8889-db040fac31e3" version = "0.3.2" [[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 = "ad04351946e2ee59a0f1295de28a750dc4917704" -uuid = "3a865a2d-5b23-5a0f-bc46-62713ec82fae" -version = "2.1.0" +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 = "00612b2fbe534a539dc7f70106c71e3a943d9b98" +git-tree-sha1 = "ad84f52c0b8f05aa20839484dbaf01690b41ff84" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.2.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 = "9faa13be79557bf4c5713fb912b0e3c5aa33d046" +deps = ["Compat", "InteractiveUtils", "OrderedCollections"] +git-tree-sha1 = "fb0aa371da91c1ff9dc7fbed6122d3e411420b9c" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.17.13" +version = "0.18.8" [[Dates]] deps = ["Printf"] @@ -207,35 +189,35 @@ 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" [[EllipsisNotation]] -git-tree-sha1 = "65dad386e877850e6fce4fc77f60fe75a468ce9d" +git-tree-sha1 = "18ee049accec8763be17a933737c1dd0fdf8673a" uuid = "da5c29d0-fa7d-589e-88eb-ea29b0a81949" -version = "0.4.0" +version = "1.0.0" [[ExprTools]] -git-tree-sha1 = "6f0517056812fd6aa3af23d4b70d5325a2ae4e95" +git-tree-sha1 = "10407a39b87f29d47ebaca8edbc75d7c302ff93e" uuid = "e2ba6199-217a-4e67-a87a-7c52f15ade04" -version = "0.1.1" +version = "0.1.3" [[FFTViews]] deps = ["CustomUnitRanges", "FFTW"] @@ -245,50 +227,63 @@ 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" [[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" + +[[Functors]] +deps = ["MacroTools"] +git-tree-sha1 = "f40adc6422f548176bb4351ebd29e4abf773040a" +uuid = "d9f16b24-f501-4c13-a1f2-28368ffc5196" +version = "0.1.0" [[GPUArrays]] deps = ["AbstractFFTs", "Adapt", "LinearAlgebra", "Printf", "Random", "Serialization"] -git-tree-sha1 = "c63cb01e3b6f48ab39f1e35c31ba870650814a18" +git-tree-sha1 = "f99a25fe0313121f2f9627002734c7d63b4dd3bd" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "3.2.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" [[GZip]] deps = ["Libdl"] @@ -303,28 +298,28 @@ uuid = "a2bd30eb-e257-5431-a919-1863eab51364" version = "1.0.2" [[HDF5]] -deps = ["Blosc", "HDF5_jll", "Libdl", "Mmap", "Random"] -git-tree-sha1 = "cf80ef0b7333e03d78ab6516b56f31f4f7ffa4ae" +deps = ["Blosc", "Compat", "HDF5_jll", "Libdl", "Mmap", "Random", "Requires"] +git-tree-sha1 = "8be8b31df938483ba2ab27f38a8bc91a9e43ae92" uuid = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f" -version = "0.13.1" +version = "0.14.3" [[HDF5_jll]] -deps = ["Libdl", "Pkg", "Zlib_jll"] -git-tree-sha1 = "85bd2e586a10ae0eab856125bf5245e0d36384a7" +deps = ["Artifacts", "JLLWrappers", "LibCURL_jll", "Libdl", "OpenSSL_jll", "Pkg", "Zlib_jll"] +git-tree-sha1 = "fd83fa0bde42e01952757f01149dd968c06c4dba" uuid = "0234f1f7-429e-5d53-9886-15a909be8d59" -version = "1.10.5+5" +version = "1.12.0+1" [[HTTP]] deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"] -git-tree-sha1 = "fe31f4ff144392ad8176f5c7c03cca6ba320271c" +git-tree-sha1 = "c7ec02c4c6a039a98a15f955462cd7aea5df4508" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "0.8.14" +version = "0.8.19" [[IRTools]] deps = ["InteractiveUtils", "MacroTools", "Test"] -git-tree-sha1 = "8845400bd2d9815d37720251f1b53d27a335e1f4" +git-tree-sha1 = "c67e7515a11f726f44083e74f218d134396d6510" uuid = "7869d1d1-7146-5819-86e3-90919afe41df" -version = "0.3.2" +version = "0.4.2" [[IdentityRanges]] deps = ["OffsetArrays"] @@ -333,64 +328,64 @@ 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 = "a652c05f8f374861580d420b420fddf3e2e84312" +deps = ["AbstractFFTs", "Colors", "FixedPointNumbers", "Graphics", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "Reexport"] +git-tree-sha1 = "79badd979fbee9b8980cd995cd5a86a9e93b8ad7" uuid = "a09fc81d-aa75-5fe9-8630-4744c3626534" -version = "0.8.14" +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" [[ImageMagick]] deps = ["FileIO", "ImageCore", "ImageMagick_jll", "InteractiveUtils", "Libdl", "Pkg", "Random"] -git-tree-sha1 = "318342a5099a9c952b4de087344a2db831458c87" +git-tree-sha1 = "02558f83932fde6ebd3ab007dbff6bd8740a8247" uuid = "6218d12a-5da1-5696-b52f-db25d2ecc6d1" -version = "1.1.5" +version = "1.1.6" [[ImageMagick_jll]] deps = ["JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pkg", "Zlib_jll", "libpng_jll"] -git-tree-sha1 = "bc2688a87220151dc4e9b43aadfb8a5dc29bc808" +git-tree-sha1 = "1c0a2295cca535fabaf2029062912591e9b61987" uuid = "c73af94c-d91f-53ed-93a7-00f77d67a9d7" -version = "6.9.10-12+2" +version = "6.9.10-12+3" [[ImageMetadata]] deps = ["AxisArrays", "ColorVectorSpace", "ImageAxes", "ImageCore", "IndirectArrays"] -git-tree-sha1 = "5c2c78dc11343d83320e790379e0f58de3aa1b7e" +git-tree-sha1 = "ff77c7f234e7d8a618958fcf23b6959f2cbef2c6" uuid = "bc367c6b-8a6b-528e-b4bd-a4b897500b49" -version = "0.9.1" +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"] @@ -399,16 +394,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 = "bc7ecabe5ef4d64fea25660bc5aa514a603e4468" +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.2" +version = "0.23.3" [[IndirectArrays]] git-tree-sha1 = "c2a145a145dc03a7620af1444e0264ef907bd44f" @@ -422,10 +417,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"] @@ -433,50 +428,68 @@ 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 = "2daa370870d2a4d198642277d050aa7d34a7cad2" +git-tree-sha1 = "93a6d78525feb0d3ee2a2ae83a7d04db1db5663f" uuid = "8197267c-284f-5f27-9208-e0e47529a953" -version = "0.5.0" +version = "0.5.2" [[IterTools]] git-tree-sha1 = "05110a2ab1fc5f932622ffea2a003221f4782c18" uuid = "c8e1da08-722c-5040-9ed9-7db0dc04731e" version = "1.3.0" +[[JLLWrappers]] +git-tree-sha1 = "a431f5f2ca3f4feef3bd7a5e94b8b8d4f2f647a0" +uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" +version = "1.2.0" + [[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" [[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" + +[[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" + [[Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" [[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" [[LinearAlgebra]] deps = ["Libdl"] @@ -485,34 +498,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 = "6a48d291b26d295c62670d956e083926332befb3" +git-tree-sha1 = "61f049fe2f7168b8002d5794a1bb37f1f3bc92e4" uuid = "23992714-dd62-5051-b70f-ba57cb901cac" -version = "0.8.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 = "f72c38f99a7aa80c3a9b717cfa1f9c2d31e1b4c7" +git-tree-sha1 = "163a628fb306280708baff9aa383c5469267e1c1" uuid = "eb30cadb-4394-5ae3-aed4-317e484a6458" -version = "0.5.2" +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"] @@ -520,15 +540,15 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[MbedTLS]] deps = ["Dates", "MbedTLS_jll", "Random", "Sockets"] -git-tree-sha1 = "426a6978b03a97ceb7ead77775a1da066343ec6e" +git-tree-sha1 = "1c38e51c3d08ef2278062ebceade0e46cefc96fe" uuid = "739be429-bea8-5141-9913-cc70e7f3736d" -version = "1.0.2" +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" [[Media]] deps = ["MacroTools", "Test"] @@ -538,58 +558,64 @@ 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" [[OffsetArrays]] -git-tree-sha1 = "930db8ef90483570107f2396b1ffc6680f08e8b7" +deps = ["Adapt"] +git-tree-sha1 = "6247fe4b373b354b9b7fc155ae9c137267c9a07f" uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "1.0.4" +version = "1.5.1" + +[[OpenSSL_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "71bbbc616a1d710879f5a1021bcba65ffba6ce58" +uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" +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" [[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" [[PaddedViews]] deps = ["OffsetArrays"] -git-tree-sha1 = "100195a79b577d5747db98bf1732c3686285fa1e" +git-tree-sha1 = "91d229e113e8975a399e40d7c0b1ddf4da6d3c59" uuid = "5432bcbf-9aad-5242-b902-cca2824c8663" -version = "0.5.5" +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" [[Pkg]] deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] @@ -629,19 +655,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" @@ -651,9 +683,9 @@ uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" [[SimpleTraits]] deps = ["InteractiveUtils", "MacroTools"] -git-tree-sha1 = "2ee666b24ab8be6a922f9d6c11a86e1a703a7dda" +git-tree-sha1 = "daf7aec3fe3acb2131388f93a4c409b8c7f62226" uuid = "699a6c99-e7fa-54fc-8d76-47d257e15c1d" -version = "0.9.2" +version = "0.9.3" [[Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" @@ -669,16 +701,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"] @@ -686,9 +718,9 @@ 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" [[Test]] deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] @@ -696,15 +728,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 = "0cc8db57cb537191b02948d4fabdc09eb7f31f98" +git-tree-sha1 = "3318281dd4121ecf9713ce1383b9ace7d7476fdd" uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f" -version = "0.5.5" +version = "0.5.7" [[TranscodingStreams]] deps = ["Random", "Test"] @@ -722,47 +754,64 @@ version = "0.4.1" 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" [[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" [[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 = "08ee0b7796c4c9ce644b9ecc326f3e047486baeb" +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.17" +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" [[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" + +[[nghttp2_jll]] +deps = ["Libdl", "Pkg"] +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" From 3dd2b11b4f4129865b27052c5b1f3c4e6df3e4e9 Mon Sep 17 00:00:00 2001 From: Joost Date: Mon, 18 Jan 2021 19:46:22 +0100 Subject: [PATCH 6/6] Check for gpu and use device --- vision/cdcgan_mnist/Manifest.toml | 226 ++++++++++++------------------ vision/dcgan_mnist/Project.toml | 1 + vision/dcgan_mnist/dcgan_mnist.jl | 17 ++- 3 files changed, 101 insertions(+), 143 deletions(-) diff --git a/vision/cdcgan_mnist/Manifest.toml b/vision/cdcgan_mnist/Manifest.toml index cdc9a9fe5..f9b57386b 100644 --- a/vision/cdcgan_mnist/Manifest.toml +++ b/vision/cdcgan_mnist/Manifest.toml @@ -14,15 +14,9 @@ version = "0.3.3" [[Adapt]] deps = ["LinearAlgebra"] -git-tree-sha1 = "42c42f2221906892ceb765dbcb1a51deeffd86d7" +git-tree-sha1 = "345a14764e43fe927d6f5c250fe4c8e4664e6ee8" uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" -version = "2.3.0" - -[[ArrayLayouts]] -deps = ["Compat", "FillArrays", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "a577e27915fdcb3f6b96118b56655b38e3b466f2" -uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "0.4.12" +version = "2.4.0" [[Artifacts]] deps = ["Pkg"] @@ -57,6 +51,12 @@ git-tree-sha1 = "1289b57e8cf019aede076edab0587eb9644175bd" uuid = "9e28174c-4ba2-5203-b857-d8d62c4213ee" version = "1.0.2" +[[BinaryProvider]] +deps = ["Libdl", "Logging", "SHA"] +git-tree-sha1 = "ecdec412a9abc8db54c0efc5548c64dfce072058" +uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232" +version = "0.5.10" + [[Blosc]] deps = ["Blosc_jll"] git-tree-sha1 = "84cf7d0f8fd46ca6f1b3e0305b4b4a37afe50fd6" @@ -81,10 +81,10 @@ uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82" version = "0.4.1" [[CUDA]] -deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "DataStructures", "ExprTools", "GPUArrays", "GPUCompiler", "LLVM", "Libdl", "LinearAlgebra", "Logging", "MacroTools", "NNlib", "Pkg", "Printf", "Random", "Reexport", "Requires", "SparseArrays", "Statistics", "TimerOutputs"] -git-tree-sha1 = "7663b61782b569b03fba91d330a5ed2f86cd4cb8" +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.3.0" +version = "2.4.0" [[CatIndices]] deps = ["CustomUnitRanges", "OffsetArrays"] @@ -93,22 +93,16 @@ uuid = "aafaddc9-749c-510e-ac4f-586e18779b91" version = "0.2.1" [[ChainRules]] -deps = ["ChainRulesCore", "ChainRulesTestUtils", "Compat", "LinearAlgebra", "Random", "Reexport", "Requires", "Statistics"] -git-tree-sha1 = "118fad132f286ac9df765e0dda94ddba2f0fb279" +deps = ["ChainRulesCore", "Compat", "LinearAlgebra", "Random", "Reexport", "Requires", "Statistics"] +git-tree-sha1 = "0af5c12e5528fc2df87a5f084195f10bfbf03a28" uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2" -version = "0.7.33" +version = "0.7.48" [[ChainRulesCore]] -deps = ["LinearAlgebra", "MuladdMacro", "SparseArrays"] -git-tree-sha1 = "6e0e251d98bd909a227e905e2700555e33796042" +deps = ["Compat", "LinearAlgebra", "SparseArrays"] +git-tree-sha1 = "89a0b14325d0f02f9caed7c8ba91181a5d254874" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "0.9.20" - -[[ChainRulesTestUtils]] -deps = ["ChainRulesCore", "Compat", "FiniteDifferences", "LinearAlgebra", "Random", "Test"] -git-tree-sha1 = "1acd5ce374b8fe74fa01a0dfc5ca4f42b3b070bf" -uuid = "cdddcdb0-9152-4a09-a978-84456f9df70a" -version = "0.5.4" +version = "0.9.26" [[CodecZlib]] deps = ["TranscodingStreams", "Zlib_jll"] @@ -130,9 +124,9 @@ version = "0.8.7" [[Colors]] deps = ["ColorTypes", "FixedPointNumbers", "InteractiveUtils", "Reexport"] -git-tree-sha1 = "008d6bc68dea6beb6303fdc37188cb557391ebf2" +git-tree-sha1 = "ac5f2213e56ed8a34a3dd2f681f4df1166b34929" uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" -version = "0.12.4" +version = "0.12.6" [[CommonSubexpressions]] deps = ["MacroTools", "Test"] @@ -142,9 +136,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 = "a706ff10f1cd8dab94f59fd09c0e657db8e77ff0" +git-tree-sha1 = "919c7f3151e79ff196add81d7f4e45d91bbf420b" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.23.0" +version = "3.25.0" [[CompilerSupportLibraries_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -163,12 +157,6 @@ git-tree-sha1 = "6d1c23e740a586955645500bbec662476204a52c" uuid = "150eb455-5306-5404-9cee-2592286d6298" version = "0.6.1" -[[CpuId]] -deps = ["Markdown", "Test"] -git-tree-sha1 = "f0464e499ab9973b43c20f8216d088b61fda80c6" -uuid = "adafc99b-e345-5852-983c-f28acb93d879" -version = "0.2.2" - [[CustomUnitRanges]] git-tree-sha1 = "0d42a23be3acfb3c58569b28ed3ab8bd67af5ced" uuid = "dc8bdbbb-1ca9-579f-8c36-e416f6a65cce" @@ -180,10 +168,10 @@ uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" version = "1.4.0" [[DataDeps]] -deps = ["HTTP", "Reexport", "SHA"] -git-tree-sha1 = "b439b948e3113e3893de985e8c908b034ce4ecf5" +deps = ["BinaryProvider", "HTTP", "Libdl", "Reexport", "SHA", "p7zip_jll"] +git-tree-sha1 = "9f69dd052eaf292edd42d4bed999dfbd291927a0" uuid = "124859b0-ceae-595e-8997-d05f6a7a8dfe" -version = "0.7.4" +version = "0.7.6" [[DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] @@ -221,16 +209,10 @@ version = "0.10.0" deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" -[[DocStringExtensions]] -deps = ["LibGit2", "Markdown", "Pkg", "Test"] -git-tree-sha1 = "50ddf44c53698f5e784bbebb3f4b21c5807401b1" -uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.8.3" - [[EllipsisNotation]] -git-tree-sha1 = "65dad386e877850e6fce4fc77f60fe75a468ce9d" +git-tree-sha1 = "18ee049accec8763be17a933737c1dd0fdf8673a" uuid = "da5c29d0-fa7d-589e-88eb-ea29b0a81949" -version = "0.4.0" +version = "1.0.0" [[ExprTools]] git-tree-sha1 = "10407a39b87f29d47ebaca8edbc75d7c302ff93e" @@ -245,33 +227,27 @@ version = "0.3.1" [[FFTW]] deps = ["AbstractFFTs", "FFTW_jll", "IntelOpenMP_jll", "Libdl", "LinearAlgebra", "MKL_jll", "Reexport"] -git-tree-sha1 = "8b7c16b56936047ca41bf25effa137ae0b381ae8" +git-tree-sha1 = "8fda0934cb99db617171f7296dc361f4d6fa5424" uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "1.2.4" +version = "1.3.0" [[FFTW_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "f10c3009373a2d5c4349b8a2932d8accb892892d" +git-tree-sha1 = "5a0d4b6a22a34d17d53543bd124f4b08ed78e8b0" uuid = "f5851436-0d7a-5f13-b9de-f02708fd171a" -version = "3.3.9+6" +version = "3.3.9+7" [[FileIO]] deps = ["Pkg"] -git-tree-sha1 = "cad2e71389ecb2f4480e0de74faab04af13d7929" +git-tree-sha1 = "fee8955b9dfa7bec67117ef48085fb2b559b9c22" uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.4.4" +version = "1.4.5" [[FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays"] -git-tree-sha1 = "c1cf9e87a5c45f0c05dc31ae95757f706e70865a" +git-tree-sha1 = "8bd8e47ff5d34b20f0aa9641988eb660590008bc" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "0.10.1" - -[[FiniteDifferences]] -deps = ["ChainRulesCore", "LinearAlgebra", "Printf", "Random", "Richardson"] -git-tree-sha1 = "e62dc2e6c482bbbe97e79f875063285257daa142" -uuid = "26cc04aa-876d-5657-8c51-4c34ba976000" -version = "0.11.3" +version = "0.11.0" [[FixedPointNumbers]] deps = ["Statistics"] @@ -281,9 +257,9 @@ 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 = "b96dbd0954415f52279f7ef9b52c5a54ec3cf72d" +git-tree-sha1 = "f688d61b40b345aa9f0a4a41d3ca7750ad9cb1f6" uuid = "587475ba-b771-5e3f-ad9e-33799f191a9c" -version = "0.11.2" +version = "0.11.4" [[ForwardDiff]] deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"] @@ -299,9 +275,9 @@ version = "0.1.0" [[GPUArrays]] deps = ["AbstractFFTs", "Adapt", "LinearAlgebra", "Printf", "Random", "Serialization"] -git-tree-sha1 = "2c1dd57bca7ba0b3b4bf81d9332aeb81b154ef4c" +git-tree-sha1 = "f99a25fe0313121f2f9627002734c7d63b4dd3bd" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "6.1.2" +version = "6.2.0" [[GPUCompiler]] deps = ["DataStructures", "InteractiveUtils", "LLVM", "Libdl", "Scratch", "Serialization", "TimerOutputs", "UUIDs"] @@ -323,9 +299,9 @@ version = "1.0.2" [[HDF5]] deps = ["Blosc", "Compat", "HDF5_jll", "Libdl", "Mmap", "Random", "Requires"] -git-tree-sha1 = "96d77533eb46e208e801b939db8a27626c166565" +git-tree-sha1 = "8be8b31df938483ba2ab27f38a8bc91a9e43ae92" uuid = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f" -version = "0.14.1" +version = "0.14.3" [[HDF5_jll]] deps = ["Artifacts", "JLLWrappers", "LibCURL_jll", "Libdl", "OpenSSL_jll", "Pkg", "Zlib_jll"] @@ -353,9 +329,9 @@ version = "0.3.1" [[ImageAxes]] deps = ["AxisArrays", "ImageCore", "Reexport", "SimpleTraits"] -git-tree-sha1 = "5534929efb43df695d560f0e29fcdb4caf2f75e7" +git-tree-sha1 = "1592c7fd668ac9cdcef73f704ca457ccdaac2933" uuid = "2803e5a7-5153-5ecf-9a86-9b4c37f5f5ac" -version = "0.6.7" +version = "0.6.8" [[ImageContrastAdjustment]] deps = ["ColorVectorSpace", "ImageCore", "ImageTransformations", "Parameters"] @@ -365,9 +341,9 @@ version = "0.3.6" [[ImageCore]] deps = ["AbstractFFTs", "Colors", "FixedPointNumbers", "Graphics", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "Reexport"] -git-tree-sha1 = "ec29985885981ec7a8b97faa0ec86934ed813490" +git-tree-sha1 = "79badd979fbee9b8980cd995cd5a86a9e93b8ad7" uuid = "a09fc81d-aa75-5fe9-8630-4744c3626534" -version = "0.8.19" +version = "0.8.20" [[ImageDistances]] deps = ["ColorVectorSpace", "Distances", "ImageCore", "LinearAlgebra", "Statistics"] @@ -377,9 +353,9 @@ version = "0.2.9" [[ImageFiltering]] deps = ["CatIndices", "ColorVectorSpace", "ComputationalResources", "DataStructures", "FFTViews", "FFTW", "ImageCore", "ImageMetadata", "LinearAlgebra", "OffsetArrays", "Requires", "SparseArrays", "StaticArrays", "Statistics", "TiledIteration"] -git-tree-sha1 = "5cf89e8458e8e7731a3fff4fe356c52279408bd0" +git-tree-sha1 = "ac8321781d375dd0ac8571072f538866c279a216" uuid = "6a3955dd-da59-5b1f-98d4-e7296123deb5" -version = "0.6.17" +version = "0.6.18" [[ImageMagick]] deps = ["FileIO", "ImageCore", "ImageMagick_jll", "InteractiveUtils", "Libdl", "Pkg", "Random"] @@ -406,10 +382,10 @@ uuid = "787d08f9-d448-5407-9aad-5290dd7ab264" version = "0.2.9" [[ImageQualityIndexes]] -deps = ["ColorVectorSpace", "ImageCore", "ImageDistances", "ImageFiltering", "MappedArrays", "OffsetArrays", "Statistics"] -git-tree-sha1 = "7811be6a6df3414f167ba597634acbf986dca1b6" +deps = ["ColorVectorSpace", "ImageCore", "ImageDistances", "ImageFiltering", "OffsetArrays", "Statistics"] +git-tree-sha1 = "80484f9e1beae36860ed8022f195d04c751cfec6" uuid = "2996bd0c-7a13-11e9-2da2-2f5ce47296a9" -version = "0.2.0" +version = "0.2.1" [[ImageShow]] deps = ["Base64", "FileIO", "ImageCore", "Requires"] @@ -419,15 +395,15 @@ version = "0.2.3" [[ImageTransformations]] deps = ["AxisAlgorithms", "ColorVectorSpace", "CoordinateTransformations", "IdentityRanges", "ImageCore", "Interpolations", "OffsetArrays", "Rotations", "StaticArrays"] -git-tree-sha1 = "5a0207dafba64650268bb5718875c0eea441e1ee" +git-tree-sha1 = "b9ed11686a335d7f981e97ddc588f81b1a6f5fa3" uuid = "02fcd773-0e25-5acc-982a-7f6622650795" -version = "0.8.6" +version = "0.8.8" [[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"] -git-tree-sha1 = "964c70f13ff782fb2435774bbb3dac97a414c832" +git-tree-sha1 = "535bcaae047f017f4fd7331ee859b75f2b27e505" uuid = "916415d5-f1e6-5110-898d-aaa5f9f070e0" -version = "0.23.1" +version = "0.23.3" [[IndirectArrays]] git-tree-sha1 = "c2a145a145dc03a7620af1444e0264ef907bd44f" @@ -452,15 +428,15 @@ uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" [[Interpolations]] deps = ["AxisAlgorithms", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "SharedArrays", "SparseArrays", "StaticArrays", "WoodburyMatrices"] -git-tree-sha1 = "2b7d4e9be8b74f03115e64cf36ed2f48ae83d946" +git-tree-sha1 = "eb1dd6d5b2275faaaa18533e0fc5f9171cec25fa" uuid = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59" -version = "0.12.10" +version = "0.13.1" [[IntervalSets]] deps = ["Dates", "EllipsisNotation", "Statistics"] -git-tree-sha1 = "3b1cef135bc532b3c3401b309e1b8a2a2ba26af5" +git-tree-sha1 = "93a6d78525feb0d3ee2a2ae83a7d04db1db5663f" uuid = "8197267c-284f-5f27-9208-e0e47529a953" -version = "0.5.1" +version = "0.5.2" [[IterTools]] git-tree-sha1 = "05110a2ab1fc5f932622ffea2a003221f4782c18" @@ -468,9 +444,9 @@ uuid = "c8e1da08-722c-5040-9ed9-7db0dc04731e" version = "1.3.0" [[JLLWrappers]] -git-tree-sha1 = "c70593677bbf2c3ccab4f7500d0f4dacfff7b75c" +git-tree-sha1 = "a431f5f2ca3f4feef3bd7a5e94b8b8d4f2f647a0" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.1.3" +version = "1.2.0" [[JpegTurbo_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -486,9 +462,9 @@ version = "0.8.4" [[LLVM]] deps = ["CEnum", "Libdl", "Printf", "Unicode"] -git-tree-sha1 = "000a737732aa4eb996414c4685368f6a74b41d14" +git-tree-sha1 = "d0d99629d6ae4a3e211ae83d8870907bd842c811" uuid = "929cbde3-209d-540e-8aea-75f648917ca0" -version = "3.4.0" +version = "3.5.2" [[LibCURL_jll]] deps = ["LibSSH2_jll", "Libdl", "MbedTLS_jll", "Pkg", "Zlib_jll", "nghttp2_jll"] @@ -522,12 +498,6 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" -[[LoopVectorization]] -deps = ["DocStringExtensions", "LinearAlgebra", "OffsetArrays", "SIMDPirates", "SLEEFPirates", "UnPack", "VectorizationBase"] -git-tree-sha1 = "3242a8f411e19eda9adc49d0b877681975c11375" -uuid = "bdcacae8-1622-11e9-2a5c-532679323890" -version = "0.8.26" - [[Lz4_jll]] deps = ["Libdl", "Pkg"] git-tree-sha1 = "51b1db0732bbdcfabb60e36095cc3ed9c0016932" @@ -559,9 +529,10 @@ uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" 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"] @@ -600,16 +571,11 @@ git-tree-sha1 = "614e8d77264d20c1db83661daadfab38e8e4b77e" uuid = "e94cdb99-869f-56ef-bcf0-1ae2bcbe0389" version = "0.2.4" -[[MuladdMacro]] -git-tree-sha1 = "c6190f9a7fc5d9d5915ab29f2134421b12d24a68" -uuid = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" -version = "0.2.2" - [[NNlib]] -deps = ["Compat", "Libdl", "LinearAlgebra", "Pkg", "Requires", "Statistics"] -git-tree-sha1 = "1ae42464fea5258fd2ff49f1c4a40fc41cba3860" +deps = ["ChainRulesCore", "LinearAlgebra", "Pkg", "Requires", "Statistics"] +git-tree-sha1 = "13fd29731c7f609cb82a3a544c5538584d22c153" uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" -version = "0.7.7" +version = "0.7.11" [[NaNMath]] git-tree-sha1 = "bfe47e760d60b82b66b61d2d44128b62e3a369fb" @@ -618,9 +584,9 @@ version = "0.3.5" [[OffsetArrays]] deps = ["Adapt"] -git-tree-sha1 = "9db93b990af57b3a56dca38476832f60d58f777b" +git-tree-sha1 = "5b644e46f71e744fac0775b885809fd82c4ca904" uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "1.4.0" +version = "1.5.0" [[OpenSSL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -689,15 +655,9 @@ version = "0.2.0" [[Requires]] deps = ["UUIDs"] -git-tree-sha1 = "e05c53ebc86933601d36212a93b39144a2733493" +git-tree-sha1 = "cfbac6c1ed70c002ec6361e7fd334f02820d6419" uuid = "ae029012-a4dd-5104-9daa-d747884805df" -version = "1.1.1" - -[[Richardson]] -deps = ["LinearAlgebra"] -git-tree-sha1 = "776e0fdd3da5ad52067b60310ea8f3150d794c2f" -uuid = "708f8203-808e-40c0-ba2d-98a6953ed40d" -version = "1.2.0" +version = "1.1.2" [[Rotations]] deps = ["LinearAlgebra", "StaticArrays", "Statistics"] @@ -708,18 +668,6 @@ version = "1.0.2" [[SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" -[[SIMDPirates]] -deps = ["VectorizationBase"] -git-tree-sha1 = "a1b418634d6478bf2163920eae3b536dcc768626" -uuid = "21efa798-c60a-11e8-04d3-e1a92915a26a" -version = "0.8.26" - -[[SLEEFPirates]] -deps = ["Libdl", "SIMDPirates", "VectorizationBase"] -git-tree-sha1 = "67ae90a18aa8c22bf159318300e765fbd89ddf6e" -uuid = "476501e8-09a2-5ece-8869-fb82de89a1fa" -version = "0.5.5" - [[Scratch]] deps = ["Dates"] git-tree-sha1 = "ad4b278adb62d185bbcb6864dc24959ab0627bf6" @@ -753,16 +701,16 @@ deps = ["LinearAlgebra", "Random"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[SpecialFunctions]] -deps = ["OpenSpecFun_jll"] -git-tree-sha1 = "bf68b90f72f81dd1519b289b7403c591cfdd6a88" +deps = ["ChainRulesCore", "OpenSpecFun_jll"] +git-tree-sha1 = "75394dbe2bd346beeed750fb02baa6445487b862" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "1.0.0" +version = "1.2.1" [[StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "da4cf579416c81994afd6322365d00916c79b8ae" +git-tree-sha1 = "9da72ed50e94dbff92036da395275ed114e04d49" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "0.12.5" +version = "1.0.1" [[Statistics]] deps = ["LinearAlgebra", "SparseArrays"] @@ -814,12 +762,6 @@ version = "1.0.2" [[Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" -[[VectorizationBase]] -deps = ["CpuId", "Libdl", "LinearAlgebra"] -git-tree-sha1 = "03e2fbb479a1ea350398195b6fbf439bae0f8260" -uuid = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f" -version = "0.12.33" - [[WoodburyMatrices]] deps = ["LinearAlgebra", "SparseArrays"] git-tree-sha1 = "59e2ad8fd1591ea019a5259bd012d7aee15f995c" @@ -845,16 +787,16 @@ uuid = "3161d3a3-bdf6-5164-811a-617609db77b4" version = "1.4.5+2" [[Zygote]] -deps = ["AbstractFFTs", "ArrayLayouts", "ChainRules", "DiffRules", "Distributed", "FillArrays", "ForwardDiff", "IRTools", "InteractiveUtils", "LinearAlgebra", "LoopVectorization", "MacroTools", "NNlib", "NaNMath", "Random", "Requires", "SpecialFunctions", "Statistics", "ZygoteRules"] -git-tree-sha1 = "17f2429f9025a2182e4657ee0769b0958591972a" +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.5.14" +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" [[libpng_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] @@ -867,3 +809,9 @@ deps = ["Libdl", "Pkg"] 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" diff --git a/vision/dcgan_mnist/Project.toml b/vision/dcgan_mnist/Project.toml index 8cc501aa3..5f9ac5da0 100644 --- a/vision/dcgan_mnist/Project.toml +++ b/vision/dcgan_mnist/Project.toml @@ -1,4 +1,5 @@ [deps] +CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c" ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1" Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0" diff --git a/vision/dcgan_mnist/dcgan_mnist.jl b/vision/dcgan_mnist/dcgan_mnist.jl index 8d6c1155a..5f6dc3ab5 100644 --- a/vision/dcgan_mnist/dcgan_mnist.jl +++ b/vision/dcgan_mnist/dcgan_mnist.jl @@ -8,6 +8,7 @@ using Statistics using Parameters: @with_kw using Printf using Random +using CUDA @with_kw struct HyperParams batch_size::Int = 128 @@ -93,20 +94,28 @@ function train(; kws...) # Model Parameters hparams = HyperParams(; kws...) + if CUDA.has_cuda() + device = gpu + @info "Training on GPU" + else + device = cpu + @info "Training on CPU" + end + # Load MNIST dataset images, _ = MLDatasets.MNIST.traindata(Float32) # Normalize to [-1, 1] image_tensor = reshape(@.(2f0 * images - 1f0), 28, 28, 1, :) # Partition into batches - data = [image_tensor[:, :, :, r] |> gpu for r in partition(1:60000, hparams.batch_size)] + data = [image_tensor[:, :, :, r] |> device for r in partition(1:60000, hparams.batch_size)] - fixed_noise = [randn(hparams.latent_dim, 1) |> gpu for _=1:hparams.output_x*hparams.output_y] + fixed_noise = [randn(hparams.latent_dim, 1) |> device for _=1:hparams.output_x*hparams.output_y] # Discriminator - dscr = Discriminator() |> gpu + dscr = Discriminator() |> device # Generator - gen = Generator(hparams.latent_dim) |> gpu + gen = Generator(hparams.latent_dim) |> device # Optimizers opt_dscr = ADAM(hparams.lr_dscr)