Skip to content

Commit b30f9ef

Browse files
committed
Merge remote-tracking branch 'upstream/master' into kernel_rng
2 parents 8a94500 + 32b9f7d commit b30f9ef

30 files changed

+349
-607
lines changed

.github/workflows/PreviewPagesCleanup.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ jobs:
2525

2626
- name: Push changes
2727
run: |
28+
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
2829
git push --force origin gh-pages-new:gh-pages

LICENSE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
The CUDA.jl package is licensed under the MIT "Expat" License:
22

33
> Copyright (c) 2019-present: Julia Computing and other contributors
4+
>
45
> Copyright (c) 2014-2018: Tim Besard
6+
>
57
> Copyright (c) 2013: Dahua Lin
68
>
79
> All Rights Reserved.

Manifest.toml

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ git-tree-sha1 = "215a9aa4a1f23fbd05b92769fdd62559488d70e9"
3232
uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82"
3333
version = "0.4.1"
3434

35+
[[ChainRulesCore]]
36+
deps = ["Compat", "LinearAlgebra", "SparseArrays"]
37+
git-tree-sha1 = "de4f08843c332d355852721adb1592bce7924da3"
38+
uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
39+
version = "0.9.29"
40+
3541
[[Compat]]
3642
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
3743
git-tree-sha1 = "919c7f3151e79ff196add81d7f4e45d91bbf420b"
@@ -77,14 +83,21 @@ version = "6.2.0"
7783

7884
[[GPUCompiler]]
7985
deps = ["DataStructures", "ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "Scratch", "Serialization", "TimerOutputs", "UUIDs"]
80-
git-tree-sha1 = "ef2839b063e158672583b9c09d2cf4876a8d3d55"
86+
git-tree-sha1 = "b6c3b8e2df6ffe0da0b10e2045ce35a3cf618b8a"
87+
repo-rev = "1ecbe42"
88+
repo-url = "https://github.com/JuliaGPU/GPUCompiler.jl.git"
8189
uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
82-
version = "0.10.0"
90+
version = "0.10.1"
8391

8492
[[InteractiveUtils]]
8593
deps = ["Markdown"]
8694
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
8795

96+
[[JLLWrappers]]
97+
git-tree-sha1 = "a431f5f2ca3f4feef3bd7a5e94b8b8d4f2f647a0"
98+
uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
99+
version = "1.2.0"
100+
88101
[[LLVM]]
89102
deps = ["CEnum", "Libdl", "Printf", "Unicode"]
90103
git-tree-sha1 = "b616937c31337576360cb9fb872ec7633af7b194"
@@ -150,6 +163,12 @@ uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
150163
[[NetworkOptions]]
151164
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
152165

166+
[[OpenSpecFun_jll]]
167+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"]
168+
git-tree-sha1 = "9db77584158d0ab52307f8c04f8e7c08ca76b5b3"
169+
uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e"
170+
version = "0.5.3+4"
171+
153172
[[OrderedCollections]]
154173
git-tree-sha1 = "4fa2ba51070ec13fcc7517db714445b4ab986bdf"
155174
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
@@ -205,6 +224,12 @@ uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
205224
deps = ["LinearAlgebra", "Random"]
206225
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
207226

227+
[[SpecialFunctions]]
228+
deps = ["ChainRulesCore", "OpenSpecFun_jll"]
229+
git-tree-sha1 = "5919936c0e92cff40e57d0ddf0ceb667d42e5902"
230+
uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
231+
version = "1.3.0"
232+
208233
[[Statistics]]
209234
deps = ["LinearAlgebra", "SparseArrays"]
210235
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"

Project.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
2424
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
2525
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
2626
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
27+
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
2728
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
2829
TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
2930

@@ -41,5 +42,6 @@ MacroTools = "0.5"
4142
Memoize = "0.4"
4243
Reexport = "0.2, 1.0"
4344
Requires = "0.5, 1.0"
45+
SpecialFunctions = "1.3"
4446
TimerOutputs = "0.5"
4547
julia = "1.6"

deps/compatibility.jl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,6 @@ end
175175
## high-level functions that return target and isa support
176176

177177
function llvm_compat(version=LLVM.version())
178-
# https://github.com/JuliaGPU/CUDAnative.jl/issues/428
179-
if version >= v"8.0" && VERSION < v"1.3.0-DEV.547"
180-
error("LLVM 8.0 requires a newer version of Julia")
181-
end
182-
183178
InitializeNVPTXTarget()
184179

185180
cap_support = sort(collect(llvm_cap_support(version)))

deps/discovery.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ const cuda_releases = [v"1.0", v"1.1",
155155
v"8.0",
156156
v"9.0", v"9.1", v"9.2",
157157
v"10.0", v"10.1", v"10.2",
158-
v"11.0", v"11.1"]
158+
v"11.0", v"11.1", v"11.2"]
159159

160160
const cuda_library_versions = Dict(
161161
v"11.0.1" => Dict(

examples/wmma/high-level.jl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
# Need https://github.com/JuliaLang/julia/pull/33970
2-
# and https://github.com/JuliaLang/julia/pull/34043
3-
if VERSION < v"1.5-"
4-
exit()
5-
end
6-
71
using CUDA
82
if capability(device()) < v"7.0"
93
exit()

examples/wmma/low-level.jl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
# Need https://github.com/JuliaLang/julia/pull/33970
2-
# and https://github.com/JuliaLang/julia/pull/34043
3-
if VERSION < v"1.5-"
4-
exit()
5-
end
6-
71
using CUDA
82
if capability(device()) < v"7.0"
93
exit()

lib/cudadrv/execution.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ end
102102
end
103103

104104
"""
105-
cudacall(f::CuFunction, types, values...; blocks::CuDim, threads::CuDim,
105+
cudacall(f, types, values...; blocks::CuDim, threads::CuDim,
106106
cooperative=false, shmem=0, stream=stream())
107107
108108
`ccall`-like interface for launching a CUDA function `f` on a GPU.
@@ -130,10 +130,10 @@ being slightly faster.
130130
cudacall
131131

132132
# FIXME: can we make this infer properly?
133-
cudacall(f::CuFunction, types::Tuple, args...; kwargs...) where {N} =
133+
cudacall(f, types::Tuple, args...; kwargs...) where {N} =
134134
cudacall(f, Base.to_tuple_type(types), args...; kwargs...)
135135

136-
function cudacall(f::CuFunction, types::Type, args...; kwargs...)
136+
function cudacall(f, types::Type, args...; kwargs...)
137137
convert_arguments(types, args...) do pointers...
138138
launch(f, pointers...; kwargs...)
139139
end

src/CUDA.jl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,19 @@ using BFloat16s
1818

1919
using Memoize
2020

21+
using ExprTools
22+
23+
24+
##
25+
26+
const ci_cache = GPUCompiler.CodeCache()
27+
28+
@static if isdefined(Base.Experimental, Symbol("@overlay"))
29+
Base.Experimental.@MethodTable(method_table)
30+
else
31+
const method_table = nothing
32+
end
33+
2134

2235
## source code includes
2336

0 commit comments

Comments
 (0)