macos_syscomopat (#93)

Author: makslevental

.github/workflows/test.yml

@@ -21,6 +21,9 @@ concurrency:
   group: ci-build-test-${{ github.event.number || github.sha }}
   cancel-in-progress: true
 
+env:
+  SYSTEM_VERSION_COMPAT: 0
+
 jobs:
 
   test-mlir-bindings:

mlir/extras/runtime/passes.py

@@ -261,7 +261,7 @@ def mat_product_kernel(
         y = arith.constant(1, index=True)
         one = arith.constant(1.0, type=dtype)
         tmp = arith.constant(0, type=dtype)
-        for k, tmp in scf.range_(K, iter_args=[tmp]):
+        for k, tmp, _ in scf.range_(K, iter_args=[tmp]):
             tmp += A[x, k] * B[k, y]
             tmp = yield tmp
         C[x, y] = tmp + one

tests/test_func.py

@@ -565,7 +565,7 @@ def mat_product_kernel[
 
         one = arith.constant(1.0, type=dtype)
         tmp = arith.constant(0, type=dtype)
-        for k, tmp in scf.range_(K, iter_args=[tmp]):
+        for k, tmp, _ in scf.range_(K, iter_args=[tmp]):
             tmp += A[x, k] * B[k, y]
             tmp = scf.yield_(tmp)
         C[x, y] = tmp + one

tests/test_gpu.py

@@ -501,7 +501,7 @@ def test_move_slice(ctx: MLIRContext):
 
 def test_for_loops(ctx: MLIRContext):
     mem = alloc((10, 10), T.i32())
-    for i, it_mem in range_(0, 10, iter_args=[mem]):
+    for i, it_mem, _res in range_(0, 10, iter_args=[mem]):
         it_mem[i, i] = it_mem[i, i] + it_mem[i, i]
         res = yield_(it_mem)
 
@@ -532,7 +532,7 @@ def test_for_loops_canonicalizer(ctx: MLIRContext):
     @canonicalize(using=canonicalizer)
     def tenfoo():
         mem = alloc((10, 10), T.i32())
-        for i, it_mem in range_(0, 10, iter_args=[mem]):
+        for i, it_mem, _ in range_(0, 10, iter_args=[mem]):
             it_mem[i, i] = it_mem[i, i] + it_mem[i, i]
             res = yield it_mem
 

tests/test_memref.py

@@ -501,7 +501,7 @@ def test_setting_memref_diagonal(ctx: MLIRContext, backend: LLVMJITBackend):
     @func
     @canonicalize(using=canonicalizer)
     def memfoo(mem: ranked_memref_kxk_f32):
-        for i, it_mem in range_(0, K, iter_args=[mem]):
+        for i, it_mem, _ in range_(0, K, iter_args=[mem]):
             it_mem[i, i] = it_mem[i, i] + it_mem[i, i] * sitofp(
                 T.f32(), index_cast(T.i32(), i)
             )
@@ -559,8 +559,8 @@ def test_memref_double_loop(ctx: MLIRContext, backend: LLVMJITBackend):
     @func
     @canonicalize(using=canonicalizer)
     def memfoo(mem: ranked_memref_kxk_f32):
-        for i, it_mem in range_(0, K, iter_args=[mem]):
-            for j, it_mem in range_(0, K, iter_args=[it_mem]):
+        for i, it_mem, _ in range_(0, K, iter_args=[mem]):
+            for j, it_mem, _ in range_(0, K, iter_args=[it_mem]):
                 it_mem[i, j] = (
                     it_mem[i, j]
                     + it_mem[i, j]

tests/test_runtime.py

@@ -159,7 +159,7 @@ def test_for_bare(ctx: MLIRContext):
     two = constant(1.0)
 
     _i = 0
-    for i, (i1, i2) in range_(0, 10, iter_args=[one, two]):
+    for i, (i1, i2), _ in range_(0, 10, iter_args=[one, two]):
         _i += 1
         assert (
             isinstance(i, Scalar)
@@ -236,7 +236,7 @@ def foo():
         two = constant(1.0)
 
         _i = 0
-        for i, i1 in range_(0, 10, iter_args=[one]):
+        for i, i1, _ in range_(0, 10, iter_args=[one]):
             _i += 1
             assert isinstance(i, Scalar) and str(i) == "Scalar(%arg0, index)"
             assert isinstance(i1, Scalar) and str(i1) == "Scalar(%arg1, f32)"
@@ -274,7 +274,7 @@ def foo():
         two = constant(1.0)
 
         _i = 0
-        for i, (i1, i2) in range_(0, 10, iter_args=[one, two]):
+        for i, (i1, i2), _ in range_(0, 10, iter_args=[one, two]):
             _i += 1
             assert isinstance(i, Scalar) and str(i) == "Scalar(%arg0, index)"
             assert isinstance(i1, Scalar) and str(i1) == "Scalar(%arg1, f32)"
@@ -1828,7 +1828,7 @@ def iffoo():
         two = constant(2.0)
         if one < two:
             three = constant(3.0)
-            for i, it in range_(0, 10, iter_args=[three]):
+            for i, it, _ in range_(0, 10, iter_args=[three]):
                 four = constant(4.0)
                 res = yield four
             res = yield res
@@ -1876,7 +1876,7 @@ def iffoo():
         two = constant(2.0)
         if one < two:
             three = constant(3.0)
-            for i, it in range_(0, 10, iter_args=[three]):
+            for i, it, _ in range_(0, 10, iter_args=[three]):
                 four = constant(4.0)
                 if one < two:
                     five = constant(5.0)
@@ -1888,7 +1888,7 @@ def iffoo():
             res = yield res
         else:
             seven = constant(7.0)
-            for i, it in range_(0, 10, iter_args=[seven]):
+            for i, it, _ in range_(0, 10, iter_args=[seven]):
                 res = yield it
             res = yield res
         return

tests/test_scf.py

@@ -332,7 +332,7 @@ def test_fold_1(ctx: MLIRContext):
 
 def test_for_loops(ctx: MLIRContext):
     ten = empty(7, 22, 333, 4444, T.i32())
-    for i, r1 in range_(0, 10, iter_args=[ten]):
+    for i, r1, _ in range_(0, 10, iter_args=[ten]):
         y = r1 + r1
         res = yield_(y)
 
@@ -360,7 +360,7 @@ def test_for_loops_canonicalizer(ctx: MLIRContext):
     @canonicalize(using=canonicalizer)
     def tenfoo():
         ten = empty(7, 22, 333, 4444, T.i32())
-        for i, r1 in range_(0, 10, iter_args=[ten]):
+        for i, r1, _ in range_(0, 10, iter_args=[ten]):
             y = r1 + r1
             res = yield y