Merge branch 'master' into patch-1

Author: chriselrod

src/modeling/determinestrategy.jl

@@ -1739,7 +1739,7 @@ function choose_order_cost(ls::LoopSet, v::Int = 0)
     return torder,
     tunroll,
     ttile,
-    tvec,
+    isone(ls.vector_width) ? Symbol("##not#vectorized##") : tvec,
     tU,
     tT,
     Core.ifelse(mismatched, Inf, tc),
@@ -1751,7 +1751,7 @@ function choose_order_cost(ls::LoopSet, v::Int = 0)
     return uorder,
     uunroll,
     Symbol("##undefined##"),
-    uvec,
+    isone(ls.vector_width) ? Symbol("##not#vectorized##") : uvec,
     UF,
     -1,
     Core.ifelse(mismatched, Inf, uc),