Skip to content

Commit 4d466ee

Browse files
committed
np array instantiation
1 parent 9204290 commit 4d466ee

File tree

2 files changed

+588
-594
lines changed

2 files changed

+588
-594
lines changed

xrspatial/multispectral.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def arvi(nir_agg: DataArray, red_agg: DataArray, blue_agg: DataArray,
114114
# EVI -------------
115115
@ngjit
116116
def _evi_cpu(nir_data, red_data, blue_data, c1, c2, soil_factor, gain):
117-
out = np.zeros_like(nir_data, dtype='f4')
117+
out = np.zeros(nir_data.shape, dtype=np.float32)
118118
rows, cols = nir_data.shape
119119
for y in range(0, rows):
120120
for x in range(0, cols):
@@ -146,9 +146,6 @@ def _evi_dask(nir_data, red_data, blue_data, c1, c2, soil_factor, gain):
146146

147147

148148
def _evi_cupy(nir_data, red_data, blue_data, c1, c2, soil_factor, gain):
149-
150-
import cupy
151-
152149
griddim, blockdim = cuda_args(nir_data.shape)
153150
out = cupy.empty(nir_data.shape, dtype='f4')
154151
out[:] = cupy.nan
@@ -158,9 +155,6 @@ def _evi_cupy(nir_data, red_data, blue_data, c1, c2, soil_factor, gain):
158155

159156

160157
def _evi_dask_cupy(nir_data, red_data, blue_data, c1, c2, soil_factor, gain):
161-
162-
import cupy
163-
164158
out = da.map_blocks(_evi_cupy, nir_data, red_data, blue_data,
165159
c1, c2, soil_factor, gain,
166160
dtype=cupy.float32, meta=cupy.array(()))
@@ -239,7 +233,7 @@ def evi(nir_agg: DataArray, red_agg: DataArray, blue_agg: DataArray,
239233
# GCI -------------
240234
@ngjit
241235
def _gci_cpu(nir_data, green_data):
242-
out = np.zeros_like(nir_data, dtype='f4')
236+
out = np.zeros(nir_data.shape, dtype=np.float32)
243237
rows, cols = nir_data.shape
244238
for y in range(0, rows):
245239
for x in range(0, cols):
@@ -488,7 +482,7 @@ def ndmi(nir_agg: DataArray, swir1_agg: DataArray, name='ndmi'):
488482

489483
@ngjit
490484
def _normalized_ratio_cpu(arr1, arr2):
491-
out = np.zeros_like(arr1, dtype='f4')
485+
out = np.zeros(arr1.shape, dtype=np.float32)
492486
rows, cols = arr1.shape
493487
for y in range(0, rows):
494488
for x in range(0, cols):
@@ -544,7 +538,7 @@ def _run_normalized_ratio_dask_cupy(arr1, arr2):
544538

545539
@ngjit
546540
def _savi_cpu(nir_data, red_data, soil_factor):
547-
out = np.zeros_like(nir_data, dtype='f4')
541+
out = np.zeros(nir_data.shape, dtype=np.float32)
548542
rows, cols = nir_data.shape
549543
for y in range(0, rows):
550544
for x in range(0, cols):
@@ -645,7 +639,7 @@ def savi(nir_agg: DataArray, red_agg: DataArray,
645639
# SIPI -------------
646640
@ngjit
647641
def _sipi_cpu(nir_data, red_data, blue_data):
648-
out = np.zeros_like(nir_data, dtype='f4')
642+
out = np.zeros(nir_data.shape, dtype=np.float32)
649643
rows, cols = nir_data.shape
650644
for y in range(0, rows):
651645
for x in range(0, cols):
@@ -738,7 +732,7 @@ def sipi(nir_agg: DataArray, red_agg: DataArray, blue_agg: DataArray,
738732
# EBBI -------------
739733
@ngjit
740734
def _ebbi_cpu(red_data, swir_data, tir_data):
741-
out = np.zeros_like(red_data, dtype='f4')
735+
out = np.zeros(red_data, dtype=np.float32)
742736
rows, cols = red_data.shape
743737
for y in range(0, rows):
744738
for x in range(0, cols):

0 commit comments

Comments
 (0)