Mercurial > repos > public > sbplib_julia

annotate TensorMappings.jl @ 179:39d3a837bc6b boundary_conditions

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove imports of Base operators
author Jonatan Werpers <jonatan@werpers.com>
date Mon, 17 Jun 2019 10:57:57 +0200
parents 87747870441e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
155
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
1 module TensorMappings
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
2 # Needs a better name ImplicitTensorMappings? Get rid of "Tensor" in the name_
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
3
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
4 abstract type TensorMapping{T,R,D} end
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
5
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
6 range_dim(::TensorMapping{T,R,D}) where {T,R,D} = R
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
7 domain_dim(::TensorMapping{T,R,D}) where {T,R,D} = D
160
d33b13d2d92b Move things around in TensorMappings and improve the comments
Jonatan Werpers <jonatan@werpers.com>
parents: 159
diff changeset
8 # range_size(::TensorMapping{T,R,D}, domain_size::NTuple{D,Integer}) where {T,R,D}
d33b13d2d92b Move things around in TensorMappings and improve the comments
Jonatan Werpers <jonatan@werpers.com>
parents: 159
diff changeset
9 # domain_size(::TensorMapping{T,R,D}, range_size::NTuple{R,Integer}) where {T,R,D}
155
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
10
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
11 # apply(t::TensorMapping{T,R,D}, v::AbstractArray{T,D}, I::Vararg) where {R,D,T} =
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
12 # apply_transpose(t::TensorMapping{T,R,D}, v::AbstractArray{T,D}, I::Vararg) where {R,D,T} =
160
d33b13d2d92b Move things around in TensorMappings and improve the comments
Jonatan Werpers <jonatan@werpers.com>
parents: 159
diff changeset
13 # Implementing apply_transpose and domain_size is only needed if you want to take transposes of the TensorMapping.
d33b13d2d92b Move things around in TensorMappings and improve the comments
Jonatan Werpers <jonatan@werpers.com>
parents: 159
diff changeset
14 # TODO: Think about boundschecking!
158
a3fac8298e3c Add domain_size() method
Jonatan Werpers <jonatan@werpers.com>
parents: 157
diff changeset
15
160
d33b13d2d92b Move things around in TensorMappings and improve the comments
Jonatan Werpers <jonatan@werpers.com>
parents: 159
diff changeset
16 abstract type TensorOperator{T,D} <: TensorMapping{T,D,D} end
d33b13d2d92b Move things around in TensorMappings and improve the comments
Jonatan Werpers <jonatan@werpers.com>
parents: 159
diff changeset
17 domain_size(::TensorOperator{T,D}, range_size::NTuple{D,Integer}) where {T,D} = range_size
d33b13d2d92b Move things around in TensorMappings and improve the comments
Jonatan Werpers <jonatan@werpers.com>
parents: 159
diff changeset
18 range_size(::TensorOperator{T,D}, domain_size::NTuple{D,Integer}) where {T,D} = domain_size
155
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
19
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
20
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
21
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
22 # Allow using the ' operator:
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
23 struct TensorMappingTranspose{T,R,D} <: TensorMapping{T,D,R}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
24 tm::TensorMapping{T,R,D}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
25 end
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
26
160
d33b13d2d92b Move things around in TensorMappings and improve the comments
Jonatan Werpers <jonatan@werpers.com>
parents: 159
diff changeset
27 Base.adjoint(t::TensorMapping) = TensorMappingTranspose(t)
d33b13d2d92b Move things around in TensorMappings and improve the comments
Jonatan Werpers <jonatan@werpers.com>
parents: 159
diff changeset
28 # TBD: Should this be implemented on a type by type basis or through a trait to provide earlier errors?
155
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
29 Base.adjoint(t::TensorMappingTranspose) = t.tm
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
30
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
31 apply(tm::TensorMappingTranspose{T,R,D}, v::AbstractArray{T,R}, I::Vararg) where {T,R,D} = apply_transpose(tm.tm, v, I...)
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
32 apply_transpose(tm::TensorMappingTranspose{T,R,D}, v::AbstractArray{T,D}, I::Vararg) where {T,R,D} = apply(tm.tm, v, I...)
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
33
177
87747870441e Steal Vidars changes from 24779d423243 that make TensorMappings.jl compile
Jonatan Werpers <jonatan@werpers.com>
parents: 163
diff changeset
34 range_size(tmt::TensorMappingTranspose{T,R,D}, domain_size::NTuple{D,Integer}) where {T,R,D} = domain_size(tmt.tm, domain_size)
87747870441e Steal Vidars changes from 24779d423243 that make TensorMappings.jl compile
Jonatan Werpers <jonatan@werpers.com>
parents: 163
diff changeset
35 domain_size(tmt::TensorMappingTranspose{T,R,D}, range_size::NTuple{D,Integer}) where {T,R,D} = range_size(tmt.tm, range_size)
155
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
36
157
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
37
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
38
155
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
39 struct TensorApplication{T,R,D} <: AbstractArray{T,R}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
40 t::TensorMapping{R,D}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
41 o::AbstractArray{T,D}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
42 end
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
43
177
87747870441e Steal Vidars changes from 24779d423243 that make TensorMappings.jl compile
Jonatan Werpers <jonatan@werpers.com>
parents: 163
diff changeset
44 Base.size(ta::TensorApplication{T,R,D}) where {T,R,D} = range_size(ta.t,size(ta.o))
87747870441e Steal Vidars changes from 24779d423243 that make TensorMappings.jl compile
Jonatan Werpers <jonatan@werpers.com>
parents: 163
diff changeset
45 Base.getindex(ta::TensorApplication{T,R,D}, I::Vararg) where {T,R,D} = apply(ta.t, ta.o, I...)
160
d33b13d2d92b Move things around in TensorMappings and improve the comments
Jonatan Werpers <jonatan@werpers.com>
parents: 159
diff changeset
46 # TODO: What else is needed to implement the AbstractArray interface?
177
87747870441e Steal Vidars changes from 24779d423243 that make TensorMappings.jl compile
Jonatan Werpers <jonatan@werpers.com>
parents: 163
diff changeset
47 →(tm::TensorMapping{T,R,D}, o::AbstractArray{T,D}) where {T,R,D} = TensorApplication(tm,o)
155
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
48 # Should we overload some other infix binary operator?
160
d33b13d2d92b Move things around in TensorMappings and improve the comments
Jonatan Werpers <jonatan@werpers.com>
parents: 159
diff changeset
49 # We need the associativity to be a→b→c = a→(b→c), which is the case for '→'
179
39d3a837bc6b Remove imports of Base operators
Jonatan Werpers <jonatan@werpers.com>
parents: 177
diff changeset
50 Base.:*(args::Union{TensorMapping{T}, AbstractArray{T}}...) where T = foldr(*,args)
39d3a837bc6b Remove imports of Base operators
Jonatan Werpers <jonatan@werpers.com>
parents: 177
diff changeset
51 Base.:*(tm::TensorMapping{T,R,D}, o::AbstractArray{T,D}) where {T,R,D} = TensorApplication(tm,o)
157
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
52 # We need to be really careful about good error messages.
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
53 # For example what happens if you try to multiply TensorApplication with a TensorMapping(wrong order)?
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
54
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
55
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
56
155
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
57 struct TensorMappingComposition{T,R,K,D} <: TensorMapping{T,R,D}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
58 t1::TensorMapping{T,R,K}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
59 t2::TensorMapping{T,K,D}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
60 end
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
61
179
39d3a837bc6b Remove imports of Base operators
Jonatan Werpers <jonatan@werpers.com>
parents: 177
diff changeset
62 Base.:∘(s::TensorMapping{T,R,K}, t::TensorMapping{T,K,D}) where {T,R,K,D} = TensorMappingComposition(s,t)
155
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
63
177
87747870441e Steal Vidars changes from 24779d423243 that make TensorMappings.jl compile
Jonatan Werpers <jonatan@werpers.com>
parents: 163
diff changeset
64 function range_size(tm::TensorMappingComposition{T,R,K,D}, domain_size::NTuple{D,Integer}) where {T,R,K,D}
161
ea01b5550ff6 Add some missing methods in TensorMappings.jl
Jonatan Werpers <jonatan@werpers.com>
parents: 160
diff changeset
65 range_size(tm.t1, domain_size(tm.t2, domain_size))
ea01b5550ff6 Add some missing methods in TensorMappings.jl
Jonatan Werpers <jonatan@werpers.com>
parents: 160
diff changeset
66 end
ea01b5550ff6 Add some missing methods in TensorMappings.jl
Jonatan Werpers <jonatan@werpers.com>
parents: 160
diff changeset
67
177
87747870441e Steal Vidars changes from 24779d423243 that make TensorMappings.jl compile
Jonatan Werpers <jonatan@werpers.com>
parents: 163
diff changeset
68 function domain_size(tm::TensorMappingComposition{T,R,K,D}, range_size::NTuple{R,Integer}) where {T,R,K,D}
161
ea01b5550ff6 Add some missing methods in TensorMappings.jl
Jonatan Werpers <jonatan@werpers.com>
parents: 160
diff changeset
69 domain_size(tm.t1, domain_size(tm.t2, range_size))
ea01b5550ff6 Add some missing methods in TensorMappings.jl
Jonatan Werpers <jonatan@werpers.com>
parents: 160
diff changeset
70 end
ea01b5550ff6 Add some missing methods in TensorMappings.jl
Jonatan Werpers <jonatan@werpers.com>
parents: 160
diff changeset
71
155
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
72 function apply(c::TensorMappingComposition{T,R,K,D}, v::AbstractArray{T,D}, I::Vararg) where {T,R,K,D}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
73 apply(c.t1, TensorApplication(c.t2,v), I...)
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
74 end
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
75
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
76 function apply_transpose(c::TensorMappingComposition{T,R,K,D}, v::AbstractArray{T,D}, I::Vararg) where {T,R,K,D}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
77 apply_transpose(c.t2, TensorApplication(c.t1',v), I...)
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
78 end
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
79
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
80 # Have i gone too crazy with the type parameters? Maybe they aren't all needed?
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
81
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
82
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
83 export apply
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
84 export apply_transpose
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
85 export range_dim
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
86 export domain_dim
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
87 export range_size
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
88 export →
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
89
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
90
163
766403c677b1 Add comment and sketch for automatic dimension expansion
Jonatan Werpers <jonatan@werpers.com>
parents: 162
diff changeset
91 # # Automatic dimension expansion?
766403c677b1 Add comment and sketch for automatic dimension expansion
Jonatan Werpers <jonatan@werpers.com>
parents: 162
diff changeset
92 # struct TensorOperator1dAd2d{T,I} <: TensorOperator{T,2}
766403c677b1 Add comment and sketch for automatic dimension expansion
Jonatan Werpers <jonatan@werpers.com>
parents: 162
diff changeset
93 # t::TensorOperator{T,1}
766403c677b1 Add comment and sketch for automatic dimension expansion
Jonatan Werpers <jonatan@werpers.com>
parents: 162
diff changeset
94 # end
766403c677b1 Add comment and sketch for automatic dimension expansion
Jonatan Werpers <jonatan@werpers.com>
parents: 162
diff changeset
95
162
be50c5e40121 Add missing newline at end of TensorMappings.jl
Jonatan Werpers <jonatan@werpers.com>
parents: 161
diff changeset
96 end #module