Merge pull request #8469 from apmasell/issue8453

Correctly handle optional types in parfors lowering

numba/parfors/parfor_lowering.py

@@ -1807,8 +1807,14 @@ def load_potential_tuple_var(x):
         else:
             if i < num_inps:
                 # Scalar input, need to store the value in an array of size 1
-                typ = (context.get_data_type(aty)
-                       if not isinstance(aty, types.Boolean)
+                if isinstance(aty, types.Optional):
+                    # Unpack optional type
+                    unpacked_aty = aty.type
+                    arg = context.cast(builder, arg, aty, unpacked_aty)
+                else:
+                    unpacked_aty = aty
+                typ = (context.get_data_type(unpacked_aty)
+                       if not isinstance(unpacked_aty, types.Boolean)
                        else llvmlite.ir.IntType(1))
                 ptr = cgutils.alloca_once(builder, typ)
                 builder.store(arg, ptr)

numba/tests/test_parfors.py

@@ -236,6 +236,8 @@ def copy_args(*args):
                     new_args.append(x.copy())
                 elif isinstance(x, numbers.Number):
                     new_args.append(x)
+                elif x is None:
+                    new_args.append(x)
                 elif isinstance(x, tuple):
                     new_args.append(copy.deepcopy(x))
                 elif isinstance(x, list):
@@ -2130,6 +2132,18 @@ def test_impl(a, b, size):
         self.assertEqual(countParfors(test_impl, cptypes), 2)
         self.check(test_impl, a, b, size)
 
+    def test_prange_optional(self):
+        def test_impl(arr, pred=None):
+            for i in prange(1):
+                if pred is not None:
+                    arr[i] = 0.0
+
+        arr = np.ones(10)
+        self.check(test_impl, arr, None,
+                   check_arg_equality=[np.testing.assert_almost_equal,
+                                       lambda x, y: x == y])
+        self.assertEqual(arr.sum(), 10.0)
+
     def test_untraced_value_tuple(self):
         # This is a test for issue #6478.
         def test_impl():