Skip to content

Commit ecdaf94

Browse files
committed
Update to latest CUDAnative to use new atomic operations
Fix CI Fix gitlab-ci Add CuArrays as deps
1 parent e6bb83a commit ecdaf94

File tree

2 files changed

+87
-100
lines changed

2 files changed

+87
-100
lines changed

Manifest.toml

Lines changed: 85 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
[[AbstractFFTs]]
44
deps = ["LinearAlgebra"]
5-
git-tree-sha1 = "380e36c66edfa099cd90116b24c1ce8cafccac40"
5+
git-tree-sha1 = "051c95d6836228d120f5f4b984dd5aba1624f716"
66
uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c"
7-
version = "0.4.1"
7+
version = "0.5.0"
88

99
[[AbstractTrees]]
10-
deps = ["Markdown", "Test"]
11-
git-tree-sha1 = "6621d9645702c1c4e6970cc6a3eae440c768000b"
10+
deps = ["Markdown"]
11+
git-tree-sha1 = "940760b82db1f7090f7d16fe6e4b121cc181db45"
1212
uuid = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
13-
version = "0.2.1"
13+
version = "0.3.1"
1414

1515
[[Adapt]]
1616
deps = ["LinearAlgebra"]
@@ -21,12 +21,6 @@ version = "1.0.0"
2121
[[Base64]]
2222
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
2323

24-
[[BinDeps]]
25-
deps = ["Compat", "Libdl", "SHA", "URIParser"]
26-
git-tree-sha1 = "12093ca6cdd0ee547c39b1870e0c9c3f154d9ca9"
27-
uuid = "9e28174c-4ba2-5203-b857-d8d62c4213ee"
28-
version = "0.8.10"
29-
3024
[[BinaryProvider]]
3125
deps = ["Libdl", "SHA"]
3226
git-tree-sha1 = "5b08ed6036d9d3f0ee6369410b830f8873d4024c"
@@ -40,21 +34,23 @@ version = "0.2.0"
4034

4135
[[CUDAapi]]
4236
deps = ["Libdl", "Logging"]
43-
git-tree-sha1 = "6eee47385c81ed3b3f716b745697869c712c2df3"
37+
git-tree-sha1 = "56a813440ac98a1aa64672ab460a1512552211a7"
4438
uuid = "3895d2a7-ec45-59b8-82bb-cfc6a382f9b3"
45-
version = "2.0.0"
39+
version = "2.1.0"
4640

4741
[[CUDAdrv]]
4842
deps = ["CEnum", "CUDAapi", "Printf"]
49-
git-tree-sha1 = "0f39fddace3324707469ace7fbcbc7b28d5cf921"
43+
git-tree-sha1 = "1fce616fa0806c67c133eb1d2f68f0f1a7504665"
5044
uuid = "c5f51814-7f29-56b8-a69c-e4d8f6be1fde"
51-
version = "4.0.4"
45+
version = "5.0.1"
5246

5347
[[CUDAnative]]
5448
deps = ["Adapt", "CEnum", "CUDAapi", "CUDAdrv", "DataStructures", "InteractiveUtils", "LLVM", "Libdl", "Printf", "TimerOutputs"]
55-
git-tree-sha1 = "93f6c917ab2a9b5bb54f8f738f4ec1a6693cb716"
49+
git-tree-sha1 = "0c1d9fa0d0742afd0e81b85be5d83c1b40978971"
50+
repo-rev = "master"
51+
repo-url = "https://github.com/JuliaGPU/CUDAnative.jl.git"
5652
uuid = "be33ccc6-a3ff-5ff2-a52e-74243cff1e17"
57-
version = "2.5.5"
53+
version = "2.8.1"
5854

5955
[[CodecZlib]]
6056
deps = ["BinaryProvider", "Libdl", "TranscodingStreams"]
@@ -64,9 +60,9 @@ version = "0.6.0"
6460

6561
[[ColorTypes]]
6662
deps = ["FixedPointNumbers", "Random"]
67-
git-tree-sha1 = "10050a24b09e8e41b951e9976b109871ce98d965"
63+
git-tree-sha1 = "7b62b728a5f3dd6ee3b23910303ccf27e82fad5e"
6864
uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
69-
version = "0.8.0"
65+
version = "0.8.1"
7066

