Skip to content

Remove FastTransforms #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 26, 2019
Merged

Remove FastTransforms #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0e42f2
Update Project.toml
dlfivefifty Sep 10, 2019
aa9fe3d
Remove FastTransforms dependency
dlfivefifty Sep 10, 2019
385bbcd
merge
dlfivefifty Sep 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "ApproxFunBase"
uuid = "fbd15aa5-315a-5a7d-a8a4-24992e37be05"
version = "0.1.6"
version = "0.2"

[deps]
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
Expand All @@ -13,7 +13,6 @@ DomainSets = "5b8099bc-c8ec-5219-889f-1d9e522a28bf"
DualNumbers = "fa6b7ba4-c1ee-5f82-b5fc-ecf0adba8f74"
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838"
FastTransforms = "057dd010-8810-581a-b7be-e3fc3b93f78c"
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
InfiniteArrays = "4858937d-0d70-526a-a4dd-2d5cb5dd786c"
IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
Expand All @@ -36,14 +35,13 @@ Calculus = "0.5"
DSP = "0.5, 0.6"
DomainSets = "0.1"
DualNumbers = "0.6.2"
FFTW = "0.3"
FFTW = "0.3, 1"
FastGaussQuadrature = "0.3.2, 0.4"
FastTransforms = "0.5, 0.6"
FillArrays = "0.6, 0.7"
InfiniteArrays = "0.2, 0.3"
IntervalSets = "0.3.1"
LazyArrays = "0.11, 0.12"
LowRankApprox = "0.2"
LowRankApprox = "0.2, 0.3"
SpecialFunctions = "0.7, 0.8"
StaticArrays = "0.9, 0.10, 0.11"
ToeplitzMatrices = "0.5, 0.6"
Expand Down
5 changes: 1 addition & 4 deletions src/ApproxFunBase.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module ApproxFunBase
using Base, BlockArrays, BandedMatrices, BlockBandedMatrices, DomainSets, IntervalSets,
SpecialFunctions, AbstractFFTs, FFTW, SpecialFunctions, DSP, DualNumbers, FastTransforms,
SpecialFunctions, AbstractFFTs, FFTW, SpecialFunctions, DSP, DualNumbers,
LinearAlgebra, SparseArrays, LowRankApprox, FillArrays, InfiniteArrays #, Arpack
import StaticArrays, Calculus

Expand Down Expand Up @@ -72,9 +72,6 @@ import BlockBandedMatrices: blockbandwidth, blockbandwidths, blockcolstop, block
isblockbanded, isbandedblockbanded, bb_numentries, BlockBandedSizes,
BandedBlockBandedSizes

import FastTransforms: ChebyshevTransformPlan, IChebyshevTransformPlan, plan_chebyshevtransform,
plan_chebyshevtransform!, plan_ichebyshevtransform, plan_ichebyshevtransform!

import FillArrays: AbstractFill, getindex_value
import LazyArrays: cache
import InfiniteArrays: Infinity, InfRanges, AbstractInfUnitRange, OneToInf
Expand Down
4 changes: 0 additions & 4 deletions src/Domain.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ domainscompatible(a::Domain,b::Domain) = isambiguous(a) || isambiguous(b) ||

##TODO: Should fromcanonical be fromcanonical!?

points(d::IntervalOrSegmentDomain{T},n::Integer; kind::Int=1) where {T} =
fromcanonical.(Ref(d), chebyshevpoints(float(real(eltype(T))), n; kind=kind)) # eltype to handle point
bary(v::AbstractVector{Float64},d::IntervalOrSegmentDomain,x::Float64) = bary(v,tocanonical(d,x))

#TODO consider moving these
leftendpoint(d::IntervalOrSegmentDomain{T}) where {T} = fromcanonical(d,-one(eltype(T)))
rightendpoint(d::IntervalOrSegmentDomain{T}) where {T} = fromcanonical(d,one(eltype(T)))
Expand Down
2 changes: 0 additions & 2 deletions src/LinearAlgebra/LinearAlgebra.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ include("standardchop.jl")
include("blas.jl")
include("lyap.jl")


include("bary.jl")
include("clenshaw.jl")

include("hesseneigs.jl")
Expand Down
54 changes: 0 additions & 54 deletions src/LinearAlgebra/bary.jl
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions src/LinearAlgebra/helper.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,52 +652,9 @@ dynamic(f) = f
dynamic(f::Function) = DFunction(f) # Assume f has to compile every time


## Chebyshev transform
# Matrix inputs


function FastTransforms.chebyshevtransform!(X::AbstractMatrix{T};kind::Integer=1) where T<:fftwNumber
if kind == 1
if size(X) == (1,1)
X
else
X=r2r!(X,REDFT10)
X[:,1]/=2;X[1,:]/=2;
lmul!(1/(size(X,1)*size(X,2)),X)
end
elseif kind == 2
if size(X) == (1,1)
X
else
X=r2r!(X,REDFT00)
lmul!(1/((size(X,1)-1)*(size(X,2)-1)),X)
X[:,1]/=2;X[:,end]/=2
X[1,:]/=2;X[end,:]/=2
X
end
end
end

function FastTransforms.ichebyshevtransform!(X::AbstractMatrix{T};kind::Integer=1) where T<:fftwNumber
if kind == 1
if size(X) == (1,1)
X
else
X[1,:]*=2;X[:,1]*=2
X = r2r(X,REDFT01)
lmul!(1/4,X)
end
elseif kind == 2
if size(X) == (1,1)
X
else
X[1,:]*=2;X[end,:]*=2;X[:,1]*=2;X[:,end]*=2
X=chebyshevtransform!(X;kind=kind)
X[1,:]*=2;X[end,:]*=2;X[:,1]*=2;X[:,end]*=2
lmul!((size(X,1)-1)*(size(X,2)-1)/4,X)
end
end
end


## conv
Expand Down