From 75c3f320c27bb813221b25150a6b3e9d6454ba40 Mon Sep 17 00:00:00 2001 From: Valentin Churavy Date: Thu, 2 Jul 2020 10:03:38 -0400 Subject: [PATCH 1/2] add KernelAbstractions --- Manifest.toml | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++ Project.toml | 2 ++ 2 files changed, 98 insertions(+) diff --git a/Manifest.toml b/Manifest.toml index d2932fc1..1525bd42 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -12,6 +12,41 @@ git-tree-sha1 = "9e31b9f5d3f9b5ec32c1d01fd8c05270bad10dc0" uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" version = "2.0.0" +[[Base64]] +uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" + +[[Cassette]] +git-tree-sha1 = "ff6f5109371926beb67ec3101be17d2c211e497d" +uuid = "7057c7e9-c182-5462-911a-8362d720325c" +version = "0.3.3" + +[[CompilerSupportLibraries_jll]] +deps = ["Libdl", "Pkg"] +git-tree-sha1 = "7c4f882c41faa72118841185afc58a2eb00ef612" +uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" +version = "0.3.3+0" + +[[Dates]] +deps = ["Printf"] +uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" + +[[Distributed]] +deps = ["Random", "Serialization", "Sockets"] +uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" + +[[InteractiveUtils]] +deps = ["Markdown"] +uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" + +[[KernelAbstractions]] +deps = ["Adapt", "Cassette", "MacroTools", "SpecialFunctions", "StaticArrays"] +path = "/home/vchuravy/.julia/dev/KernelAbstractions" +uuid = "63c18a36-062a-441e-b654-da1e3ab1ce7c" +version = "1.0.0" + +[[LibGit2]] +uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" + [[Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" @@ -19,16 +54,77 @@ uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" deps = ["Libdl"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +[[Logging]] +uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" + +[[MacroTools]] +deps = ["Markdown", "Random"] +git-tree-sha1 = "f7d2e3f654af75f01ec49be82c231c382214223a" +uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" +version = "0.5.5" + +[[Markdown]] +deps = ["Base64"] +uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" + +[[OpenSpecFun_jll]] +deps = ["CompilerSupportLibraries_jll", "Libdl", "Pkg"] +git-tree-sha1 = "d51c416559217d974a1113522d5919235ae67a87" +uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" +version = "0.5.3+3" + +[[Pkg]] +deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Test", "UUIDs"] +uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" + [[Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" +[[REPL]] +deps = ["InteractiveUtils", "Markdown", "Sockets"] +uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" + [[Random]] deps = ["Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +[[SHA]] +uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" + [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" +[[Sockets]] +uuid = "6462fe0b-24de-5631-8697-dd941f90decc" + +[[SparseArrays]] +deps = ["LinearAlgebra", "Random"] +uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" + +[[SpecialFunctions]] +deps = ["OpenSpecFun_jll"] +git-tree-sha1 = "d8d8b8a9f4119829410ecd706da4cc8594a1e020" +uuid = "276daf66-3868-5448-9aa4-cd146d93841b" +version = "0.10.3" + +[[StaticArrays]] +deps = ["LinearAlgebra", "Random", "Statistics"] +git-tree-sha1 = "5c06c0aeb81bef54aed4b3f446847905eb6cbda0" +uuid = "90137ffa-7385-5640-81b9-e52037218182" +version = "0.12.3" + +[[Statistics]] +deps = ["LinearAlgebra", "SparseArrays"] +uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" + +[[Test]] +deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] +uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[[UUIDs]] +deps = ["Random", "SHA"] +uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" + [[Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" diff --git a/Project.toml b/Project.toml index ab9f5142..98c57d3a 100644 --- a/Project.toml +++ b/Project.toml @@ -5,6 +5,7 @@ version = "4.0.0" [deps] AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c" Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" +KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" @@ -14,6 +15,7 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b" AbstractFFTs = "0.4, 0.5" Adapt = "2.0" julia = "1.3" +KernelAbstractions = "1.0" [extras] FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" From 083b9904729bbb5b149621289a1ad86d5d6ce697 Mon Sep 17 00:00:00 2001 From: Valentin Churavy Date: Thu, 2 Jul 2020 12:11:09 -0400 Subject: [PATCH 2/2] add KernelAbstractions --- Manifest.toml | 64 ++++----------------------------------------------- Project.toml | 2 +- 2 files changed, 5 insertions(+), 61 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 1525bd42..2c4598b2 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -20,33 +20,14 @@ git-tree-sha1 = "ff6f5109371926beb67ec3101be17d2c211e497d" uuid = "7057c7e9-c182-5462-911a-8362d720325c" version = "0.3.3" -[[CompilerSupportLibraries_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "7c4f882c41faa72118841185afc58a2eb00ef612" -uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -version = "0.3.3+0" - -[[Dates]] -deps = ["Printf"] -uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" - -[[Distributed]] -deps = ["Random", "Serialization", "Sockets"] -uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" - -[[InteractiveUtils]] -deps = ["Markdown"] -uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" - [[KernelAbstractions]] -deps = ["Adapt", "Cassette", "MacroTools", "SpecialFunctions", "StaticArrays"] -path = "/home/vchuravy/.julia/dev/KernelAbstractions" +deps = ["Adapt", "Cassette", "MacroTools", "StaticArrays"] +git-tree-sha1 = "af5a5b02121e67be1bd4acb8b043376c2fccb80e" +repo-rev = "vc/gpu_arrays" +repo-url = "https://github.com/JuliaGPU/KernelAbstractions.jl.git" uuid = "63c18a36-062a-441e-b654-da1e3ab1ce7c" version = "1.0.0" -[[LibGit2]] -uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" - [[Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" @@ -54,9 +35,6 @@ uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" deps = ["Libdl"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" -[[Logging]] -uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" - [[MacroTools]] deps = ["Markdown", "Random"] git-tree-sha1 = "f7d2e3f654af75f01ec49be82c231c382214223a" @@ -67,47 +45,21 @@ version = "0.5.5" deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" -[[OpenSpecFun_jll]] -deps = ["CompilerSupportLibraries_jll", "Libdl", "Pkg"] -git-tree-sha1 = "d51c416559217d974a1113522d5919235ae67a87" -uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" -version = "0.5.3+3" - -[[Pkg]] -deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Test", "UUIDs"] -uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" - [[Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" -[[REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets"] -uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" - [[Random]] deps = ["Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" -[[SHA]] -uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" - [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" -[[Sockets]] -uuid = "6462fe0b-24de-5631-8697-dd941f90decc" - [[SparseArrays]] deps = ["LinearAlgebra", "Random"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" -[[SpecialFunctions]] -deps = ["OpenSpecFun_jll"] -git-tree-sha1 = "d8d8b8a9f4119829410ecd706da4cc8594a1e020" -uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "0.10.3" - [[StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] git-tree-sha1 = "5c06c0aeb81bef54aed4b3f446847905eb6cbda0" @@ -118,13 +70,5 @@ version = "0.12.3" deps = ["LinearAlgebra", "SparseArrays"] uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" -[[Test]] -deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] -uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" - -[[UUIDs]] -deps = ["Random", "SHA"] -uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" - [[Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" diff --git a/Project.toml b/Project.toml index 98c57d3a..8e0e2f42 100644 --- a/Project.toml +++ b/Project.toml @@ -14,8 +14,8 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b" [compat] AbstractFFTs = "0.4, 0.5" Adapt = "2.0" -julia = "1.3" KernelAbstractions = "1.0" +julia = "1.3" [extras] FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"