Skip to content

Commit db0ae88

Browse files
authored
Merge pull request #218 from DilumAluthge/patch-1
Run CI on macOS (in addition to Linux and Windows)
2 parents 23724da + 068e36b commit db0ae88

File tree

10 files changed

+21
-18
lines changed

10 files changed

+21
-18
lines changed

.github/workflows/ci-julia-nightly.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
- 'nightly'
2929
os:
3030
- ubuntu-latest
31+
- macOS-latest
3132
- windows-latest
3233
arch:
3334
- x64

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
- '1' # automatically expands to the latest stable 1.x release of Julia.
3030
os:
3131
- ubuntu-latest
32+
- macOS-latest
3233
- windows-latest
3334
arch:
3435
- x64

src/condense_loopset.jl

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -394,20 +394,10 @@ end
394394
Returns true if the element type is supported.
395395
"""
396396
@inline check_type(::Type{T}) where {T <: NativeTypes} = true
397-
@inline function check_type(::Type{T}) where {T}
398-
# @info """`LoopVectorization.check_type` returned `false`, because `LoopVectorization.check_type(::$(T)) == false`.
399-
# `LoopVectorization` currently only supports `T <: $(NativeTypes)`.
400-
# Therefore compiling a probably slow `@inbounds @fastmath` fallback loop.""" maxlog=1
401-
false
402-
end
397+
@inline check_type(::Type{T}) where {T} = false
403398
@inline check_device(::ArrayInterface.CPUPointer) = true
404399
@inline check_device(::ArrayInterface.CPUTuple) = true
405-
@inline function check_device(x)
406-
# @info """`LoopVectorization.check_args` returned `false`, because `ArrayInterface.device(::$(typeof(x))) == $x`
407-
# `LoopVectorization` normally requires `ArrayInterface.CPUPointer` (exceptions include ranges, `BitVector`s, and
408-
# `BitArray`s whose number of rows is a multiple of 8). Therefore compiling a probably slow `@inbounds @fastmath` fallback loop.""" maxlog=1
409-
false
410-
end
400+
@inline check_device(x) = false
411401

412402
function check_args_call(ls::LoopSet)
413403
q = Expr(:call, lv(:check_args))

test/arraywrappers.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using LoopVectorization, Test#, OffsetArrays
22

33
@testset "Array Wrappers" begin
4+
@show @__LINE__
45

56
function addone!(y, x)
67
@avx for i eachindex(x,y)

test/check_empty.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ function mysum_unchecked(x)
1515
end
1616

1717
@testset "Check Empty" begin
18+
@show @__LINE__
1819
x = fill(9999, 100, 10, 10);
1920
xv = view(x, :, 1:0, :);
2021
@test mysum_checked(x) == mysum_unchecked(x) == sum(x)

test/loopinductvars.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
# testset for using them in loops
33
@testset "Loop Induction Variables" begin
4+
@show @__LINE__
45
f(x) = cos(x) * log(x)
56
function avxmax(v)
67
max_x = -Inf

test/runtests.jl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,12 @@ const START_TIME = time()
3030
@time include("loopinductvars.jl")
3131

3232
@time include("shuffleloadstores.jl")
33-
34-
@time include("zygote.jl")
33+
34+
if (v"1.5" < VERSION < v"1.7") && Sys.iswindows()
35+
println("Skipping Zygote tests.")
36+
else
37+
@time include("zygote.jl")
38+
end
3539

3640
@time include("offsetarrays.jl")
3741

test/shuffleloadstores.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ function issue209_noavx(M, G, J, H, A, B, ϕ)
173173
end
174174

175175
@testset "shuffles load/stores" begin
176+
@show @__LINE__
176177
for i 1:128
177178
ac = rand(Complex{Float64}, i);
178179
bc = rand(Complex{Float64}, i);

test/threading.jl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,12 @@ end
118118
C1 = A * B; C0 = similar(C1);
119119
@test AmulB!(C0, A, B) C1
120120

121-
x = randn(Complex{Float64}, 3M-1);
122-
W = randn(Complex{Float64}, 3M-1, 3M+1);
123-
y = randn(Complex{Float64}, 3M+1);
124-
@test dot(x,W,y) dot3(x,W,y)
121+
if VERSION v"1.6"
122+
x = randn(Complex{Float64}, 3M-1);
123+
W = randn(Complex{Float64}, 3M-1, 3M+1);
124+
y = randn(Complex{Float64}, 3M+1);
125+
@test dot(x,W,y) dot3(x,W,y)
126+
end
125127

126128
kern = OffsetArray(randn(3,3),-2,-2)
127129
out1 = OffsetArray(randn(size(A) .- 2), 1, 1)

test/utils.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ using LoopVectorization
22
using Test
33

44
@testset "Utilities" begin
5+
@show @__LINE__
56
@test LoopVectorization.isscopedname(:(Base.OneTo), :Base, :OneTo)
67
@test LoopVectorization.isscopedname(:(A.B.C.D), (:A, :B, :C), :D)
78
@test !LoopVectorization.isscopedname(:(A.B.D), (:A, :B, :C), :D)

0 commit comments

Comments
 (0)