ifelse unroll

Author: chriselrod

Project.toml

@@ -1,7 +1,7 @@
 name = "LoopVectorization"
 uuid = "bdcacae8-1622-11e9-2a5c-532679323890"
 authors = ["Chris Elrod <elrodc@gmail.com>"]
-version = "0.12.163"
+version = "0.12.164"
 
 
 [deps]

ext/ForwardDiffExt.jl

@@ -157,8 +157,8 @@ end
   end
 end
 
-@generated function ifelse(
-  m::AbstractMask,
+@generated function _ifelse(
+  m::Union{AbstractMask,VecUnroll{<:Any,<:Any,Bit,<:AbstractMask}},
   x::ForwardDiff.Dual{TAG,V,P},
   y::ForwardDiff.Dual{TAG,V,P}
 ) where {TAG,V,P}
@@ -171,8 +171,8 @@ end
     ForwardDiff.Dual{$TAG}(z, ForwardDiff.Partials(p))
   end
 end
-@generated function ifelse(
-  m::AbstractMask,
+@generated function _ifelse(
+  m::Union{AbstractMask,VecUnroll{<:Any,<:Any,Bit,<:AbstractMask}},
   x::Number,
   y::ForwardDiff.Dual{TAG,V,P}
 ) where {TAG,V,P}
@@ -184,8 +184,8 @@ end
     ForwardDiff.Dual{$TAG}(z, ForwardDiff.Partials(p))
   end
 end
-@generated function ifelse(
-  m::AbstractMask,
+@generated function _ifelse(
+  m::Union{AbstractMask,VecUnroll{<:Any,<:Any,Bit,<:AbstractMask}},
   x::ForwardDiff.Dual{TAG,V,P},
   y::Number
 ) where {TAG,V,P}
@@ -197,6 +197,14 @@ end
     ForwardDiff.Dual{$TAG}(z, ForwardDiff.Partials(p))
   end
 end
+@inline ifelse(m::AbstractMask, x::ForwardDiff.Dual, y::Number) = _ifelse(m, x, y)
+@inline ifelse(m::AbstractMask, x::ForwardDiff.Dual, y::ForwardDiff.Dual) = _ifelse(m, x, y)
+@inline ifelse(m::AbstractMask, y::Number, x::ForwardDiff.Dual) = _ifelse(m, y, x)
+
+@inline ifelse(m::VecUnroll{<:Any,<:Any,Bit,<:AbstractMask}, x::ForwardDiff.Dual, y::Number) = _ifelse(m, x, y)
+@inline ifelse(m::VecUnroll{<:Any,<:Any,Bit,<:AbstractMask}, x::ForwardDiff.Dual, y::ForwardDiff.Dual) = _ifelse(m, x, y)
+@inline ifelse(m::VecUnroll{<:Any,<:Any,Bit,<:AbstractMask}, y::Number, x::ForwardDiff.Dual) = _ifelse(m, y, x)
+
 @inline function SLEEFPirates.softplus(x::ForwardDiff.Dual{TAG}) where {TAG}
   val = ForwardDiff.value(x)
   expx = exp(val)

src/reconstruct_loopset.jl

@@ -27,7 +27,7 @@ Base.promote_rule(
   ::Type{UpperBoundedInteger{N,T}},
   ::Type{T}
 ) where {N,T<:Base.BitInteger} = T
-Base.convert(::Type{T}, i::UpperBoundedInteger) where {T<:Number} =
+Base.convert(::Type{T}, i::UpperBoundedInteger) where {T<:Integer} =
   convert(T, i.i)
 Base.convert(
   ::Type{UpperBoundedInteger{N,T}},