Skip to content

Commit 8aae2bc

Browse files
committed
oneapi update
1 parent 9fe3075 commit 8aae2bc

File tree

2 files changed

+4
-47
lines changed

2 files changed

+4
-47
lines changed

ext/ExaModelsOneAPI.jl

Lines changed: 3 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,62 +2,18 @@ module ExaModelsOneAPI
22

33
import ExaModels, oneAPI
44

5-
# function ExaModels.append!(
6-
# backend,
7-
# a::A,
8-
# b::Base.Generator{UnitRange{I}},
9-
# lb,
10-
# ) where {I,A<:oneAPI.oneArray}
11-
# la = length(a)
12-
# aa = similar(a, la + lb)
13-
# copyto!(view(aa, 1:la), a)
14-
# map!(b.f, view(aa, (la+1):(la+lb)), b.iter)
15-
# return aa
16-
# end
17-
18-
# function ExaModels.append!(backend, a::A, b::Base.Generator, lb) where {A<:oneAPI.oneArray}
19-
# b = ExaModels._adapt_gen(b)
20-
# la = length(a)
21-
# aa = similar(a, la + lb)
22-
# copyto!(view(aa, 1:la), a)
23-
# map!(b.f, view(aa, (la+1):(la+lb)), ExaModels.convert_array(b.iter, backend))
24-
# return aa
25-
# end
26-
27-
# function ExaModels.append!(
28-
# backend,
29-
# a::A,
30-
# b::V,
31-
# lb,
32-
# ) where {A<:oneAPI.oneArray,V<:AbstractArray}
33-
# la = length(a)
34-
# aa = similar(a, la + lb)
35-
# copyto!(view(aa, 1:la), a)
36-
# copyto!(view(aa, (la+1):(la+lb)), b)
37-
# return aa
38-
# end
39-
40-
41-
# function ExaModels.append!(backend, a::A, b::Number, lb) where {A<:oneAPI.oneArray}
42-
# la = length(a)
43-
# aa = similar(a, la + lb)
44-
# copyto!(view(aa, 1:la), a)
45-
# fill!(view(aa, (la+1):(la+lb)), b)
46-
# return aa
47-
# end
48-
5+
# causing crash if commented out
496
ExaModels.convert_array(v, backend::oneAPI.oneAPIBackend) = oneAPI.oneArray(v)
507

518
ExaModels.sort!(array::A; lt = isless) where {A<:oneAPI.oneArray} =
529
copyto!(array, sort!(Array(array); lt = lt))
5310

54-
# below is type piracy
55-
function Base.findall(f::F, bitarray::A) where {F<:Function,A<:oneAPI.oneArray}
11+
function ExaModels.findall(f::F, bitarray::A) where {F<:Function,A<:oneAPI.oneArray}
5612
a = Array(bitarray)
5713
b = findall(f, a)
5814
c = similar(bitarray, eltype(b), length(b))
5915
return copyto!(c, b)
6016
end
61-
Base.findall(bitarray::A) where {A<:oneAPI.oneArray} = Base.findall(identity, bitarray)
17+
ExaModels.findall(bitarray::A) where {A<:oneAPI.oneArray} = findall(identity, bitarray)
6218

6319
end # module

src/templates.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ sum(a) = Base.sum(a)
66

77
# to avoid type privacy
88
sort!(array; kwargs...) = Base.sort!(array; kwargs...)
9+
findall(args...) = Base.findall(args...)
910

1011
# MOI
1112
function Optimizer end

0 commit comments

Comments
 (0)