Refactor

Author: ianthomas23

Diff for: xrspatial/tests/general_checks.py

@@ -1,10 +1,10 @@
 import dask.array as da
 import numpy as np
+import pytest
 import xarray as xr
 
 from xrspatial.utils import ArrayTypeFunctionMapping, has_cuda_and_cupy
 
-
 # Use this as a decorator to skip tests if do not have both CUDA and CuPy available.
 cuda_and_cupy_available = pytest.mark.skipif(
     not has_cuda_and_cupy(), reason="Requires CUDA and CuPy")

Diff for: xrspatial/tests/test_classify.py

@@ -5,7 +5,6 @@
 from xrspatial import binary, equal_interval, natural_breaks, quantile, reclassify
 from xrspatial.tests.general_checks import (create_test_raster, cuda_and_cupy_available,
                                             general_output_checks)
-from xrspatial.utils import doesnt_have_cuda
 
 
 def input_data(backend='numpy'):
@@ -45,15 +44,15 @@ def test_binary_dask_numpy(result_binary):
     general_output_checks(dask_agg, dask_result, expected_result)
 
 
-@pytest.mark.skipif(doesnt_have_cuda(), reason="CUDA Device not Available")
-def test_binary_cupy(result_reclassify):
+@cuda_and_cupy_available
+def test_binary_cupy(result_binary):
     values, expected_result = result_binary
     cupy_agg = input_data(backend='cupy')
     cupy_result = binary(cupy_agg, values)
     general_output_checks(cupy_agg, cupy_result, expected_result)
 
 
-@pytest.mark.skipif(doesnt_have_cuda(), reason="CUDA Device not Available")
+@cuda_and_cupy_available
 def test_binary_dask_cupy(result_binary):
     values, expected_result = result_binary
     dask_cupy_agg = input_data(backend='dask+cupy')

Diff for: xrspatial/tests/test_hillshade.py

@@ -7,7 +7,6 @@
 from xrspatial.tests.general_checks import (assert_numpy_equals_cupy,
                                             assert_numpy_equals_dask_numpy, create_test_raster,
                                             cuda_and_cupy_available, general_output_checks)
-from xrspatial.utils import doesnt_have_cuda
 
 from ..gpu_rtx import has_rtx
 

Diff for: xrspatial/tests/test_terrain.py

@@ -1,3 +1,4 @@
+import dask.array as da
 import numpy as np
 import xarray as xr
 

Diff for: xrspatial/tests/test_zonal.py

@@ -10,6 +10,7 @@
 from xrspatial import zonal_crosstab as crosstab
 from xrspatial import zonal_stats as stats
 from xrspatial.zonal import regions
+
 from .general_checks import create_test_raster, has_cuda_and_cupy
 
 

Diff for: xrspatial/viewshed.py

@@ -1,12 +1,13 @@
 from math import atan, fabs
 from math import pi as PI
 from math import sqrt
-import numpy as np
 from typing import Union
+
+import numpy as np
 import xarray
 
-from .utils import has_cuda_and_cupy, is_cupy_array, ngjit
 from .gpu_rtx import has_rtx
+from .utils import has_cuda_and_cupy, is_cupy_array, ngjit
 
 E_ROW_ID = 0
 E_COL_ID = 1