Skip to content

Commit aba8242

Browse files
committed
[ILUVATAR_GPU] Support for iluvatar_gpu
1 parent 98f82a5 commit aba8242

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

ppocr/data/imaug/operators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ def __call__(self, data):
230230
# img, shape = self.resize_image_type1(img)
231231
img, [ratio_h, ratio_w] = self.resize_image_type1(img)
232232
data["image"] = img
233-
data["shape"] = np.array([src_h, src_w, ratio_h, ratio_w])
233+
data["shape"] = np.array([src_h, src_w, ratio_h, ratio_w]).astype(np.float32)
234234
return data
235235

236236
def image_padding(self, im, value=0):

ppocr/data/imaug/random_crop_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ def __call__(self, data):
178178
ignore_tags_crop.append(tag)
179179
texts_crop.append(text)
180180
data["image"] = img
181-
data["polys"] = np.array(text_polys_crop)
181+
data["polys"] = np.array(text_polys_crop).astype(np.float32)
182182
data["ignore_tags"] = ignore_tags_crop
183183
data["texts"] = texts_crop
184184
return data

ppocr/data/imaug/rec_img_aug.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ def __call__(self, data):
304304
else:
305305
norm_img, valid_ratio = resize_norm_img(img, self.image_shape, self.padding)
306306
data["image"] = norm_img
307-
data["valid_ratio"] = valid_ratio
307+
data["valid_ratio"] = np.float32(valid_ratio)
308308
return data
309309

310310

@@ -337,7 +337,7 @@ def __call__(self, data):
337337
valid_ratio = min(1.0, float(resized_w / imgW))
338338

339339
data["image"] = norm_img
340-
data["valid_ratio"] = valid_ratio
340+
data["valid_ratio"] = np.float32(valid_ratio)
341341
return data
342342

343343

@@ -365,7 +365,7 @@ def __call__(self, data):
365365
img, self.image_shape, self.padding, self.interpolation
366366
)
367367
data["image"] = norm_img
368-
data["valid_ratio"] = valid_ratio
368+
data["valid_ratio"] = np.float32(valid_ratio)
369369
return data
370370

371371

@@ -406,7 +406,7 @@ def __call__(self, data):
406406
data["image"] = norm_img
407407
data["resized_shape"] = resize_shape
408408
data["pad_shape"] = pad_shape
409-
data["valid_ratio"] = valid_ratio
409+
data["valid_ratio"] = np.float32(valid_ratio)
410410
return data
411411

412412

@@ -538,7 +538,7 @@ def __call__(self, data):
538538
img = data["image"]
539539
norm_img, valid_ratio = resize_norm_img_abinet(img, self.image_shape)
540540
data["image"] = norm_img
541-
data["valid_ratio"] = valid_ratio
541+
data["valid_ratio"] = np.float32(valid_ratio)
542542
return data
543543

544544

@@ -552,7 +552,7 @@ def __call__(self, data):
552552

553553
norm_img, valid_ratio = resize_norm_img(img, self.image_shape, self.padding)
554554
data["image"] = norm_img
555-
data["valid_ratio"] = valid_ratio
555+
data["valid_ratio"] = np.float32(valid_ratio)
556556
return data
557557

558558

@@ -573,7 +573,7 @@ def __call__(self, data):
573573
data["image"] = norm_img
574574
data["resized_shape"] = resize_shape
575575
data["pad_shape"] = pad_shape
576-
data["valid_ratio"] = valid_ratio
576+
data["valid_ratio"] = np.float32(valid_ratio)
577577
data["word_positons"] = word_positons
578578
return data
579579

ppocr/data/simple_dataset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ def resize_norm_img(self, data, imgW, imgH, padding=True):
202202
padding_im[:, :, :resized_w] = resized_image
203203
valid_ratio = min(1.0, float(resized_w / imgW))
204204
data["image"] = padding_im
205-
data["valid_ratio"] = valid_ratio
205+
data["valid_ratio"] = np.float32(valid_ratio)
206206
return data
207207

208208
def __getitem__(self, properties):

tools/program.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def merge_config(config, opts):
115115
return config
116116

117117

118-
def check_device(use_gpu, use_xpu=False, use_npu=False, use_mlu=False, use_gcu=False):
118+
def check_device(use_gpu, use_xpu=False, use_npu=False, use_mlu=False, use_gcu=False, use_iluvatar_gpu=False):
119119
"""
120120
Log error and exit when set use_gpu=true in paddlepaddle
121121
cpu version.
@@ -833,6 +833,7 @@ def preprocess(is_train=False):
833833
use_npu = config["Global"].get("use_npu", False)
834834
use_mlu = config["Global"].get("use_mlu", False)
835835
use_gcu = config["Global"].get("use_gcu", False)
836+
use_iluvatar_gpu = config["Global"].get("use_iluvatar_gpu", False)
836837

837838
alg = config["Architecture"]["algorithm"]
838839
assert alg in [
@@ -896,9 +897,11 @@ def preprocess(is_train=False):
896897
device = "mlu:{0}".format(os.getenv("FLAGS_selected_mlus", 0))
897898
elif use_gcu: # Use Enflame GCU(General Compute Unit)
898899
device = "gcu:{0}".format(os.getenv("FLAGS_selected_gcus", 0))
900+
elif use_iluvatar_gpu:
901+
device = "iluvatar_gpu:{0}".format(dist.ParallelEnv().dev_id)
899902
else:
900903
device = "gpu:{}".format(dist.ParallelEnv().dev_id) if use_gpu else "cpu"
901-
check_device(use_gpu, use_xpu, use_npu, use_mlu, use_gcu)
904+
check_device(use_gpu, use_xpu, use_npu, use_mlu, use_gcu, use_iluvatar_gpu)
902905

903906
device = paddle.set_device(device)
904907

0 commit comments

Comments
 (0)