Fix the worst Intel bugs (pyccel#2002)

This PR incorporate pyccel#1999 into the `devel` branch. pyccel#1999 included a
workaround for an intel compiler bug.
In the `devel` branch the intel branch wasn't working due to pyccel#2001 .
This bug is not present in the `main` branch as there is a memory leak
when returning arrays from functions (these arrays are never freed). The
fix for this is non-standard and does not work with the Intel compiler.
This is documented in pyccel#2001 however, for now, to prevent further Intel
bugs being introduced without us noticing, the call to `free` is
deactivated for the Intel compiler. This allows the tests to pass

Author: EmilyBourne

CHANGELOG.md

@@ -108,7 +108,7 @@ All notable changes to this project will be documented in this file.
 -   \[INTERNALS\] Remove unused/unnecessary functions in `pyccel.parser.utilities` : `read_file`, `header_statement`, `accelerator_statement`, `get_module_name`, `view_tree`.
 -   \[INTERNALS\] Remove unused functions `Errors.unset_target`, and `Errors.reset_target`.
 
-## \[1.12.1\] - 2024-09-27
+## \[1.12.1\] - 2024-10-01
 
 ### Added
 

pyccel/ast/builtins.py

@@ -288,8 +288,7 @@ def __new__(cls, arg0, arg1=LiteralFloat(0)):
         return super().__new__(cls)
 
     def __init__(self, arg0, arg1 = LiteralFloat(0)):
-        self._is_cast = isinstance(arg0.dtype.primitive_type, PrimitiveComplexType) and \
-                        isinstance(arg1, Literal) and arg1.python_value == 0
+        self._is_cast = isinstance(arg1, Literal) and arg1.python_value == 0
 
         if self._is_cast:
             self._real_part = self._real_cast(arg0)

pyccel/codegen/pipeline.py

@@ -191,7 +191,7 @@ def handle_error(stage):
     # Get compiler object
     Compiler.acceptable_bin_paths = get_condaless_search_path(conda_warnings)
     src_compiler = Compiler(compiler, language, debug)
-    wrapper_compiler = Compiler('GNU', 'c', debug)
+    wrapper_compiler = Compiler(compiler, 'c', debug)
 
     # Export the compiler information if requested
     if compiler_export_file:

pyccel/codegen/printing/fcode.py

@@ -1547,8 +1547,11 @@ def _print_PythonFloat(self, expr):
     def _print_PythonComplex(self, expr):
         kind = self.print_kind(expr)
         if expr.is_cast:
-            var = self._print(expr.internal_var)
-            code = f'cmplx({var}, kind = {kind})'
+            var = expr.internal_var
+            if isinstance(var.class_type.primitive_type, PrimitiveBooleanType):
+                var = PythonInt(var)
+            var_code = self._print(var)
+            code = f'cmplx({var_code}, kind = {kind})'
         else:
             real = self._print(expr.real)
             imag = self._print(expr.imag)

pyccel/stdlib/cwrapper/cwrapper.c

@@ -168,7 +168,10 @@ void get_strides_and_shape_from_numpy_array(PyObject* arr, int64_t shape[], int6
 
 void capsule_cleanup(PyObject *capsule) {
     void *memory = PyCapsule_GetPointer(capsule, NULL);
+    // TODO: Correct free method. See #2001
+#ifndef __INTEL_LLVM_COMPILER
     free(memory);
+#endif
 }
 
 #ifdef _WIN32

tests/epyccel/recognised_functions/test_numpy_types.py

@@ -7,7 +7,7 @@
 from test_numpy_funcs import (min_int, max_int, min_int8, max_int8,
                                 min_int16, max_int16, min_int32, max_int32, max_int64, min_int64)
 from test_numpy_funcs import max_float, min_float, max_float32, min_float32,max_float64, min_float64
-from test_numpy_funcs import matching_types
+from test_numpy_funcs import matching_types, RTOL, ATOL, RTOL32, ATOL32
 
 from pyccel.decorators import template
 from pyccel import epyccel
@@ -190,13 +190,11 @@ def get_bool(a : 'T'):
     assert f_integer32_output == test_int32_output
     assert matching_types(f_integer32_output, test_int32_output)
 
-    # the if block should be removed after resolving (https://github.com/pyccel/pyccel/issues/735).
-    if sys.platform != 'win32':
-        f_integer64_output = epyccel_func(integer64)
-        test_int64_output = get_bool(integer64)
+    f_integer64_output = epyccel_func(integer64)
+    test_int64_output = get_bool(integer64)
 
-        assert f_integer64_output == test_int64_output
-        assert matching_types(f_integer64_output, test_int64_output)
+    assert f_integer64_output == test_int64_output
+    assert matching_types(f_integer64_output, test_int64_output)
 
     f_fl_output = epyccel_func(fl)
     test_float_output = get_bool(fl)
@@ -312,31 +310,29 @@ def test_numpy_int_scalar(language, function_boundaries):
     assert f_integer32_output == test_int32_output
     assert matching_types(f_integer32_output, test_int32_output)
 
-    # the if block should be removed after resolving (https://github.com/pyccel/pyccel/issues/735).
-    if sys.platform != 'win32':
-        f_integer64_output = epyccel_func(integer64)
-        test_int64_output = get_int(integer64)
+    f_integer64_output = epyccel_func(integer64)
+    test_int64_output = get_int(integer64)
 
-        assert f_integer64_output == test_int64_output
-        assert matching_types(f_integer64_output, test_int64_output)
+    assert f_integer64_output == test_int64_output
+    assert matching_types(f_integer64_output, test_int64_output)
 
-        f_fl_output = epyccel_func(fl)
-        test_float_output = get_int(fl)
+    f_fl_output = epyccel_func(fl)
+    test_float_output = get_int(fl)
 
-        assert f_fl_output == test_float_output
-        assert matching_types(f_fl_output, test_float_output)
+    assert f_fl_output == test_float_output
+    assert matching_types(f_fl_output, test_float_output)
 
-        f_fl64_output = epyccel_func(fl64)
-        test_float64_output = get_int(fl64)
+    f_fl64_output = epyccel_func(fl64)
+    test_float64_output = get_int(fl64)
 
-        assert f_fl64_output == test_float64_output
-        assert matching_types(f_fl64_output, test_float64_output)
+    assert f_fl64_output == test_float64_output
+    assert matching_types(f_fl64_output, test_float64_output)
 
-        f_fl32_output = epyccel_func(fl32)
-        test_float32_output = get_int(fl32)
+    f_fl32_output = epyccel_func(fl32)
+    test_float32_output = get_int(fl32)
 
-        assert f_fl32_output == test_float32_output
-        assert matching_types(f_fl32_output, test_float32_output)
+    assert f_fl32_output == test_float32_output
+    assert matching_types(f_fl32_output, test_float32_output)
 
 @template('T', ['bool[:]', 'int[:]', 'int8[:]', 'int16[:]', 'int32[:]', 'int64[:]', 'float[:]', 'float32[:]', 'float64[:]'])
 def get_int64_arr_1d(arr : 'T'):
@@ -399,12 +395,10 @@ def test_numpy_int_array_like_1d(language, function_boundaries):
     assert epyccel_func(integer16) == get_int(integer16)
     assert epyccel_func(integer) == get_int(integer)
     assert epyccel_func(integer32) == get_int(integer32)
-    # the if block should be removed after resolving (https://github.com/pyccel/pyccel/issues/735).
-    if sys.platform != 'win32':
-        assert epyccel_func(integer64) == get_int(integer64)
-        assert epyccel_func(fl) == get_int(fl)
-        assert epyccel_func(fl64) == get_int(fl64)
-        assert epyccel_func(fl32) == get_int(fl32)
+    assert epyccel_func(integer64) == get_int(integer64)
+    assert epyccel_func(fl) == get_int(fl)
+    assert epyccel_func(fl64) == get_int(fl64)
+    assert epyccel_func(fl32) == get_int(fl32)
 
 @template('T', ['bool[:,:]', 'int[:,:]', 'int8[:,:]', 'int16[:,:]', 'int32[:,:]', 'int64[:,:]', 'float[:,:]', 'float32[:,:]', 'float64[:,:]'])
 def get_int64_arr_2d(arr : 'T'):
@@ -467,12 +461,10 @@ def test_numpy_int_array_like_2d(language, function_boundaries):
     assert epyccel_func(integer16) == get_int(integer16)
     assert epyccel_func(integer) == get_int(integer)
     assert epyccel_func(integer32) == get_int(integer32)
-    # the if block should be removed after resolving (https://github.com/pyccel/pyccel/issues/735).
-    if sys.platform != 'win32':
-        assert epyccel_func(integer64) == get_int(integer64)
-        assert epyccel_func(fl) == get_int(fl)
-        assert epyccel_func(fl64) == get_int(fl64)
-        assert epyccel_func(fl32) == get_int(fl32)
+    assert epyccel_func(integer64) == get_int(integer64)
+    assert epyccel_func(fl) == get_int(fl)
+    assert epyccel_func(fl64) == get_int(fl64)
+    assert epyccel_func(fl32) == get_int(fl32)
 
 @template('T', ['bool', 'int', 'int8', 'int16', 'int32', 'int64', 'float', 'float32', 'float64'])
 def get_float(a : 'T'):
@@ -550,13 +542,11 @@ def test_numpy_float_scalar(language, get_float):
     assert f_integer32_output == test_int32_output
     assert matching_types(f_integer32_output, test_int32_output)
 
-    # the if block should be removed after resolving (https://github.com/pyccel/pyccel/issues/735).
-    if sys.platform != 'win32':
-        f_integer64_output = epyccel_func(integer64)
-        test_int64_output = get_float(integer64)
+    f_integer64_output = epyccel_func(integer64)
+    test_int64_output = get_float(integer64)
 
-        assert f_integer64_output == test_int64_output
-        assert matching_types(f_integer64_output, test_int64_output)
+    assert f_integer64_output == test_int64_output
+    assert matching_types(f_integer64_output, test_int64_output)
 
     f_fl_output = epyccel_func(fl)
     test_float_output = get_float(fl)
@@ -616,11 +606,9 @@ def test_numpy_float_array_like_1d(language, get_float):
     assert epyccel_func(integer16) == get_float(integer16)
     assert epyccel_func(integer) == get_float(integer)
     assert epyccel_func(integer32) == get_float(integer32)
-    # the if block should be removed after resolving (https://github.com/pyccel/pyccel/issues/735).
-    if sys.platform != 'win32':
-        assert epyccel_func(integer64) == get_float(integer64)
-        assert epyccel_func(fl) == get_float(fl)
-        assert epyccel_func(fl64) == get_float(fl64)
+    assert epyccel_func(integer64) == get_float(integer64)
+    assert epyccel_func(fl) == get_float(fl)
+    assert epyccel_func(fl64) == get_float(fl64)
     assert epyccel_func(fl32) == get_float(fl32)
 
 @template('T', ['bool[:,:]', 'int[:,:]', 'int8[:,:]', 'int16[:,:]', 'int32[:,:]', 'int64[:,:]', 'float[:,:]', 'float32[:,:]', 'float64[:,:]'])
@@ -662,11 +650,9 @@ def test_numpy_float_array_like_2d(language, get_float):
     assert epyccel_func(integer16) == get_float(integer16)
     assert epyccel_func(integer) == get_float(integer)
     assert epyccel_func(integer32) == get_float(integer32)
-    # the if block should be removed after resolving (https://github.com/pyccel/pyccel/issues/735).
-    if sys.platform != 'win32':
-        assert epyccel_func(integer64) == get_float(integer64)
-        assert epyccel_func(fl) == get_float(fl)
-        assert epyccel_func(fl64) == get_float(fl64)
+    assert epyccel_func(integer64) == get_float(integer64)
+    assert epyccel_func(fl) == get_float(fl)
+    assert epyccel_func(fl64) == get_float(fl64)
     assert epyccel_func(fl32) == get_float(fl32)
 
 def test_numpy_double_scalar(language):
@@ -727,13 +713,11 @@ def get_double(a : 'T'):
     assert f_integer32_output == test_int32_output
     assert matching_types(f_integer32_output, test_int32_output)
 
-    # the if block should be removed after resolving (https://github.com/pyccel/pyccel/issues/735).
-    if sys.platform != 'win32':
-        f_integer64_output = epyccel_func(integer64)
-        test_int64_output = get_double(integer64)
+    f_integer64_output = epyccel_func(integer64)
+    test_int64_output = get_double(integer64)
 
-        assert f_integer64_output == test_int64_output
-        assert matching_types(f_integer64_output, test_int64_output)
+    assert f_integer64_output == test_int64_output
+    assert matching_types(f_integer64_output, test_int64_output)
 
     f_fl_output = epyccel_func(fl)
     test_float_output = get_double(fl)
@@ -785,11 +769,9 @@ def get_double(arr : 'T'):
     assert epyccel_func(integer16) == get_double(integer16)
     assert epyccel_func(integer) == get_double(integer)
     assert epyccel_func(integer32) == get_double(integer32)
-    # the if block should be removed after resolving (https://github.com/pyccel/pyccel/issues/735).
-    if sys.platform != 'win32':
-        assert epyccel_func(integer64) == get_double(integer64)
-        assert epyccel_func(fl) == get_double(fl)
-        assert epyccel_func(fl64) == get_double(fl64)
+    assert epyccel_func(integer64) == get_double(integer64)
+    assert epyccel_func(fl) == get_double(fl)
+    assert epyccel_func(fl64) == get_double(fl64)
     assert epyccel_func(fl32) == get_double(fl32)
 
 def test_numpy_double_array_like_2d(language):
@@ -823,11 +805,9 @@ def get_double(arr : 'T'):
     assert epyccel_func(integer16) == get_double(integer16)
     assert epyccel_func(integer) == get_double(integer)
     assert epyccel_func(integer32) == get_double(integer32)
-    # the if block should be removed after resolving (https://github.com/pyccel/pyccel/issues/735).
-    if sys.platform != 'win32':
-        assert epyccel_func(integer64) == get_double(integer64)
-        assert epyccel_func(fl) == get_double(fl)
-        assert epyccel_func(fl64) == get_double(fl64)
+    assert epyccel_func(integer64) == get_double(integer64)
+    assert epyccel_func(fl) == get_double(fl)
+    assert epyccel_func(fl64) == get_double(fl64)
     assert epyccel_func(fl32) == get_double(fl32)
 
 
@@ -906,13 +886,11 @@ def test_numpy_complex_scalar(language, get_complex):
     assert f_integer32_output == test_int32_output
     assert matching_types(f_integer32_output, test_int32_output)
 
-    # the if block should be removed after resolving (https://github.com/pyccel/pyccel/issues/735).
-    if sys.platform != 'win32':
-        f_integer64_output = epyccel_func(integer64)
-        test_int64_output = get_complex(integer64)
+    f_integer64_output = epyccel_func(integer64)
+    test_int64_output = get_complex(integer64)
 
-        assert f_integer64_output == test_int64_output
-        assert matching_types(f_integer64_output, test_int64_output)
+    assert f_integer64_output == test_int64_output
+    assert matching_types(f_integer64_output, test_int64_output)
 
     f_fl_output = epyccel_func(fl)
     test_float_output = get_complex(fl)
@@ -986,24 +964,27 @@ def test_numpy_complex_array_like_1d(language, get_complex):
     integer32 = randint(min_int32, max_int32, size=size, dtype=np.int32)
     integer64 = randint(min_int64, max_int64, size=size, dtype=np.int64)
 
-    fl = uniform(min_float / 2, max_float / 2, size = size)
+    # float32 is used as the maximum for all float types to avoid overflow errors
+    fl = uniform(min_float32 / 2, max_float32 / 2, size = size)
     fl32 = uniform(min_float32 / 2, max_float32 / 2, size = size)
     fl32 = np.float32(fl32)
-    fl64 = uniform(min_float64 / 2, max_float64 / 2, size = size)
+    fl64 = uniform(min_float32 / 2, max_float32 / 2, size = size)
 
     epyccel_func = epyccel(get_complex, language=language)
 
-    assert epyccel_func(bl) == get_complex(bl)
-    assert epyccel_func(integer8) == get_complex(integer8)
-    assert epyccel_func(integer16) == get_complex(integer16)
-    assert epyccel_func(integer) == get_complex(integer)
-    assert epyccel_func(integer32) == get_complex(integer32)
-    # the if block should be removed after resolving (https://github.com/pyccel/pyccel/issues/735).
-    if sys.platform != 'win32':
-        assert epyccel_func(integer64) == get_complex(integer64)
-        assert epyccel_func(fl) == get_complex(fl)
-        assert epyccel_func(fl64) == get_complex(fl64)
-    assert epyccel_func(fl32) == get_complex(fl32)
+    is_complex64 = get_complex(bl)[-1].dtype == np.complex64
+    rtol = RTOL32 if is_complex64 else RTOL
+    atol = ATOL32 if is_complex64 else ATOL
+
+    assert np.allclose(epyccel_func(bl), get_complex(bl), rtol=rtol, atol=atol)
+    assert np.allclose(epyccel_func(integer8), get_complex(integer8), rtol=rtol, atol=atol)
+    assert np.allclose(epyccel_func(integer16), get_complex(integer16), rtol=rtol, atol=atol)
+    assert np.allclose(epyccel_func(integer), get_complex(integer), rtol=rtol, atol=atol)
+    assert np.allclose(epyccel_func(integer32), get_complex(integer32), rtol=rtol, atol=atol)
+    assert np.allclose(epyccel_func(integer64), get_complex(integer64), rtol=rtol, atol=atol)
+    assert np.allclose(epyccel_func(fl), get_complex(fl), rtol=rtol, atol=atol)
+    assert np.allclose(epyccel_func(fl64), get_complex(fl64), rtol=rtol, atol=atol)
+    assert np.allclose(epyccel_func(fl32), get_complex(fl32), rtol=rtol, atol=atol)
 
 @pytest.mark.parametrize( 'language', (
         pytest.param("fortran", marks = [pytest.mark.fortran]),
@@ -1028,24 +1009,27 @@ def test_numpy_complex_array_like_2d(language, get_complex):
     integer32 = randint(min_int32, max_int32, size=size, dtype=np.int32)
     integer64 = randint(min_int64, max_int64, size=size, dtype=np.int64)
 
-    fl = uniform(min_float / 2, max_float / 2, size = size)
+    # float32 is used as the maximum for all float types to avoid overflow errors
+    fl = uniform(min_float32 / 2, max_float32 / 2, size = size)
     fl32 = uniform(min_float32 / 2, max_float32 / 2, size = size)
     fl32 = np.float32(fl32)
-    fl64 = uniform(min_float64 / 2, max_float64 / 2, size = size)
+    fl64 = uniform(min_float32 / 2, max_float32 / 2, size = size)
 
     epyccel_func = epyccel(get_complex, language=language)
 
-    assert epyccel_func(bl) == get_complex(bl)
-    assert epyccel_func(integer8) == get_complex(integer8)
-    assert epyccel_func(integer16) == get_complex(integer16)
-    assert epyccel_func(integer) == get_complex(integer)
-    assert epyccel_func(integer32) == get_complex(integer32)
-    # the if block should be removed after resolving (https://github.com/pyccel/pyccel/issues/735).
-    if sys.platform != 'win32':
-        assert epyccel_func(integer64) == get_complex(integer64)
-        assert epyccel_func(fl) == get_complex(fl)
-        assert epyccel_func(fl64) == get_complex(fl64)
-    assert epyccel_func(fl32) == get_complex(fl32)
+    is_complex64 = get_complex(bl)[-1].dtype == np.complex64
+    rtol = RTOL32 if is_complex64 else RTOL
+    atol = ATOL32 if is_complex64 else ATOL
+
+    assert np.allclose(epyccel_func(bl), get_complex(bl), rtol=rtol, atol=atol)
+    assert np.allclose(epyccel_func(integer8), get_complex(integer8), rtol=rtol, atol=atol)
+    assert np.allclose(epyccel_func(integer16), get_complex(integer16), rtol=rtol, atol=atol)
+    assert np.allclose(epyccel_func(integer), get_complex(integer), rtol=rtol, atol=atol)
+    assert np.allclose(epyccel_func(integer32), get_complex(integer32), rtol=rtol, atol=atol)
+    assert np.allclose(epyccel_func(integer64), get_complex(integer64), rtol=rtol, atol=atol)
+    assert np.allclose(epyccel_func(fl), get_complex(fl), rtol=rtol, atol=atol)
+    assert np.allclose(epyccel_func(fl64), get_complex(fl64), rtol=rtol, atol=atol)
+    assert np.allclose(epyccel_func(fl32), get_complex(fl32), rtol=rtol, atol=atol)
 
 def test_literal_complex64(language):
     def get_complex64():