7167
[[Colors]]
7268
deps = ["ColorTypes", "FixedPointNumbers", "InteractiveUtils", "Printf", "Reexport"]
@@ -80,23 +76,11 @@ git-tree-sha1 = "efdaf19ab11c7889334ca247ff4c9f7c322817b0"
8076
uuid = "bbf7d656-a473-5ed7-a52c-81e309532950"
8177
version = "0.2.0"
8278

83-
[[Compat]]
84-
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
85-
git-tree-sha1 = "ed2c4abadf84c53d9e58510b5fc48912c2336fbb"
86-
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
87-
version = "2.2.0"
88-
89-
[[Conda]]
90-
deps = ["JSON", "VersionParsing"]
91-
git-tree-sha1 = "9a11d428dcdc425072af4aea19ab1e8c3e01c032"
92-
uuid = "8f4d0f93-b110-5947-807f-2305c1781a2d"
93-
version = "1.3.0"
94-
9579
[[CuArrays]]
9680
deps = ["AbstractFFTs", "Adapt", "CEnum", "CUDAapi", "CUDAdrv", "CUDAnative", "DataStructures", "GPUArrays", "Libdl", "LinearAlgebra", "MacroTools", "NNlib", "Printf", "Random", "Requires", "SparseArrays", "TimerOutputs"]
97-
git-tree-sha1 = "4757376a85ffb27d4c4f6cdf9635261e6c3a5fec"
81+
git-tree-sha1 = "4e536542c5c898b1bf43011b6187f3c97ebcc91e"
9882
uuid = "3a865a2d-5b23-5a0f-bc46-62713ec82fae"
99-
version = "1.4.7"
83+
version = "1.7.0"
10084

10185
[[DataAPI]]
10286
git-tree-sha1 = "674b67f344687a88310213ddfa8a2b3c76cc4252"
@@ -105,9 +89,9 @@ version = "1.1.0"
10589

10690
[[DataStructures]]
10791
deps = ["InteractiveUtils", "OrderedCollections"]
108-
git-tree-sha1 = "a1b652fb77ae8ca7ea328fa7ba5aa151036e5c10"
92+
git-tree-sha1 = "b7720de347734f4716d1815b00ce5664ed6bbfd4"
10993
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
110-
version = "0.17.6"
94+
version = "0.17.9"
11195

11296
[[Dates]]
11397
deps = ["Printf"]
@@ -118,32 +102,38 @@ deps = ["Mmap"]
118102
uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
119103

120104
[[DiffResults]]
121-
deps = ["Compat", "StaticArrays"]
122-
git-tree-sha1 = "34a4a1e8be7bc99bc9c611b895b5baf37a80584c"
105+
deps = ["StaticArrays"]
106+
git-tree-sha1 = "da24935df8e0c6cf28de340b958f6aac88eaa0cc"
123107
uuid = "163ba53b-c6d8-5494-b064-1a9d43ac40c5"
124-
version = "0.0.4"
108+
version = "1.0.2"
125109

126110
[[DiffRules]]
127111
deps = ["NaNMath", "Random", "SpecialFunctions"]
128-
git-tree-sha1 = "f734b5f6bc9c909027ef99f6d91d5d9e4b111eed"
112+
git-tree-sha1 = "10dca52cf6d4a62d82528262921daf63b99704a2"
129113
uuid = "b552c78f-8df3-52c6-915a-8e097449b14b"
130-
version = "0.1.0"
114+
version = "1.0.0"
131115

132116
[[Distributed]]
133117
deps = ["Random", "Serialization", "Sockets"]
134118
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
135119

