diff --git a/pyop2/codegen/rep2loopy.py b/pyop2/codegen/rep2loopy.py index 916eb2f30..c083dd605 100644 --- a/pyop2/codegen/rep2loopy.py +++ b/pyop2/codegen/rep2loopy.py @@ -126,7 +126,7 @@ def generate_preambles(self, target): pass def with_types(self, arg_id_to_dtype, callables_table): - dtypes = OrderedDict() + dtypes = {} for i in range(len(arg_id_to_dtype)): if arg_id_to_dtype.get(i) is None: # the types provided aren't mature enough to specialize the @@ -416,7 +416,7 @@ def generate(builder, wrapper_name=None): parameters.layer_end = builder.layer_extents[1].name parameters.conditions = [] parameters.kernel_data = list(None for _ in parameters.wrapper_arguments) - parameters.temporaries = OrderedDict() + parameters.temporaries = {} parameters.kernel_name = builder.kernel.name # replace Materialise diff --git a/pyop2/op2.py b/pyop2/op2.py index f4e9be0f9..98c09f727 100644 --- a/pyop2/op2.py +++ b/pyop2/op2.py @@ -56,7 +56,6 @@ from pyop2.parloop import (GlobalLegacyArg, DatLegacyArg, MixedDatLegacyArg, # noqa: F401 MatLegacyArg, MixedMatLegacyArg, LegacyParloop, ParLoop) -import loopy __all__ = ['configuration', 'READ', 'WRITE', 'RW', 'INC', 'MIN', 'MAX', 'ON_BOTTOM', 'ON_TOP', 'ON_INTERIOR_FACETS', 'ALL', @@ -70,9 +69,6 @@ _initialised = False -# turn off loopy caching because pyop2 kernels are cached already -loopy.set_caching_enabled(False) - def initialised(): """Check whether PyOP2 has been yet initialised but not yet finalised."""