fix conflicts

a5b21912 · LDOUBLEV · 7cce85cc · a5b21912 · a5b21912 · a5b21912
3 changed file
--- a/configs/det/ch_ppocr_v1.1/ch_det_mv3_db.yml
+++ b/configs/det/ch_ppocr_v1.1/ch_det_mv3_db.yml
--- a/configs/det/ch_ppocr_v1.1/ch_det_res18_db.yml
+++ b/configs/det/ch_ppocr_v1.1/ch_det_res18_db.yml
--- a/ppocr/data/simple_dataset.py
+++ b/ppocr/data/simple_dataset.py
@@ -57,9 +57,9 @@ class SimpleDataSet(Dataset):
        sample_num = round(len(datas) * sample_ratio)

        if data_num_per_epoch is not None:
-            sample_num = data_num_per_epoch * sample_ratio
+            sample_num = int(data_num_per_epoch * sample_ratio)

-        nums, rem = sample_num // len(datas), sample_num % len(datas)
+        nums, rem = int(sample_num // len(datas)), int(sample_num % len(datas))
        return list(datas) * nums + random.sample(datas, rem)

    def get_image_info_list(self,