no static_expr, fixes #48

JuliaSIMD · Mar 28, 2022 · 61500ed · 61500ed · chriselrod · Mar 28, 2022
1 parent 10a2c67
commit 61500ed
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/src/StrideArrays.jl b/src/StrideArrays.jl
@@ -10,11 +10,11 @@ using VectorizationBase, ArrayInterface,
 
 using VectorizationBase: align, AbstractStridedPointer, AbstractSIMDVector, StridedPointer, gesp, pause, zstridedpointer, val_dense_dims, preserve_buffer
 using LoopVectorization: CloseOpen
-using Static: StaticInt, Zero, One, StaticBool, True, False
+using Static: StaticInt, Zero, One, StaticBool, True, False, known
 using ArrayInterface: size, strides, offsets, indices,
     static_length, axes, dense_dims, stride_rank, StrideIndex
 using StrideArraysCore: AbstractStrideArray, AbstractStrideMatrix, AbstractStrideVector,
-    AbstractPtrStrideArray, PtrArray, static_expr, rank_to_sortperm,
+    AbstractPtrStrideArray, PtrArray, rank_to_sortperm,
     StrideArray, StrideVector, StrideMatrix, similar_layout,
     @gc_preserve
 

diff --git a/src/broadcast.jl b/src/broadcast.jl
@@ -103,7 +103,7 @@ end
         if l === nothing
             push!(t.args, Expr(:ref, :s, i))
         else
-            push!(t.args, static_expr(l))
+            push!(t.args, StaticInt(l))
         end
     end
     t
@@ -114,12 +114,7 @@ function Base.similar(
     StrideArray{T}(undef, to_tuple(S,size(bc)))
 end
 @generated function to_tuple(::Type{S}) where {N,S<:Tuple{Vararg{StaticInt,N}}}
-    t = Expr(:tuple)
-    Sp = S.parameters
-    for i in 1:N
-        push!(t.args, static_expr(_extract(Sp[i])))
-    end
-    t
+  map(StaticInt, known(S))
 end
 function Base.similar(
     bc::Base.Broadcast.Broadcasted{FS}, ::Type{T}

diff --git a/src/rand.jl b/src/rand.jl
@@ -15,7 +15,7 @@ function rand_expr(expr, args...)
     for i in 2:length(expr.args)
         aᵢ = expr.args[i]
         if aᵢ isa Integer
-            push!(array.args, static_expr(Int(aᵢ)))
+            push!(array.args, StaticInt(Int(aᵢ)))
         elseif Meta.isexpr(aᵢ, :$, 1)
             push!(array.args, Expr(:call, GlobalRef(StrideArrays, :StaticInt), (only(aᵢ.args))))
         else