136120
[[FFTW]]
137-
deps = ["AbstractFFTs", "BinaryProvider", "Conda", "Libdl", "LinearAlgebra", "Reexport", "Test"]
138-
git-tree-sha1 = "6c5b420da0b8c12098048561b8d58f81adea506f"
121+
deps = ["AbstractFFTs", "FFTW_jll", "IntelOpenMP_jll", "Libdl", "LinearAlgebra", "MKL_jll", "Reexport"]
122+
git-tree-sha1 = "109d82fa4b00429f9afcce873e9f746f11f018d3"
139123
uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
140-
version = "1.0.1"
124+
version = "1.2.0"
125+
126+
[[FFTW_jll]]
127+
deps = ["Libdl", "Pkg"]
128+
git-tree-sha1 = "05674f209a6e3387dd103a945b0113eeb64b1a58"
129+
uuid = "f5851436-0d7a-5f13-b9de-f02708fd171a"
130+
version = "3.3.9+3"
141131

142132
[[FillArrays]]
143133
deps = ["LinearAlgebra", "Random", "SparseArrays"]
144-
git-tree-sha1 = "1a9fe4e1323f38de0ba4da49eafd15b25ec62298"
134+
git-tree-sha1 = "fec413d4fc547992eb62a5c544cedb6d7853c1f5"
145135
uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
146-
version = "0.8.2"
136+
version = "0.8.4"
147137

148138
[[FixedPointNumbers]]
149139
git-tree-sha1 = "d14a6fa5890ea3a7e5dcab6811114f132fec2b4b"
@@ -152,38 +142,38 @@ version = "0.6.1"
152142

153143
[[Flux]]
154144
deps = ["AbstractTrees", "Adapt", "CodecZlib", "Colors", "CuArrays", "DelimitedFiles", "Juno", "MacroTools", "NNlib", "Pkg", "Printf", "Random", "Reexport", "SHA", "Statistics", "StatsBase", "Test", "ZipFile", "Zygote"]
155-
git-tree-sha1 = "ac27a5357135652f804702e7e7749f9af3a19f24"
145+
git-tree-sha1 = "8134adbb0f10b0d22b22f8b4299d0d20509edc5f"
156146
uuid = "587475ba-b771-5e3f-ad9e-33799f191a9c"
157-
version = "0.10.0"
147+
version = "0.10.1"
158148

159149
[[ForwardDiff]]
160150
deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"]
161-
git-tree-sha1 = "da46ac97b17793eba44ff366dc6cb70f1238a738"
151+
git-tree-sha1 = "88b082d492be6b63f967b6c96b352e25ced1a34c"
162152
uuid = "f6369f11-7733-5829-9624-2563aa707210"
163-
version = "0.10.7"
153+
version = "0.10.9"
164154

165155
[[GPUArrays]]
166156
deps = ["AbstractFFTs", "Adapt", "LinearAlgebra", "Printf", "Random", "Serialization"]
167-
git-tree-sha1 = "a0a3b927b1a06e63fb8b91950cc7df340b7d912c"
157+
git-tree-sha1 = "e756da6cee76a5f1436a05827fa8fdf3badc577f"
168158
uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
169-
version = "2.0.0"
159+
version = "2.0.1"
170160

171161
[[IRTools]]
172162
deps = ["InteractiveUtils", "MacroTools", "Test"]
173163
git-tree-sha1 = "72421971e60917b8cd7737f9577c4f0f87eab306"
174164
uuid = "7869d1d1-7146-5819-86e3-90919afe41df"
175165
version = "0.3.0"
176166

167+
[[IntelOpenMP_jll]]
168+
deps = ["Libdl", "Pkg"]
169+
git-tree-sha1 = "fb8e1c7a5594ba56f9011310790e03b5384998d6"
170+
uuid = "1d5cc7b8-4909-519e-a0f8-d0f5ad9712d0"
171+
version = "2018.0.3+0"
172+
177173
[[InteractiveUtils]]
178174
deps = ["Markdown"]
179175
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
180176

181-
[[JSON]]
182-
deps = ["Dates", "Mmap", "Parsers", "Unicode"]
183-
git-tree-sha1 = "b34d7cef7b337321e97d22242c3c2b91f476748e"
184-
uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
185-
version = "0.21.0"
186-
187177
[[Juno]]
188178
deps = ["Base64", "Logging", "Media", "Profile", "Test"]
189179
git-tree-sha1 = "30d94657a422d09cb97b6f86f04f750fa9c50df8"
@@ -192,9 +182,9 @@ version = "0.7.2"
192182

