Merge pull request #9 from adityapb/pysph-travis

Update massage_args method to fix issues with pyopencl

.travis.yml

@@ -1,10 +1,13 @@
 os:
     ubuntu
 
+dist:
+    xenial
+
 language: python
 python:
     - 2.7
-    - 3.6
+    - 3.7
 
 install:
     - sudo apt-get update

compyle/jit.py

@@ -280,7 +280,7 @@ def _generate_kernel(self, *args):
     def _massage_arg(self, x):
         if isinstance(x, array.Array):
             return x.dev
-        elif isinstance(x, np.ndarray):
+        elif self.backend != 'cuda' or isinstance(x, np.ndarray):
             return x
         else:
             return np.asarray(x)
@@ -353,7 +353,7 @@ def _generate_kernel(self, *args):
     def _massage_arg(self, x):
         if isinstance(x, array.Array):
             return x.dev
-        elif isinstance(x, np.ndarray):
+        elif self.backend != 'cuda' or isinstance(x, np.ndarray):
             return x
         else:
             return np.asarray(x)
@@ -459,7 +459,7 @@ def _generate_kernel(self, **kwargs):
     def _massage_arg(self, x):
         if isinstance(x, array.Array):
             return x.dev
-        elif isinstance(x, np.ndarray):
+        elif self.backend != 'cuda' or isinstance(x, np.ndarray):
             return x
         else:
             return np.asarray(x)

compyle/parallel.py

@@ -485,8 +485,10 @@ def _add_address_space(arg):
     def _massage_arg(self, x):
         if isinstance(x, array.Array):
             return x.dev
-        else:
+        elif self.backend != 'cuda' or isinstance(x, np.ndarray):
             return x
+        else:
+            return np.asarray(x)
 
     def __call__(self, *args, **kw):
         c_args = [self._massage_arg(x) for x in args]
@@ -704,8 +706,10 @@ def _correct_opencl_address_space(self, c_data):
     def _massage_arg(self, x):
         if isinstance(x, array.Array):
             return x.dev
-        else:
+        elif self.backend != 'cuda' or isinstance(x, np.ndarray):
             return x
+        else:
+            return np.asarray(x)
 
     def __call__(self, *args):
         c_args = [self._massage_arg(x) for x in args]
@@ -1061,8 +1065,10 @@ def _correct_opencl_address_space(self, c_data, func, func_type):
     def _massage_arg(self, x):
         if isinstance(x, array.Array):
             return x.dev
-        else:
+        elif self.backend != 'cuda' or isinstance(x, np.ndarray):
             return x
+        else:
+            return np.asarray(x)
 
     def __call__(self, **kwargs):
         c_args_dict = {k: self._massage_arg(x) for k, x in kwargs.items()}