0.6 updates

Author: dlfivefifty

src/FastTransforms.jl

@@ -33,7 +33,7 @@ import HierarchicalMatrices: mul!, At_mul_B!, Ac_mul_B!
 import HierarchicalMatrices: ThreadSafeVector, threadsafezeros
 import LowRankApprox: ColPerm
 import AbstractFFTs: Plan
-
+import Compat: range
 
 export cjt, icjt, jjt, plan_cjt, plan_icjt
 export leg2cheb, cheb2leg, leg2chebu, ultra2ultra, jac2jac

test/basictests.jl

@@ -76,24 +76,48 @@ end
     @test norm(sum(w./(x .- 3)) - π^2/12) ≤ 4eps()
 end
 
-@testset "Allocation-free ID matrix-vector products" begin
-    for T in (Float64, ComplexF64)
-        r = rand(T)
-        A = idfact([r/(i+j-1) for i in 1:200, j = 1:50])
-        P = A[:P]
-        k, n = size(A)
+if VERSION < v"0.7-"
+    @testset "Allocation-free ID matrix-vector products" begin
+        for T in (Float64, ComplexF64)
+            r = rand(T)
+            A = idfact([r/(i+j-1) for i in 1:200, j = 1:50])
+            P = A[:P]
+            k, n = size(A)
 
-        x = rand(T, n)
-        y = zeros(T, k)
+            x = rand(T, n)
+            y = zeros(T, k)
 
-        @test norm(FastTransforms.mul!(y, A, P, x, 1, 1) - A*x) < 10eps()*norm(A*x)
+            @test norm(FastTransforms.mul!(y, A, P, x, 1, 1) - A*x) < 10eps()*norm(A*x)
 
-        x = rand(T, k)
-        y = zeros(T, n)
+            x = rand(T, k)
+            y = zeros(T, n)
 
-        @test norm(FastTransforms.At_mul_B!(y, A, P, x, 1, 1) - transpose(A)*x, Inf) < 10eps()
+            @test norm(FastTransforms.At_mul_B!(y, A, P, x, 1, 1) - At_mul_B(A,x), Inf) < 10eps()
 
-        fill!(y, zero(T))
-        @test norm(FastTransforms.Ac_mul_B!(y, A, P, x, 1, 1) - A'x, Inf) < 10eps()
+            fill!(y, zero(T))
+            @test norm(FastTransforms.Ac_mul_B!(y, A, P, x, 1, 1) - A'x, Inf) < 10eps()
+        end
+    end
+else
+    @testset "Allocation-free ID matrix-vector products" begin
+        for T in (Float64, ComplexF64)
+            r = rand(T)
+            A = idfact([r/(i+j-1) for i in 1:200, j = 1:50])
+            P = A[:P]
+            k, n = size(A)
+
+            x = rand(T, n)
+            y = zeros(T, k)
+
+            @test norm(FastTransforms.mul!(y, A, P, x, 1, 1) - A*x) < 10eps()*norm(A*x)
+
+            x = rand(T, k)
+            y = zeros(T, n)
+
+            @test norm(FastTransforms.At_mul_B!(y, A, P, x, 1, 1) - transpose(A)*x, Inf) < 10eps()
+
+            fill!(y, zero(T))
+            @test norm(FastTransforms.Ac_mul_B!(y, A, P, x, 1, 1) - A'x, Inf) < 10eps()
+        end
     end
 end

test/butterflytests.jl

@@ -3,6 +3,8 @@ using Compat.Test, Compat.LinearAlgebra
 
 if VERSION < v"0.7-"
     const mul! = Base.A_mul_B!
+    const lmul! = Base.scale!
+    const rmul! = Base.scale!
 else
     Ac_mul_B!(C, A, B) = mul!(C, A', B)
     At_mul_B!(C, A, B) = mul!(C, transpose(A), B)

test/nuffttests.jl

@@ -80,9 +80,9 @@ end
         x = ω/n
         fftc = fft(c)
         if Base.Sys.WORD_SIZE == 64
-            @test_broken norm(nufft1(c, ω, ϵ) - fftc) == 0
+            @test_skip norm(nufft1(c, ω, ϵ) - fftc) == 0 # skip because fftw3 seems to change this
             @test norm(nufft2(c, x, ϵ) - fftc) == 0
-            @test_broken norm(nufft3(c, x, ω, ϵ) - fftc) == 0
+            @test_skip norm(nufft3(c, x, ω, ϵ) - fftc) == 0 # skip because fftw3 seems to change this
         end
         err_bnd = 500*eps(Float64)*norm(c)
         @test norm(nufft1(c, ω, ϵ) - fftc) < err_bnd