193183
[[LLVM]]
194184
deps = ["CEnum", "Libdl", "Printf", "Unicode"]
195-
git-tree-sha1 = "74fe444b8b6d1ac01d639b2f9eaf395bcc2e24fc"
185+
git-tree-sha1 = "1d08d7e4250f452f6cb20e4574daaebfdbee0ff7"
196186
uuid = "929cbde3-209d-540e-8aea-75f648917ca0"
197-
version = "1.3.2"
187+
version = "1.3.3"
198188

199189
[[LibGit2]]
200190
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
@@ -209,11 +199,17 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
209199
[[Logging]]
210200
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
211201

202+
[[MKL_jll]]
203+
deps = ["IntelOpenMP_jll", "Libdl", "Pkg"]
204+
git-tree-sha1 = "720629cc8cbd12c146ca01b661fd1a6cf66e2ff4"
205+
uuid = "856f044c-d86e-5d09-b602-aeab76dc8ba7"
206+
version = "2019.0.117+2"
207+
212208
[[MacroTools]]
213-
deps = ["Compat", "DataStructures", "Test"]
214-
git-tree-sha1 = "82921f0e3bde6aebb8e524efc20f4042373c0c06"
209+
deps = ["DataStructures", "Markdown", "Random"]
210+
git-tree-sha1 = "e2fc7a55bb2224e203bbd8b59f72b91323233458"
215211
uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
216-
version = "0.5.2"
212+
version = "0.5.3"
217213

218214
[[Markdown]]
219215
deps = ["Base64"]
@@ -235,30 +231,30 @@ version = "0.4.3"
235231
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
236232

237233
[[NNlib]]
238-
deps = ["Libdl", "LinearAlgebra", "Requires", "Statistics", "TimerOutputs"]
239-
git-tree-sha1 = "0c667371391fc6bb31f7f12f96a56a17098b3de8"
234+
deps = ["BinaryProvider", "Libdl", "LinearAlgebra", "Requires", "Statistics"]
235+
git-tree-sha1 = "755c0bab3912ff782167e1b4b774b833f8a0e550"
240236
uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd"
241-
version = "0.6.0"
237+
version = "0.6.4"
242238

243239
[[NaNMath]]
244240
git-tree-sha1 = "928b8ca9b2791081dc71a51c55347c27c618760f"
245241
uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
246242
version = "0.3.3"
247243

244+
[[OpenSpecFun_jll]]
245+
deps = ["Libdl", "Pkg"]
246+
git-tree-sha1 = "65f672edebf3f4e613ddf37db9dcbd7a407e5e90"
247+
uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e"
248+
version = "0.5.3+1"
249+
248250
[[OrderedCollections]]
249251
deps = ["Random", "Serialization", "Test"]
250252
git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1"
251253
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
252254
version = "1.1.0"
253255

254-
[[Parsers]]
255-
deps = ["Dates", "Test"]
256-
git-tree-sha1 = "0139ba59ce9bc680e2925aec5b7db79065d60556"
257-
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
258-
version = "0.3.10"
259-
260256
[[Pkg]]
261-
deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
257+
deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Test", "UUIDs"]
262258
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
263259

264260
[[Printf]]
@@ -284,21 +280,17 @@ uuid = "189a3867-3050-52da-a836-e630ba90ab69"
284280
version = "0.2.0"
285281

286282
[[Requires]]
287-
deps = ["Test"]
288-
git-tree-sha1 = "f6fbf4ba64d295e146e49e021207993b6b48c7d1"
283+
deps = ["UUIDs"]
284+
git-tree-sha1 = "999513b7dea8ac17359ed50ae8ea089e4464e35e"
289285
uuid = "ae029012-a4dd-5104-9daa-d747884805df"
290-
version = "0.5.2"
286+
version = "1.0.0"
291287

292288
[[SHA]]
293289
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
294290

295291
[[Serialization]]
296292
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
297293

