Mercurial > repos > public > sbplib_julia

annotate src/LazyTensors/lazy_array.jl @ 386:895ec483d741 feature/lazy_array/isapprox

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implement isapprox between LazyArray and scalars.
author Jonatan Werpers <jonatan@werpers.com>
date Thu, 01 Oct 2020 07:44:39 +0200
parents f65809a26a17
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
267
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
1 """
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
2 LazyArray{T,D} <: AbstractArray{T,D}
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
3
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
4 Array which is calcualted lazily when indexing.
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
5
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
6 A subtype of `LazyArray` will use lazy version of `+`, `-`, `*`, `/`.
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
7 """
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
8 abstract type LazyArray{T,D} <: AbstractArray{T,D} end
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
9 export LazyArray
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
10
386
895ec483d741 Implement isapprox between LazyArray and scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 376
diff changeset
11 Base.isapprox(x::LazyArray, y::Number; kwargs...) = isapprox(x, LazyConstantArray(y, size(x)); kwargs...)
895ec483d741 Implement isapprox between LazyArray and scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 376
diff changeset
12 Base.isapprox(x::Number, y::LazyArray; kwargs...) = isapprox(y,x; kwargs...)
895ec483d741 Implement isapprox between LazyArray and scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 376
diff changeset
13
325
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
14 struct LazyConstantArray{T,D} <: LazyArray{T,D}
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
15 val::T
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
16 size::NTuple{D,Int}
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
17 end
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
18
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
19 Base.size(lca::LazyConstantArray) = lca.size
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
20 Base.getindex(lca::LazyConstantArray{T,D}, I::Vararg{Int,D}) where {T,D} = lca.val
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
21
267
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
22 """
371
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
23 LazyFunctionArray{F<:Function,T, D} <: LazyArray{T,D}
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
24
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
25 A lazy array where each element is defined by a function f(i,j,...)
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
26 """
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
27 struct LazyFunctionArray{F<:Function,T, D} <: LazyArray{T,D}
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
28 f::F
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
29 size::NTuple{D,Int}
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
30 end
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
31 export LazyFunctionArray
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
32
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
33 function LazyFunctionArray(f::F, size::NTuple{D,Int}) where {F<:Function,D}
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
34 T = typeof(f(ones(D)...))
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
35 return LazyFunctionArray{F,T,D}(f,size)
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
36 end
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
37
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
38 Base.size(lfa::LazyFunctionArray) = lfa.size
372
33c360c3c6bc Improve formatting
Jonatan Werpers <jonatan@werpers.com>
parents: 371
diff changeset
39
371
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
40 function Base.getindex(lfa::LazyFunctionArray{F,T,D}, I::Vararg{Int,D}) where {F,T,D}
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
41 @boundscheck checkbounds(lfa, I...)
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
42 return lfa.f(I...)
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
43 end
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
44
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
45
241bd2512c20 Add a LazyFunctionArray that evaluates a function for each index.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
46 """
325
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
47 LazyElementwiseOperation{T,D,Op} <: LazyArray{T,D}
267
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
48 Struct allowing for lazy evaluation of elementwise operations on AbstractArrays.
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
49
325
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
50 A LazyElementwiseOperation contains two arrays together with an operation.
267
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
51 The operations are carried out when the LazyElementwiseOperation is indexed.
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
52 """
347
0a95a829176c lazy_array.jl: Bring back the concrete types in the LazyElementwiseOperation struct.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
53 struct LazyElementwiseOperation{T,D,Op,T1<:AbstractArray{T,D},T2<:AbstractArray{T,D}} <: LazyArray{T,D}
0a95a829176c lazy_array.jl: Bring back the concrete types in the LazyElementwiseOperation struct.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
54 a::T1
0a95a829176c lazy_array.jl: Bring back the concrete types in the LazyElementwiseOperation struct.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
55 b::T2
267
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
56
347
0a95a829176c lazy_array.jl: Bring back the concrete types in the LazyElementwiseOperation struct.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
57 function LazyElementwiseOperation{T,D,Op}(a::T1,b::T2) where {T,D,Op,T1<:AbstractArray{T,D},T2<:AbstractArray{T,D}}
267
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
58 @boundscheck if size(a) != size(b)
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
59 throw(DimensionMismatch("dimensions must match"))
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
60 end
347
0a95a829176c lazy_array.jl: Bring back the concrete types in the LazyElementwiseOperation struct.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
61 return new{T,D,Op,T1,T2}(a,b)
267
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
62 end
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
63
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
64 end
347
0a95a829176c lazy_array.jl: Bring back the concrete types in the LazyElementwiseOperation struct.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
65 LazyElementwiseOperation{T,D,Op}(a::AbstractArray{T,D},b::T) where {T,D,Op} = LazyElementwiseOperation{T,D,Op}(a, LazyConstantArray(b, size(a)))
0a95a829176c lazy_array.jl: Bring back the concrete types in the LazyElementwiseOperation struct.
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
66 LazyElementwiseOperation{T,D,Op}(a::T,b::AbstractArray{T,D}) where {T,D,Op} = LazyElementwiseOperation{T,D,Op}(LazyConstantArray(a, size(b)), b)
267
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
67 # TODO: Move Op to be the first parameter? Compare to Binary operations
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
68
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
69 Base.size(v::LazyElementwiseOperation) = size(v.a)
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
70
325
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
71 evaluate(leo::LazyElementwiseOperation{T,D,:+}, I::Vararg{Int,D}) where {T,D} = leo.a[I...] + leo.b[I...]
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
72 evaluate(leo::LazyElementwiseOperation{T,D,:-}, I::Vararg{Int,D}) where {T,D} = leo.a[I...] - leo.b[I...]
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
73 evaluate(leo::LazyElementwiseOperation{T,D,:*}, I::Vararg{Int,D}) where {T,D} = leo.a[I...] * leo.b[I...]
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
74 evaluate(leo::LazyElementwiseOperation{T,D,:/}, I::Vararg{Int,D}) where {T,D} = leo.a[I...] / leo.b[I...]
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
75
267
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
76 # TODO: Make sure boundschecking is done properly and that the lenght of the vectors are equal
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
77 # NOTE: Boundschecking in getindex functions now assumes that the size of the
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
78 # vectors in the LazyElementwiseOperation are the same size. If we remove the
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
79 # size assertion in the constructor we might have to handle
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
80 # boundschecking differently.
325
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
81 Base.@propagate_inbounds @inline function Base.getindex(leo::LazyElementwiseOperation{T,D}, I::Vararg{Int,D}) where {T,D}
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
82 @boundscheck if !checkbounds(Bool, leo.a, I...)
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
83 throw(BoundsError([leo], I...))
267
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
84 end
325
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
85 return evaluate(leo, I...)
267
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
86 end
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
87
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
88 # Define lazy operations for AbstractArrays. Operations constructs a LazyElementwiseOperation which
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
89 # can later be indexed into. Lazy operations are denoted by the usual operator followed by a tilde
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
90 Base.@propagate_inbounds +̃(a::AbstractArray{T,D}, b::AbstractArray{T,D}) where {T,D} = LazyElementwiseOperation{T,D,:+}(a,b)
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
91 Base.@propagate_inbounds -̃(a::AbstractArray{T,D}, b::AbstractArray{T,D}) where {T,D} = LazyElementwiseOperation{T,D,:-}(a,b)
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
92 Base.@propagate_inbounds *̃(a::AbstractArray{T,D}, b::AbstractArray{T,D}) where {T,D} = LazyElementwiseOperation{T,D,:*}(a,b)
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
93 Base.@propagate_inbounds /̃(a::AbstractArray{T,D}, b::AbstractArray{T,D}) where {T,D} = LazyElementwiseOperation{T,D,:/}(a,b)
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
94
325
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
95 Base.@propagate_inbounds +̃(a::AbstractArray{T,D}, b::T) where {T,D} = LazyElementwiseOperation{T,D,:+}(a,b)
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
96 Base.@propagate_inbounds -̃(a::AbstractArray{T,D}, b::T) where {T,D} = LazyElementwiseOperation{T,D,:-}(a,b)
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
97 Base.@propagate_inbounds *̃(a::AbstractArray{T,D}, b::T) where {T,D} = LazyElementwiseOperation{T,D,:*}(a,b)
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
98 Base.@propagate_inbounds /̃(a::AbstractArray{T,D}, b::T) where {T,D} = LazyElementwiseOperation{T,D,:/}(a,b)
267
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
99
325
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
100 Base.@propagate_inbounds +̃(a::T, b::AbstractArray{T,D}) where {T,D} = LazyElementwiseOperation{T,D,:+}(a,b)
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
101 Base.@propagate_inbounds -̃(a::T, b::AbstractArray{T,D}) where {T,D} = LazyElementwiseOperation{T,D,:-}(a,b)
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
102 Base.@propagate_inbounds *̃(a::T, b::AbstractArray{T,D}) where {T,D} = LazyElementwiseOperation{T,D,:*}(a,b)
41c3c25e4e3b LazyTensors: Simplify the LazyElementwiseOperation type by restricting it and introducing a LazyConstantArray to handle scalars.
Jonatan Werpers <jonatan@werpers.com>
parents: 267
diff changeset
103 Base.@propagate_inbounds /̃(a::T, b::AbstractArray{T,D}) where {T,D} = LazyElementwiseOperation{T,D,:/}(a,b)
267
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
104
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
105
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
106
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
107 # NOTE: Är det knas att vi har till exempel * istället för .* ??
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
108 # Oklart om det ens går att lösa..
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
109 Base.@propagate_inbounds Base.:+(a::LazyArray{T,D}, b::LazyArray{T,D}) where {T,D} = a +̃ b
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
110 Base.@propagate_inbounds Base.:+(a::LazyArray{T,D}, b::AbstractArray{T,D}) where {T,D} = a +̃ b
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
111 Base.@propagate_inbounds Base.:+(a::AbstractArray{T,D}, b::LazyArray{T,D}) where {T,D} = a +̃ b
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
112
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
113 Base.@propagate_inbounds Base.:-(a::LazyArray{T,D}, b::LazyArray{T,D}) where {T,D} = a -̃ b
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
114 Base.@propagate_inbounds Base.:-(a::LazyArray{T,D}, b::AbstractArray{T,D}) where {T,D} = a -̃ b
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
115 Base.@propagate_inbounds Base.:-(a::AbstractArray{T,D}, b::LazyArray{T,D}) where {T,D} = a -̃ b
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
116
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
117 # Element wise operation for `*` and `\` are not overloaded due to conflicts with the behavior
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
118 # of regular `*` and `/` for AbstractArrays. Use tilde versions instead.
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
119
634453a4e1d8 Restructure code in LazyTensors
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff changeset
120 export +̃, -̃, *̃, /̃