From 4ed7d984db6167b5b4254588434566418037b375 Mon Sep 17 00:00:00 2001 From: Tim Besard Date: Tue, 25 Feb 2020 14:09:03 +0100 Subject: [PATCH 1/5] Adapt to CuArrays ArrayStyle changes. --- src/onehot.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/onehot.jl b/src/onehot.jl index 7a3123ec..b480d9c0 100644 --- a/src/onehot.jl +++ b/src/onehot.jl @@ -37,9 +37,9 @@ import Adapt: adapt, adapt_structure adapt_structure(T, xs::OneHotMatrix) = OneHotMatrix(xs.height, adapt(T, xs.data)) -import .CuArrays: CuArray, cudaconvert +import .CuArrays: CuArray, CuArrayStyle, cudaconvert import Base.Broadcast: BroadcastStyle, ArrayStyle -BroadcastStyle(::Type{<:OneHotMatrix{<:CuArray}}) = ArrayStyle{CuArray}() +BroadcastStyle(::Type{<:OneHotMatrix{<:CuArray}}) = CuArrayStyle{2}() cudaconvert(x::OneHotMatrix{<:CuArray}) = OneHotMatrix(x.height, cudaconvert(x.data)) """ From 347f53adf6b034f84e5ea8da36cd1b8352cc007c Mon Sep 17 00:00:00 2001 From: Alex Arslan Date: Wed, 25 Mar 2020 10:58:39 -0700 Subject: [PATCH 2/5] Allow CuArrays v2.x --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index db885e2a..052f61ad 100644 --- a/Project.toml +++ b/Project.toml @@ -28,7 +28,7 @@ AbstractTrees = "0.2, 0.3" Adapt = "1" CodecZlib = "0.5, 0.6, 0.7" Colors = "0.8, 0.9, 0.10, 0.11, 0.12" -CuArrays = "1.6" +CuArrays = "1.6, 2" Juno = "0.5, 0.6, 0.7, 0.8" MacroTools = "0.3, 0.4, 0.5" NNlib = "0.6" From 49ba1211598dab894127b358a1ec441c86e4c1c1 Mon Sep 17 00:00:00 2001 From: Alex Arslan Date: Wed, 25 Mar 2020 12:48:29 -0700 Subject: [PATCH 3/5] Update Manifest.toml --- Manifest.toml | 69 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 20 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index c57ff918..9b122866 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -40,21 +40,27 @@ version = "0.2.0" [[CUDAapi]] deps = ["Libdl", "Logging"] -git-tree-sha1 = "d7ceadd8f821177d05b897c0517e94633db535fe" +git-tree-sha1 = "831b825d10104bd29e28f6da93312a976830717b" uuid = "3895d2a7-ec45-59b8-82bb-cfc6a382f9b3" -version = "3.1.0" +version = "4.0.0" [[CUDAdrv]] deps = ["CEnum", "CUDAapi", "Printf"] -git-tree-sha1 = "01e90fa34e25776bc7c8661183d4519149ebfe59" +git-tree-sha1 = "65001097f4a964f1407d546589821cc305a3fa59" uuid = "c5f51814-7f29-56b8-a69c-e4d8f6be1fde" -version = "6.0.0" +version = "6.2.1" [[CUDAnative]] -deps = ["Adapt", "CEnum", "CUDAapi", "CUDAdrv", "DataStructures", "InteractiveUtils", "LLVM", "Libdl", "Printf", "TimerOutputs"] -git-tree-sha1 = "f86269ff60ebe082a2806ecbce51f3cadc68afe9" +deps = ["Adapt", "BinaryProvider", "CEnum", "CUDAapi", "CUDAdrv", "Cthulhu", "DataStructures", "InteractiveUtils", "LLVM", "Libdl", "MacroTools", "Pkg", "Printf", "TimerOutputs"] +git-tree-sha1 = "4168c40ca3ff3475bc29a20a09ab7b910c4b8ef0" uuid = "be33ccc6-a3ff-5ff2-a52e-74243cff1e17" -version = "2.10.2" +version = "3.0.1" + +[[CodeTracking]] +deps = ["InteractiveUtils", "UUIDs"] +git-tree-sha1 = "0becdab7e6fbbcb7b88d8de5b72e5bb2f28239f3" +uuid = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2" +version = "0.5.8" [[CodecZlib]] deps = ["TranscodingStreams", "Zlib_jll"] @@ -80,17 +86,29 @@ git-tree-sha1 = "efdaf19ab11c7889334ca247ff4c9f7c322817b0" uuid = "bbf7d656-a473-5ed7-a52c-81e309532950" version = "0.2.0" +[[Compat]] +deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] +git-tree-sha1 = "ed2c4abadf84c53d9e58510b5fc48912c2336fbb" +uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" +version = "2.2.0" + [[CompilerSupportLibraries_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "b57c5d019367c90f234a7bc7e24ff0a84971da5d" +git-tree-sha1 = "067567a322fe466c5ec8d01413eee7127bd11699" uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -version = "0.2.0+1" +version = "0.3.1+0" + +[[Cthulhu]] +deps = ["CodeTracking", "InteractiveUtils", "TerminalMenus", "Unicode"] +git-tree-sha1 = "5e0f928ccaab1fa2911fc4e204e8a6f5b0213eaf" +uuid = "f68482b8-f384-11e8-15f7-abe071a5a75f" +version = "1.0.0" [[CuArrays]] -deps = ["AbstractFFTs", "Adapt", "CEnum", "CUDAapi", "CUDAdrv", "CUDAnative", "DataStructures", "GPUArrays", "Libdl", "LinearAlgebra", "MacroTools", "NNlib", "Printf", "Random", "Requires", "SparseArrays", "TimerOutputs"] -git-tree-sha1 = "7fa1331a0e0cd10e43b94b280027bda45990cb63" +deps = ["AbstractFFTs", "Adapt", "CEnum", "CUDAapi", "CUDAdrv", "CUDAnative", "DataStructures", "GPUArrays", "Libdl", "LinearAlgebra", "MacroTools", "NNlib", "Pkg", "Printf", "Random", "Reexport", "Requires", "SparseArrays", "Statistics", "TimerOutputs"] +git-tree-sha1 = "025687917ae0f7816005f8fee08e45a91feb368d" uuid = "3a865a2d-5b23-5a0f-bc46-62713ec82fae" -version = "1.7.3" +version = "2.0.0" [[DataAPI]] git-tree-sha1 = "674b67f344687a88310213ddfa8a2b3c76cc4252" @@ -158,9 +176,9 @@ version = "0.10.9" [[GPUArrays]] deps = ["AbstractFFTs", "Adapt", "LinearAlgebra", "Printf", "Random", "Serialization"] -git-tree-sha1 = "e756da6cee76a5f1436a05827fa8fdf3badc577f" +git-tree-sha1 = "d586762b08dcda13228df8967119b9cb6f22ade5" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "2.0.1" +version = "3.1.0" [[IRTools]] deps = ["InteractiveUtils", "MacroTools", "Test"] @@ -191,6 +209,7 @@ uuid = "929cbde3-209d-540e-8aea-75f648917ca0" version = "1.3.4" [[LibGit2]] +deps = ["Printf"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" [[Libdl]] @@ -210,10 +229,10 @@ uuid = "856f044c-d86e-5d09-b602-aeab76dc8ba7" version = "2019.0.117+2" [[MacroTools]] -deps = ["DataStructures", "Markdown", "Random"] -git-tree-sha1 = "07ee65e03e28ca88bc9a338a3726ae0c3efaa94b" +deps = ["Markdown", "Random"] +git-tree-sha1 = "f7d2e3f654af75f01ec49be82c231c382214223a" uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" -version = "0.5.4" +version = "0.5.5" [[Markdown]] deps = ["Base64"] @@ -258,7 +277,7 @@ uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" version = "1.1.0" [[Pkg]] -deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Test", "UUIDs"] +deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" [[Printf]] @@ -295,6 +314,10 @@ uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" +[[SharedArrays]] +deps = ["Distributed", "Mmap", "Random", "Serialization"] +uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" + [[Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" @@ -330,6 +353,12 @@ git-tree-sha1 = "19bfcb46245f69ff4013b3df3b977a289852c3a1" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" version = "0.32.2" +[[TerminalMenus]] +deps = ["Compat", "REPL", "Test"] +git-tree-sha1 = "9ae6ed0c94eee4d898e049820942af21daf15efc" +uuid = "dc548174-15c3-5faf-af27-7997cfbde655" +version = "0.1.0" + [[Test]] deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" @@ -367,9 +396,9 @@ version = "1.2.11+8" [[Zygote]] deps = ["ArrayLayouts", "DiffRules", "FFTW", "FillArrays", "ForwardDiff", "IRTools", "InteractiveUtils", "LinearAlgebra", "MacroTools", "NNlib", "NaNMath", "Random", "Requires", "SpecialFunctions", "Statistics", "ZygoteRules"] -git-tree-sha1 = "7dc5fdb4917ac5a84e199ae654316a01cd4a278b" +git-tree-sha1 = "9688fce24bd8a9468fed12f3d5206099a39054dc" uuid = "e88e6eb3-aa80-5325-afca-941959d7151f" -version = "0.4.9" +version = "0.4.12" [[ZygoteRules]] deps = ["MacroTools"] From e85a5d8573699b1cb1bebd7e43a707c2fe66637c Mon Sep 17 00:00:00 2001 From: Alex Arslan Date: Wed, 25 Mar 2020 15:23:07 -0700 Subject: [PATCH 4/5] Update CUDAdrv for Tim's bug fix --- Manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 9b122866..8444a47a 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -46,9 +46,9 @@ version = "4.0.0" [[CUDAdrv]] deps = ["CEnum", "CUDAapi", "Printf"] -git-tree-sha1 = "65001097f4a964f1407d546589821cc305a3fa59" +git-tree-sha1 = "e650cbaee92b60433313157926b1e80d0c3a0e2e" uuid = "c5f51814-7f29-56b8-a69c-e4d8f6be1fde" -version = "6.2.1" +version = "6.2.2" [[CUDAnative]] deps = ["Adapt", "BinaryProvider", "CEnum", "CUDAapi", "CUDAdrv", "Cthulhu", "DataStructures", "InteractiveUtils", "LLVM", "Libdl", "MacroTools", "Pkg", "Printf", "TimerOutputs"] From 6939e03fc6e2303d2ce0ed60dd469b936b2d4567 Mon Sep 17 00:00:00 2001 From: Dhairya Gandhi Date: Thu, 26 Mar 2020 14:03:55 +0530 Subject: [PATCH 5/5] bump CuArrays version --- Manifest.toml | 5 ++--- Project.toml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 8444a47a..2ba02f84 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -106,9 +106,9 @@ version = "1.0.0" [[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 = "025687917ae0f7816005f8fee08e45a91feb368d" +git-tree-sha1 = "e8c55b38dcca955f5aed8ec4479cdc95810db1e1" uuid = "3a865a2d-5b23-5a0f-bc46-62713ec82fae" -version = "2.0.0" +version = "2.0.1" [[DataAPI]] git-tree-sha1 = "674b67f344687a88310213ddfa8a2b3c76cc4252" @@ -209,7 +209,6 @@ uuid = "929cbde3-209d-540e-8aea-75f648917ca0" version = "1.3.4" [[LibGit2]] -deps = ["Printf"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" [[Libdl]] diff --git a/Project.toml b/Project.toml index 052f61ad..e927e14a 100644 --- a/Project.toml +++ b/Project.toml @@ -28,7 +28,7 @@ AbstractTrees = "0.2, 0.3" Adapt = "1" CodecZlib = "0.5, 0.6, 0.7" Colors = "0.8, 0.9, 0.10, 0.11, 0.12" -CuArrays = "1.6, 2" +CuArrays = "2" Juno = "0.5, 0.6, 0.7, 0.8" MacroTools = "0.3, 0.4, 0.5" NNlib = "0.6"