298-
[[SharedArrays]]
299-
deps = ["Distributed", "Mmap", "Random", "Serialization"]
300-
uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
301-
302294
[[Sockets]]
303295
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
304296

@@ -313,10 +305,10 @@ deps = ["LinearAlgebra", "Random"]
313305
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
314306

315307
[[SpecialFunctions]]
316-
deps = ["BinDeps", "BinaryProvider", "Libdl"]
317-
git-tree-sha1 = "3bdd374b6fd78faf0119b8c5d538788dbf910c6e"
308+
deps = ["OpenSpecFun_jll"]
309+
git-tree-sha1 = "268052ee908b2c086cc0011f528694f02f3e2408"
318310
uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
319-
version = "0.8.0"
311+
version = "0.9.0"
320312

321313
[[StaticArrays]]
322314
deps = ["LinearAlgebra", "Random", "Statistics"]
@@ -350,36 +342,30 @@ git-tree-sha1 = "7c53c35547de1c5b9d46a4797cf6d8253807108c"
350342
uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
351343
version = "0.9.5"
352344

353-
[[URIParser]]
354-
deps = ["Test", "Unicode"]
355-
git-tree-sha1 = "6ddf8244220dfda2f17539fa8c9de20d6c575b69"
356-
uuid = "30578b45-9adc-5946-b283-645ec420af67"
357-
version = "0.4.0"
358-
359345
[[UUIDs]]
360346
deps = ["Random", "SHA"]
361347
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
362348

363349
[[Unicode]]
364350
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
365351

366-
[[VersionParsing]]
367-
deps = ["Compat"]
368-
git-tree-sha1 = "c9d5aa108588b978bd859554660c8a5c4f2f7669"
369-
uuid = "81def892-9a0e-5fdd-b105-ffc91e053289"
370-
version = "1.1.3"
371-
372352
[[ZipFile]]
373-
deps = ["BinaryProvider", "Libdl", "Printf"]
374-
git-tree-sha1 = "580ce62b6c14244916cc28ad54f8a2e2886f843d"
353+
deps = ["Libdl", "Printf", "Zlib_jll"]
354+
git-tree-sha1 = "8748302cfdec02c4ae9c97b112cf10003f7f767f"
375355
uuid = "a5390f91-8eb1-5f08-bee0-b1d1ffed6cea"
376-
version = "0.8.3"
356+
version = "0.9.1"
357+
358+
[[Zlib_jll]]
359+
deps = ["Libdl", "Pkg"]
360+
git-tree-sha1 = "fd36a6739e256527287c5444960d0266712cd49e"
361+
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
362+
version = "1.2.11+8"
377363

378364
[[Zygote]]
379365
deps = ["DiffRules", "FFTW", "FillArrays", "ForwardDiff", "IRTools", "InteractiveUtils", "LinearAlgebra", "MacroTools", "NNlib", "NaNMath", "Random", "Requires", "SpecialFunctions", "Statistics", "ZygoteRules"]
380-
git-tree-sha1 = "e4245b9c5362346e154b62842a89a18e0210b92b"
366+
git-tree-sha1 = "ca4dfa4de0a0e2c1da6c8c67d3b9af99645b57fc"
381367
uuid = "e88e6eb3-aa80-5325-afca-941959d7151f"
382-
version = "0.4.1"
368+
version = "0.4.6"
383369

384370
[[ZygoteRules]]
385371
deps = ["MacroTools"]

Project.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ version = "0.2.0"
55

66
[deps]
77
CUDAapi = "3895d2a7-ec45-59b8-82bb-cfc6a382f9b3"
8+
CUDAnative = "be33ccc6-a3ff-5ff2-a52e-74243cff1e17"
89
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
910
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
1011
IRTools = "7869d1d1-7146-5819-86e3-90919afe41df"
@@ -18,7 +19,7 @@ ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444"
1819

1920
[compat]
2021
CUDAapi = "≥2.0"
21-
CUDAnative = "^2.5, <2.7.0"
22+
CUDAnative = "^2.8"
2223
CuArrays = "^1.4, <1.6.0"
2324
DataStructures = "~0.17"
2425
Flux = "~0.10"

0 commit comments

Comments
 (0)