advection tweaks

examples/taylor_green/taylor_green_monoscale.py

@@ -51,7 +51,7 @@ def init_vorticity(data, coords, dim):
     else:
         raise NotImplementedError('dimension {}'.format(dim))
 
-def run(npts=256+1, viscosity=1./1600., lcfl=0.125, cfl=0.5):
+def run(npts=128+1, viscosity=1./1600., lcfl=0.125, cfl=0.5):
     autotuner_config = AutotunerConfig(autotuner_flag=AutotunerFlags.ESTIMATE, 
        prune_threshold=1.2, override_cache=True, verbose=0)
     kernel_config = KernelConfig(autotuner_config=autotuner_config)
@@ -116,6 +116,5 @@ def run(npts=256+1, viscosity=1./1600., lcfl=0.125, cfl=0.5):
         problem.finalize()
 
 if __name__=='__main__':
-    N = 128 + 1
-    run(N)
+    run()
 

hysop/fields/cartesian_discrete_field.py

@@ -147,6 +147,8 @@ class CartesianDiscreteFieldView(DiscreteFieldView):
 
         new_data arrays have to match dimension, size, shape and dtype of original data.
         """
+        raise NotImplementedError()
+        # TODO fix all data views update
         msg='Discrete field {}::{}::swap_data(), swapping components {}.'
         msg=msg.format(self.backend.kind, self.name, components) 
         dprint(msg)
@@ -168,12 +170,7 @@ class CartesianDiscreteFieldView(DiscreteFieldView):
         By default return all components.
         """
         data = self.__get_data_views(*components)
-
-        if self.backend.kind != Backend.OPENCL:
-            return data
-        
-        # cl.Buffer are wrapped so we extract them
-        return tuple(d.data for d in data)
+        return tuple(d.handle for d in data)
     
     def __getitem__(self, key):
         """
@@ -330,7 +327,7 @@ CartesianDiscreteFieldView (id={}, tag={})
         formula(**formula_kwds)
 
         # update ghosts
-        self.exchange_ghosts(data=data)
+        self.exchange_ghosts(data=(d.handle for d in data))
 
         assert all((d.size  == self.size)     for d in data), 'Array size was altered.'
         assert all((d.dtype == self.dtype)    for d in data), 'Array dtype was altered.'
@@ -401,8 +398,7 @@ CartesianDiscreteFieldView (id={}, tag={})
         components = to_tuple(components or range(self.nb_components))
         directions = to_tuple(directions or range(self.dim))
 
-        data = data or self.data
-        data = tuple(d.handle if isinstance(d,Array) else d for d in data)
+        data = to_tuple(data or self.buffers)
         # exchange_ghosts currently only supports hosts buffers
         check_instance(data, tuple, values=np.ndarray)
         

hysop/operator/tests/test_transpose.py

@@ -59,6 +59,17 @@ class TestTransposeOperator(object):
                             dim=dim, dtype=dtype, is_inplace=is_inplace,
                             domain=domain, Fin=Fin, Fout=Fout)
 
+    @classmethod
+    def __field_init(data, coords, dtype):
+        shape = data[0].shape
+        if is_integer(dtype):
+            data[0][...] = np.random.random_integer(low=0, high=255, shape=shape) 
+        elif is_fp(dtype)
+            data[0][...] = np.random.random(shape=shape) 
+        else:
+            msg='Unknown dtype {}.'.format(dtype)
+            raise NotImplementedError(msg)
+
     def _test_one(self, cl_env, shape, axes,
             dim, dtype, is_inplace,
             domain, Fin, Fout):
@@ -72,17 +83,15 @@ class TestTransposeOperator(object):
             fin, fout = Fin, Fout
             variables = { fin: shape, fout: shape }
         
-        transpose_cpu = Transpose(fields=fin, output_fields=fout,
+        for impl in Transpose.available_implementations():
+            tranpose = Transpose(fields=fin, output_fields=fout,
                                   variables=variables, axes=axes,
-                              implementation=Implementation.PYTHON,
-                              name='test_transpose_cpu').build()
-
-        transpose_gpu = Transpose(fields=fin, output_fields=fout,
-                              variables=variables, axes=axes,
-                              implementation=Implementation.OPENCL_CODEGEN,
-                              name='test_transpose_gpu', cl_env=cl_env).build()
-
-        
+                                  implementation=impl,
+                                  name='test_transpose_{}'.format(str(impl))).build()
+            dfin, dfout = transpose.input_vars[fin], transpose.output_vars[fout]
+            dfin.initialize(self.__field_init)
+        import sys
+        sys.exit(1)
 
     
     @opencl_failed

hysop/tools/types.py

 
 from hysop.deps import np
+from collections import Iterable
 
 class InstanceOf(object):
     def __init__(self, cls):
@@ -215,7 +216,7 @@ def to_tuple(arg, cast=None):
     as a tuple.
     """
     cast = cast or (lambda x: x)
-    if isinstance(arg, (tuple,list,frozenset,set,np.ndarray)):
+    if isinstance(arg, (tuple,list,frozenset,set,np.ndarray,Iterable)):
         return tuple(cast(x) for x in arg)
     else:
         return (cast(arg),)
@@ -227,7 +228,7 @@ def to_list(arg, cast=None):
     as a list.
     """
     cast = cast or (lambda x: x)
-    if isinstance(arg, (tuple,list,frozenset,set,np.ndarray)):
+    if isinstance(arg, (tuple,list,frozenset,set,np.ndarray,Iterable)):
         return list(cast(x) for x in arg)
     else:
         return [cast(arg),]
@@ -239,7 +240,7 @@ def to_set(arg, cast=None):
     as a set.
     """
     cast = cast or (lambda x: x)
-    if isinstance(arg, (tuple,list,frozenset,set,np.ndarray)):
+    if isinstance(arg, (tuple,list,frozenset,set,np.ndarray,Iterable)):
         return set(cast(x) for x in arg)
     else:
         return set((cast(arg),))
@@ -251,7 +252,7 @@ def to_frozenset(arg, cast=None):
     as a frozenset.
     """
     cast = cast or (lambda x: x)
-    if isinstance(arg, (tuple,list,frozenset,set,np.ndarray)):
+    if isinstance(arg, (tuple,list,frozenset,set,np.ndarray,Iterable)):
         return frozenset(cast(x) for x in arg)
     else:
         return frozenset((cast(arg),))