Skip to content

Commit 7a0708e

Browse files
committed
Deal with circular dependency
1 parent 0b1fa8a commit 7a0708e

File tree

5 files changed

+18
-4
lines changed

5 files changed

+18
-4
lines changed

Project.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ authors = ["Tim Besard <tim.besard@gmail.com>", "Alexis Montoison", "Michel Sch
55

66
[deps]
77
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
8-
AcceleratedKernels = "6a4ca0a5-0e36-4168-a932-d9be78d558f1"
98
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
109
CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
1110
ExprTools = "e2ba6199-217a-4e67-a87a-7c52f15ade04"
@@ -30,6 +29,12 @@ oneAPI_Level_Zero_Headers_jll = "f4bc562b-d309-54f8-9efb-476e56f0410d"
3029
oneAPI_Level_Zero_Loader_jll = "13eca655-d68d-5b81-8367-6d99d727ab01"
3130
oneAPI_Support_jll = "b049733a-a71d-5ed3-8eba-7d323ac00b36"
3231

32+
[weakdeps]
33+
AcceleratedKernels = "6a4ca0a5-0e36-4168-a932-d9be78d558f1"
34+
35+
[extensions]
36+
oneAPIAcceleratedKernelsExt = "AcceleratedKernels"
37+
3338
[compat]
3439
AbstractFFTs = "1.5.0"
3540
AcceleratedKernels = "0.4.3"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
module oneAPIAcceleratedKernelsExt
2+
3+
import oneAPI
4+
import oneAPI: oneArray, oneAPIBackend
5+
import AcceleratedKernels as AK
6+
7+
# Accumulate operations using AcceleratedKernels
18
Base.accumulate!(op, B::oneArray, A::oneArray; init = zero(eltype(A)), kwargs...) =
29
AK.accumulate!(op, B, A, oneAPIBackend(); init, kwargs...)
310

@@ -6,3 +13,5 @@ Base.accumulate(op, A::oneArray; init = zero(eltype(A)), kwargs...) =
613

714
Base.cumsum(src::oneArray; kwargs...) = AK.cumsum(src, oneAPIBackend(); kwargs...)
815
Base.cumprod(src::oneArray; kwargs...) = AK.cumprod(src, oneAPIBackend(); kwargs...)
16+
17+
end # module

src/oneAPI.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export SYCL
5959
include("../lib/mkl/oneMKL.jl")
6060
export oneMKL
6161
end
62-
import AcceleratedKernels as AK
62+
6363
# integrations and specialized functionality
6464
include("broadcast.jl")
6565
include("mapreduce.jl")
@@ -69,7 +69,6 @@ include("utils.jl")
6969

7070
include("oneAPIKernels.jl")
7171
import .oneAPIKernels: oneAPIBackend
72-
include("accumulate.jl")
7372
include("indexing.jl")
7473
export oneAPIBackend
7574

test/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[deps]
22
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
3+
AcceleratedKernels = "6a4ca0a5-0e36-4168-a932-d9be78d558f1"
34
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
45
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
56
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"

test/setup.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Distributed, Test, oneAPI
1+
using Distributed, Test, oneAPI, AcceleratedKernels
22

33
oneAPI.functional() || error("oneAPI.jl is not functional on this system")
44

0 commit comments

Comments
 (0)