Merge pull request #58 from tberlok/joss-50

Joss 50

Makefile

@@ -21,6 +21,7 @@ checks:
 	cd tests; pytest comoving
 	cd tests; pytest non-comoving
 	cd tests; pytest general
+	cd tests; pytest cuda-gpu
 
 linting:
 	flake8 ./
@@ -29,9 +30,3 @@ linting:
 dev_checks:
 	make checks
 	make linting
-
-# Tests that can only run on some systems
-gpu_checks:
-	cd tests; python cuda-gpu/test_gpu_binary_tree.py
-	cd tests; python cuda-gpu/test_gpu_ray_projector.py
-	cd tests; python cuda-gpu/test_gpu_sph_projector.py

docs/source/tests.md

@@ -10,6 +10,7 @@ into the `tests` directory and running
 pytest comoving
 pytest non-comoving
 pytest general
+pytest cuda-gpu
 ```
 but it is also possible to run each test from the command line,
 e.g.

tests/cuda-gpu/test_gpu_binary_tree.py

@@ -1,7 +1,16 @@
+import pytest
 
+
+@pytest.mark.xfail(raises=RuntimeError)
 def test_gpu_binary_tree():
-    import cupy as cp
-    from numba import cuda
+    try:
+        import cupy
+        import numba
+    except ImportError:
+        msg = ("Import of cupy and numba failed "
+               + " and GPU-tests can't run.")
+        pytest.xfail(msg)
+
     import paicos as pa
     from scipy.spatial import KDTree
     from paicos.trees.bvh_gpu import GpuBinaryTree

tests/cuda-gpu/test_gpu_ray_projector.py

@@ -1,7 +1,18 @@
+import pytest
+
+
 def test_gpu_ray_projector(show=False):
     """
     We compare the CPU and GPU implementations of ray-tracing.
     """
+    try:
+        import cupy
+        import numba
+    except ImportError:
+        msg = ("Import of cupy and numba failed "
+               + " and GPU-tests can't run.")
+        pytest.xfail(msg)
+
     import paicos as pa
     import numpy as np
     pa.use_units(True)

tests/cuda-gpu/test_gpu_sph_projector.py

@@ -1,7 +1,18 @@
+import pytest
+
+
 def test_gpu_sph_projector(show=False):
     """
     We compare the CPU and GPU implementations of SPH-projection.
     """
+    try:
+        import cupy
+        import numba
+    except ImportError:
+        msg = ("Import of cupy and numba failed "
+               + " and GPU-tests can't run.")
+        pytest.xfail(msg)
+
     import paicos as pa
     import numpy as np
     pa.use_units(True)