Merge branch 'martijn/expr-interpreter' of ssh://github.com/halide/halide into martijn/expr-interpreter

Author: mcourteaux

src/ExprInterpreter.cpp

@@ -664,8 +664,8 @@ void test_scalar_equivalence() {
         << ", Got: " << std::get<int64_t>(eval_res.lanes[0]);
 
     // 2. Float scalar math equivalence
-    using std::sin;
     using Halide::sin;
+    using std::sin;
     auto math_test_float = [](const auto &x, const auto &y) {
         return (x * y) - sin(x / (y + 1.0f));
     };

test/internal.cpp

@@ -5,6 +5,7 @@
 #include "CSE.h"
 #include "CodeGen_C.h"
 #include "Deinterleave.h"
+#include "ExprInterpreter.h"
 #include "Func.h"
 #include "Generator.h"
 #include "IR.h"