From a5b219127fc4d316229775d956eba6a62fcebecd Mon Sep 17 00:00:00 2001 From: LDOUBLEV Date: Wed, 9 Dec 2020 22:07:20 +0800 Subject: [PATCH] fix conflicts --- .../{ch_det_mv3_db.yml => ch_det_mv3_db_v2.0.yml} | 0 .../{ch_det_res18_db.yml => ch_det_res18_db_v2.0.yml} | 0 ppocr/data/simple_dataset.py | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename configs/det/ch_ppocr_v1.1/{ch_det_mv3_db.yml => ch_det_mv3_db_v2.0.yml} (100%) rename configs/det/ch_ppocr_v1.1/{ch_det_res18_db.yml => ch_det_res18_db_v2.0.yml} (100%) diff --git a/configs/det/ch_ppocr_v1.1/ch_det_mv3_db.yml b/configs/det/ch_ppocr_v1.1/ch_det_mv3_db_v2.0.yml similarity index 100% rename from configs/det/ch_ppocr_v1.1/ch_det_mv3_db.yml rename to configs/det/ch_ppocr_v1.1/ch_det_mv3_db_v2.0.yml diff --git a/configs/det/ch_ppocr_v1.1/ch_det_res18_db.yml b/configs/det/ch_ppocr_v1.1/ch_det_res18_db_v2.0.yml similarity index 100% rename from configs/det/ch_ppocr_v1.1/ch_det_res18_db.yml rename to configs/det/ch_ppocr_v1.1/ch_det_res18_db_v2.0.yml diff --git a/ppocr/data/simple_dataset.py b/ppocr/data/simple_dataset.py index 16891326..d2069d0d 100644 --- 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, -- GitLab