Mercurial > repos > public > sbplib_julia
diff src/LazyTensors/lazy_tensor_operations.jl @ 412:d94891b8dfca feature/tensor_composition
Start implementing TensorComposition
author | Jonatan Werpers <jonatan@werpers.com> |
---|---|
date | Thu, 15 Oct 2020 22:05:22 +0200 |
parents | 1936e38fe51e |
children | 814865d40f48 |
line wrap: on
line diff
--- a/src/LazyTensors/lazy_tensor_operations.jl Thu Oct 15 21:06:28 2020 +0200 +++ b/src/LazyTensors/lazy_tensor_operations.jl Thu Oct 15 22:05:22 2020 +0200 @@ -74,34 +74,32 @@ Base.:+(tm1::TensorMapping{T,R,D}, tm2::TensorMapping{T,R,D}) where {T,R,D} = LazyTensorMappingBinaryOperation{:+,T,R,D}(tm1,tm2) Base.:-(tm1::TensorMapping{T,R,D}, tm2::TensorMapping{T,R,D}) where {T,R,D} = LazyTensorMappingBinaryOperation{:-,T,R,D}(tm1,tm2) +""" + TensorMappingComposition{T,R,K,D} -# TODO: Write tests and documentation for LazyTensorMappingComposition -# struct LazyTensorMappingComposition{T,R,K,D} <: TensorMapping{T,R,D} -# t1::TensorMapping{T,R,K} -# t2::TensorMapping{T,K,D} -# end +Lazily compose two TensorMappings, so that they can be handled as a single TensorMapping. +""" +struct TensorMappingComposition{T,R,K,D, TM1<:TensorMapping{T,R,K}, TM2<:TensorMapping{T,K,D}} <: TensorMapping{T,R,D} + t1::TM1 + t2::TM2 -# Base.:∘(s::TensorMapping{T,R,K}, t::TensorMapping{T,K,D}) where {T,R,K,D} = LazyTensorMappingComposition(s,t) - -# function range_size(tm::LazyTensorMappingComposition{T,R,K,D}, domain_size::NTuple{D,Integer}) where {T,R,K,D} -# range_size(tm.t1, domain_size(tm.t2, domain_size)) -# end + # Add check for matching sizes as a boundscheck +end +export TensorMappingComposition -# function domain_size(tm::LazyTensorMappingComposition{T,R,K,D}, range_size::NTuple{R,Integer}) where {T,R,K,D} -# domain_size(tm.t1, domain_size(tm.t2, range_size)) -# end +range_size(tm::TensorMappingComposition) = range_size(tm.t1) +domain_size(tm::TensorMappingComposition) = domain_size(tm.t2) -# function apply(c::LazyTensorMappingComposition{T,R,K,D}, v::AbstractArray{T,D}, I::NTuple{R,Int}) where {T,R,K,D} -# apply(c.t1, LazyTensorMappingApplication(c.t2,v), I...) -# end +function apply(c::TensorMappingComposition{T,R,K,D}, v::AbstractArray{T,D}, I::Vararg{S,R} where S) where {T,R,K,D} + apply(c.t1, LazyTensorMappingApplication(c.t2,v), I...) +end -# function apply_transpose(c::LazyTensorMappingComposition{T,R,K,D}, v::AbstractArray{T,D}, I::NTuple{D,Int}) where {T,R,K,D} -# apply_transpose(c.t2, LazyTensorMappingApplication(c.t1',v), I...) -# end +function apply_transpose(c::TensorMappingComposition{T,R,K,D}, v::AbstractArray{T,R}, I::Vararg{S,D} where S) where {T,R,K,D} + apply_transpose(c.t2, LazyTensorMappingApplication(c.t1',v), I...) +end -# # Have i gone too crazy with the type parameters? Maybe they aren't all needed? +Base.:∘(s::TensorMapping, t::TensorMapping) = TensorMappingComposition(s,t) -# export → """ LazyLinearMap{T,R,D,...}(A, range_indicies, domain_indicies)