Expunge COFFEE (#697)

pyop2/codegen/loopycompat.py

@@ -172,7 +172,6 @@ def _match_caller_callee_argument_dimension_(program, callee_function_name):
         invocations would demand complex renaming logic which is not
         implemented yet.
     """
-
     assert isinstance(program, TranslationUnit)
     assert isinstance(callee_function_name, str)
     assert callee_function_name not in program.entrypoints

pyop2/codegen/rep2loopy.py

@@ -552,22 +552,16 @@ def renamer(expr):
         headers = headers | set(["#include <petsclog.h>"])
     preamble = "\n".join(sorted(headers))
 
-    from coffee.base import Node
-    from loopy.kernel.function_interface import CallableKernel
-
     if isinstance(kernel.code, loopy.TranslationUnit):
         knl = kernel.code
         wrapper = loopy.merge([wrapper, knl])
-        names = knl.callables_table
-        for name in names:
-            if isinstance(wrapper.callables_table[name], CallableKernel):
-                wrapper = _match_caller_callee_argument_dimension_(wrapper, name)
+        # remove the local kernel from the available entrypoints
+        wrapper = wrapper.copy(entrypoints=wrapper.entrypoints-{kernel.name})
+        wrapper = _match_caller_callee_argument_dimension_(wrapper, kernel.name)
     else:
         # kernel is a string, add it to preamble
-        if isinstance(kernel.code, Node):
-            code = kernel.code.gencode()
-        else:
-            code = kernel.code
+        assert isinstance(kernel.code, str)
+        code = kernel.code
         wrapper = loopy.register_callable(
             wrapper,
             kernel.name,

pyop2/local_kernel.py

@@ -3,7 +3,6 @@
 import hashlib
 from typing import Union
 
-import coffee
 import loopy as lp
 from loopy.tools import LoopyKeyBuilder
 import numpy as np
@@ -36,8 +35,6 @@ def Kernel(code, name, **kwargs):
     """
     if isinstance(code, str):
         return CStringLocalKernel(code, name, **kwargs)
-    elif isinstance(code, coffee.base.Node):
-        return CoffeeLocalKernel(code, name, **kwargs)
     elif isinstance(code, (lp.LoopKernel, lp.TranslationUnit)):
         return LoopyLocalKernel(code, name, **kwargs)
     else:
@@ -120,9 +117,7 @@ def cache_key(self):
     @cached_property
     def _immutable_cache_key(self):
         # We need this function because self.accesses is mutable due to legacy support
-        if isinstance(self.code, coffee.base.Node):
-            code = self.code.gencode()
-        elif isinstance(self.code, lp.TranslationUnit):
+        if isinstance(self.code, lp.TranslationUnit):
             key_hash = hashlib.sha256()
             self.code.update_persistent_hash(key_hash, LoopyKeyBuilder())
             code = key_hash.hexdigest()
@@ -160,10 +155,7 @@ def num_flops(self):
         if not configuration["compute_kernel_flops"]:
             return 0
 
-        if isinstance(self.code, coffee.base.Node):
-            v = coffee.visitors.EstimateFlops()
-            return v.visit(self.code)
-        elif isinstance(self.code, lp.TranslationUnit):
+        if isinstance(self.code, lp.TranslationUnit):
             op_map = lp.get_op_map(
                 self.code.copy(options=lp.Options(ignore_boostable_into=True),
                                silenced_warnings=['insn_count_subgroups_upper_bound',
@@ -195,8 +187,8 @@ class CStringLocalKernel(LocalKernel):
     """:class:`LocalKernel` class where `code` is a string of C code.
 
     :kwarg dtypes: Iterable of datatypes (either `np.dtype` or `str`) for
-        each kernel argument. This is not required for :class:`CoffeeLocalKernel`
-        or :class:`LoopyLocalKernel` because it can be inferred.
+        each kernel argument. This is not required for :class:`LoopyLocalKernel`
+        because it can be inferred.
 
     All other `__init__` parameters are the same.
     """
@@ -215,23 +207,6 @@ def dtypes(self, dtypes):
         self._dtypes = dtypes
 
 
-class CoffeeLocalKernel(LocalKernel):
-    """:class:`LocalKernel` class where `code` has type :class:`coffee.base.Node`."""
-
-    @validate_type(("code", coffee.base.Node, TypeError))
-    def __init__(self, code, name, accesses=None, dtypes=None, **kwargs):
-        super().__init__(code, name, accesses, **kwargs)
-        self._dtypes = dtypes
-
-    @property
-    def dtypes(self):
-        return self._dtypes
-
-    @dtypes.setter
-    def dtypes(self, dtypes):
-        self._dtypes = dtypes
-
-
 class LoopyLocalKernel(LocalKernel):
     """:class:`LocalKernel` class where `code` has type :class:`loopy.LoopKernel`
         or :class:`loopy.TranslationUnit`.

pyop2/op2.py

@@ -48,7 +48,7 @@
 from pyop2.types import (READ, WRITE, RW, INC, MIN, MAX,
                          ON_BOTTOM, ON_TOP, ON_INTERIOR_FACETS, ALL)
 
-from pyop2.local_kernel import CStringLocalKernel, LoopyLocalKernel, CoffeeLocalKernel, Kernel  # noqa: F401
+from pyop2.local_kernel import CStringLocalKernel, LoopyLocalKernel, Kernel  # noqa: F401
 from pyop2.global_kernel import (GlobalKernelArg, DatKernelArg, MixedDatKernelArg,  # noqa: F401
                                  MatKernelArg, MixedMatKernelArg, MapKernelArg, GlobalKernel)
 from pyop2.parloop import (GlobalParloopArg, DatParloopArg, MixedDatParloopArg,  # noqa: F401

pyop2/parloop.py

@@ -14,7 +14,7 @@
 from pyop2.exceptions import KernelTypeError, MapValueError, SetTypeError
 from pyop2.global_kernel import (GlobalKernelArg, DatKernelArg, MixedDatKernelArg,
                                  MatKernelArg, MixedMatKernelArg, GlobalKernel)
-from pyop2.local_kernel import LocalKernel, CStringLocalKernel, CoffeeLocalKernel, LoopyLocalKernel
+from pyop2.local_kernel import LocalKernel, CStringLocalKernel, LoopyLocalKernel
 from pyop2.types import (Access, Global, AbstractDat, Dat, DatView, MixedDat, Mat, Set,
                          MixedSet, ExtrudedSet, Subset, Map, ComposedMap, MixedMap)
 from pyop2.utils import cached_property
@@ -624,7 +624,7 @@ def LegacyParloop(local_knl, iterset, *args, **kwargs):
 
     # finish building the local kernel
     local_knl.accesses = tuple(a.access for a in args)
-    if isinstance(local_knl, (CStringLocalKernel, CoffeeLocalKernel)):
+    if isinstance(local_knl, CStringLocalKernel):
         local_knl.dtypes = tuple(a.data.dtype for a in args)
 
     global_knl_args = tuple(a.global_kernel_arg for a in args)

requirements-git.txt

@@ -1,2 +1 @@
-git+https://github.com/coneoproject/COFFEE.git#egg=coffee
 git+https://github.com/firedrakeproject/loopy.git@main#egg=loopy

setup.py

@@ -89,11 +89,8 @@ def get_petsc_dir():
     'decorator',
     'mpi4py',
     'numpy>=1.6',
-    'COFFEE',
 ]
 
-dep_links = ['git+https://github.com/coneoproject/COFFEE#egg=COFFEE-dev']
-
 version = sys.version_info[:2]
 
 if version < (3, 6):
@@ -141,7 +138,6 @@ def run(self):
           'Programming Language :: Python :: 3.6',
       ],
       install_requires=install_requires + test_requires,
-      dependency_links=dep_links,
       packages=['pyop2', 'pyop2.codegen', 'pyop2.types'],
       package_data={
           'pyop2': ['assets/*', '*.h', '*.pxd', '*.pyx', 'codegen/c/*.c']},

test/unit/test_caching.py

@@ -40,8 +40,6 @@
 from pyop2 import op2, mpi
 from pyop2.caching import disk_cached
 
-from coffee.base import *
-
 
 def _seed():
     return 0.02041724
@@ -419,11 +417,7 @@ def test_vector_map(self, iterset, x2, iter2ind2):
     def test_same_iteration_space_works(self, iterset, x2, iter2ind2):
         self.cache.clear()
         assert len(self.cache) == 0
-        kernel_code = FunDecl("void", "k",
-                              [Decl("int*", c_sym("x"), qualifiers=["unsigned"])],
-                              c_for("i", 1, ""),
-                              pred=["static"])
-        k = op2.Kernel(kernel_code.gencode(), 'k')
+        k = op2.Kernel("""static void k(void *x) {}""", 'k')
 
         op2.par_loop(k, iterset,
                      x2(op2.INC, iter2ind2))

test/unit/test_extrusion.py

@@ -72,8 +72,6 @@ def compute_ind_extr(nums,
     return ind
 
 
-from coffee.base import *
-
 # Data type
 valuetype = numpy.float64
 
@@ -333,45 +331,6 @@ def extrusion_kernel():
     return op2.Kernel(kernel_code, "extrusion")
 
 
-@pytest.fixture
-def vol_comp():
-    init = FlatBlock("""
-double area = x[0][0]*(x[2][1]-x[4][1]) + x[2][0]*(x[4][1]-x[0][1])
-           + x[4][0]*(x[0][1]-x[2][1]);
-if (area < 0)
-area = area * (-1.0);
-""")
-    assembly = Incr(Symbol("A", ("i0", "i1")),
-                    FlatBlock("0.5 * area * (x[1][2] - x[0][2])"))
-    assembly = c_for("i0", 6, c_for("i1", 6, assembly))
-    kernel_code = FunDecl("void", "vol_comp",
-                          [Decl("double", Symbol("A", (6, 6))),
-                           Decl("double", Symbol("x", (6, 3)))],
-                          Block([init, assembly], open_scope=False),
-                          pred=["static"])
-    return op2.Kernel(kernel_code.gencode(), "vol_comp")
-
-
-@pytest.fixture
-def vol_comp_rhs():
-    init = FlatBlock("""
-double area = x[0][0]*(x[2][1]-x[4][1]) + x[2][0]*(x[4][1]-x[0][1])
-           + x[4][0]*(x[0][1]-x[2][1]);
-if (area < 0)
-area = area * (-1.0);
-""")
-    assembly = Incr(Symbol("A", ("i0",)),
-                    FlatBlock("0.5 * area * (x[1][2] - x[0][2]) * y[0]"))
-    assembly = c_for("i0", 6, assembly)
-    kernel_code = FunDecl("void", "vol_comp_rhs",
-                          [Decl("double", Symbol("A", (6,))),
-                           Decl("double", Symbol("x", (6, 3))),
-                           Decl("int", Symbol("y", (1,)))],
-                          Block([init, assembly], open_scope=False),
-                          pred=["static"])
-    return op2.Kernel(kernel_code.gencode(), "vol_comp_rhs")
-
-
 class TestExtrusion:
 
     """
@@ -423,7 +382,7 @@ def test_extruded_layer_arg(self, elements, field_map, dat_f):
                      pass_layer_arg=True)
         end = layers - 1
         start = 0
-        ref = np.arange(start, end)
+        ref = numpy.arange(start, end)
         assert [dat_f.data[end*n:end*(n+1)] == ref
                 for n in range(int(len(dat_f.data)/end) - 1)]
 

test/unit/test_indirect_loop.py

@@ -38,8 +38,6 @@
 from pyop2 import op2
 from pyop2.exceptions import MapValueError
 
-from coffee.base import *
-
 
 nelems = 4096
 
@@ -265,14 +263,11 @@ def test_mixed_non_mixed_dat(self, mdat, mmap, iterset):
     def test_mixed_non_mixed_dat_itspace(self, mdat, mmap, iterset):
         """Increment into a MixedDat from a Dat using iteration spaces."""
         d = op2.Dat(iterset, np.ones(iterset.size))
-        assembly = Incr(Symbol("d", ("j",)), Symbol("x", (0,)))
-        assembly = c_for("j", 2, assembly)
-        kernel_code = FunDecl("void", "inc",
-                              [Decl("double", c_sym("*d")),
-                               Decl("double", c_sym("*x"))],
-                              Block([assembly], open_scope=False),
-                              pred=["static"])
-        op2.par_loop(op2.Kernel(kernel_code.gencode(), "inc"), iterset,
+        kernel_inc = """static void inc(double *d, double *x) {
+          for (int i=0; i<2; ++i)
+            d[i] += x[0];
+        }"""
+        op2.par_loop(op2.Kernel(kernel_inc, "inc"), iterset,
                      mdat(op2.INC, mmap),
                      d(op2.READ))
         assert all(mdat[0].data == 1.0) and mdat[1].data == 4096.0