fixed diffusion opencl cpu test

ci/scripts/test.sh

@@ -68,13 +68,13 @@ python -c 'import hysop; print hysop'
 #python "$HYSOP_DIR/operator/tests/test_spectral_derivative.py"
 #python "$HYSOP_DIR/operator/tests/test_spectral_curl.py"
 python "$HYSOP_DIR/operator/tests/test_diffusion.py"
-#python "$HYSOP_DIR/operator/tests/test_poisson.py"
-#python "$HYSOP_DIR/operator/tests/test_solenoidal_projection.py"
-#python "$HYSOP_DIR/operator/tests/test_poisson_curl.py"
+python "$HYSOP_DIR/operator/tests/test_poisson.py"
+python "$HYSOP_DIR/operator/tests/test_solenoidal_projection.py"
+python "$HYSOP_DIR/operator/tests/test_poisson_curl.py"
 
 # If scales (fortran advection library) is installed
-#python -c "from hysop.f2hysop import scales2py as scales" && python "$HYSOP_DIR/operator/tests/test_scales_advection.py"
-#python -c "from hysop.f2hysop import scales2py as scales" && python "$HYSOP_DIR/operator/tests/test_bilevel_advection.py"
+python -c "from hysop.f2hysop import scales2py as scales" && python "$HYSOP_DIR/operator/tests/test_scales_advection.py"
+python -c "from hysop.f2hysop import scales2py as scales" && python "$HYSOP_DIR/operator/tests/test_bilevel_advection.py"
 
 #export HYSOP_VERBOSE=1
 #EXAMPLE_DIR="$HYSOP_DIR/../examples"

hysop/operator/tests/test_diffusion.py

@@ -132,7 +132,7 @@ class TestDiffusionOperator(object):
                     sys.stdout.flush()
                     diff = Diffusion(cl_env=cl_env, **base_kwds)
                     yield diff.to_graph()
-                msg='\n   *OpenCl FFTW: '
+                msg='   *OpenCl FFTW: '
                 print msg
                 cpu_envs = tuple(iter_clenv(device_type='cpu'))
                 if cpu_envs:
@@ -140,7 +140,8 @@ class TestDiffusionOperator(object):
                         msg='     |platform {}, device {}'.format(cl_env.platform.name.strip(),
                                                                   cl_env.device.name.strip())
                         print msg,
-                        yield Diffusion(cl_env=cl_env, enforce_implementation=False, **base_kwds)
+                        diff = Diffusion(cl_env=cl_env, enforce_implementation=False, **base_kwds)
+                        yield diff.to_graph()
             else:
                 msg='Unknown implementation to test {}.'.format(impl)
                 raise NotImplementedError(msg)
@@ -260,7 +261,7 @@ class TestDiffusionOperator(object):
                     sys.stdout.write('\bx\n\n')
                     sys.stdout.flush()
                     raise
-            print
+                print
 
 
     def test_diffusion_1D_inplace(self):

hysop/operator/tests/test_solenoidal_projection.py

@@ -209,16 +209,16 @@ class TestSolenoidalProjectionOperator(object):
 
         print ' >Input analytic velocity:'
         for (Ui,ui) in zip(U, analytic_solutions['Us']):
-            print '  *{} = {}'.format(Ui.pretty_name, format_expr(ui))
-        print '  *div(U) = {}'.format(format_expr(analytic_solutions['divUs'][0]))
+            print '   *{} = {}'.format(Ui.pretty_name, format_expr(ui))
+        print '   *div(U) = {}'.format(format_expr(analytic_solutions['divUs'][0]))
         print ' >Expected velocity vector potential (solenoidal projection) is:'
         for (Ui,ui) in zip(U0, analytic_solutions['U0s']):
-            print '  *{} = {}'.format(Ui.pretty_name, format_expr(ui))
-        print '  *div(U0) = {}'.format(format_expr(analytic_solutions['divU0s'][0]))
+            print '   *{} = {}'.format(Ui.pretty_name, format_expr(ui))
+        print '   *div(U0) = {}'.format(format_expr(analytic_solutions['divU0s'][0]))
         print ' >Expected velocity scalar potential is:'
         for (Ui,ui) in zip(U1, analytic_solutions['U1s']):
-            print '  *{} = {}'.format(Ui.pretty_name, format_expr(ui))
-        print '  *div(U1) = {}'.format(format_expr(analytic_solutions['divU1s'][0]))
+            print '   *{} = {}'.format(Ui.pretty_name, format_expr(ui))
+        print '   *div(U1) = {}'.format(format_expr(analytic_solutions['divU1s'][0]))
         print ' >Testing all available implementations:'
 
         implementations = SolenoidalProjection.implementations()