From f6f4c5cd9065deaf895b7f2a48928b1456edc6f4 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Thu, 5 Nov 2020 23:21:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4.DS=5FStore,=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 6148 -> 0 bytes .gitignore | 7 +++++++ model/checkpoint | 2 -- 3 files changed, 7 insertions(+), 2 deletions(-) delete mode 100644 .DS_Store create mode 100644 .gitignore delete mode 100755 model/checkpoint diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index c3b383c39129efa164f2d220aa3d3d9cd7905035..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK&5ja55UvK6Z7>@-m@LP>c;f(J<8s+#oW+B;O~z<8YGB5}Ws+fu<_U;H$nBks9u)cpjdi`KJ9tN=tFzQ<{jH7W{uYYH` zeBq#Y$a$HUkIHYozMOigpH9ZEKYFct7k=6gto=gDcxC&+%cwW)R34qnB=w`DH`2*b z*u#)Fuc9QBQ&&!saIEL?%mC*lUg}h;^LeXrQWMQqb5RrX)6;rQoHU;-7A1cCxN-Kp zJNWQ%{%LXZ+3?KplhpFi;u5}~v17^cRl|EH2g7Cf?&yJRw=F^Z>n!cQZ*=XAl2|5J_!dhB)|NshF+dCu1BwBAJn#oZ2Qfel5CcCkpw0(@s?f2R8PrDy zHo62rETCHp+NzdNIl`i2F*ArGD9ofHnp9>>3}({NFKnD+F*9h=f!X4N*(Wnwp)mb) zoL}g0V2(j*i2-6@lYzYHR@D9f?DzHmW)k&?0b=04Vt^IeUfabb*}HXXaq6xWs9jVg pDlRj)N Date: Thu, 5 Nov 2020 23:40:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9inference.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + {tx_infer_data => image}/1.jpg | Bin {tx_infer_data => image}/2.jpg | Bin .../vanke_2016_1241_nb_3.jpg | Bin inference.py | 48 ++++++++++++++---- requirements.txt | 2 + 6 files changed, 40 insertions(+), 11 deletions(-) rename {tx_infer_data => image}/1.jpg (100%) rename {tx_infer_data => image}/2.jpg (100%) rename {tx_infer_data => image}/vanke_2016_1241_nb_3.jpg (100%) diff --git a/.gitignore b/.gitignore index 605275f..ba2c8fa 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ *.py[cod] model/ +*.result/ diff --git a/tx_infer_data/1.jpg b/image/1.jpg similarity index 100% rename from tx_infer_data/1.jpg rename to image/1.jpg diff --git a/tx_infer_data/2.jpg b/image/2.jpg similarity index 100% rename from tx_infer_data/2.jpg rename to image/2.jpg diff --git a/tx_infer_data/vanke_2016_1241_nb_3.jpg b/image/vanke_2016_1241_nb_3.jpg similarity index 100% rename from tx_infer_data/vanke_2016_1241_nb_3.jpg rename to image/vanke_2016_1241_nb_3.jpg diff --git a/inference.py b/inference.py index cdd3e76..006c652 100755 --- a/inference.py +++ b/inference.py @@ -5,10 +5,12 @@ import logging log = logging.getLogger(__name__) -import model +# import model +import model as model_tx import time import os +import argparse import random class Detector(object): @@ -66,22 +68,40 @@ def iou_count(list1, list2): iou = inter / min(area1, area2) return iou -if __name__ == '__main__': - result_path = './result/' - instance = Detector('./model/') - images = os.listdir('./image/') +def get_args(): + parser = argparse.ArgumentParser() + parser.add_argument('--model_dir', default='./model') + parser.add_argument('--img_dir', default='./tx_infer_data') + parser.add_argument('--out_dir', default='./result') + return parser.parse_args() + - row_root = './tx_infer_data/row' - col_root = './tx_infer_data/col' - nrow_root = './tx_infer_data/nrow' - ncol_root = './tx_infer_data/ncol' +def main(args): + # result_path = './result/' + if not os.path.isdir(args.out_dir): + os.makedirs(args.out_dir) + os.makedirs(os.path.join(args.out_dir, 'row')) + os.makedirs(os.path.join(args.out_dir, 'col')) + os.makedirs(os.path.join(args.out_dir, 'nrow')) + os.makedirs(os.path.join(args.out_dir, 'ncol')) + instance = Detector(args.model_dir) + images = os.listdir(args.img_dir) + + # row_root = './tx_infer_data/row' + # col_root = './tx_infer_data/col' + # nrow_root = './tx_infer_data/nrow' + # ncol_root = './tx_infer_data/ncol' + row_root = os.path.join(args.out_dir, 'row') + col_root = os.path.join(args.out_dir, 'col') + nrow_root = os.path.join(args.out_dir, 'nrow') + ncol_root = os.path.join(args.out_dir, 'ncol') i_l = [] for x in range(len(images)): print(images[x]) - image_path = os.path.join('./image/',images[x]) + image_path = os.path.join(args.img_dir, images[x]) image_name = images[x] txt_name = image_name.replace('.jpg','.txt') row_path = os.path.join(row_root, image_name) @@ -111,7 +131,7 @@ def iou_count(list1, list2): lmap = cv2.bitwise_and(score_row, score_col) pre_map = cv2.bitwise_and(nmap, lmap) - result = os.path.join(result_path, images[x]) + result = os.path.join(args.out_dir, images[x]) score_nrow_map = cv2.resize(score_nrow, dsize=None, fx=1/ratio_w, fy=1/ratio_h, interpolation=cv2.INTER_AREA) score_ncol_map = cv2.resize(score_ncol, dsize=None, fx=1 / ratio_w, fy=1 / ratio_h, interpolation=cv2.INTER_AREA) score_row_map = cv2.resize(score_row, dsize=None, fx=1 / ratio_w, fy=1 / ratio_h, interpolation=cv2.INTER_AREA) @@ -124,3 +144,9 @@ def iou_count(list1, list2): cv2.imwrite(nrow_path, score_nrow_map * 255) cv2.imwrite(ncol_path, score_ncol_map * 255) cv2.imwrite(result, pre_map*255) + + +if __name__ == '__main__': + main(get_args()) + + diff --git a/requirements.txt b/requirements.txt index 8348d90..ddc3abb 100755 --- a/requirements.txt +++ b/requirements.txt @@ -6,3 +6,5 @@ plumbum==1.6.2 numpy==1.12.1 ipython==6.1.0 Pillow==4.2.1 +opencv-python +tensorflow==1.15