diff --git a/tools/get_pr_ut.py b/tools/get_pr_ut.py index 05d368e0e8838c221665a25bde27c371df58b202..470242da34ddd001bbe4c0c303a42e346ce12897 100644 --- a/tools/get_pr_ut.py +++ b/tools/get_pr_ut.py @@ -130,7 +130,10 @@ class PRChecker(object): if not files: break for f in files: - file_list.append(PADDLE_ROOT + f.filename) + if f.status == 'removed': + file_list.append('removed') + else: + file_list.append(PADDLE_ROOT + f.filename) page += 1 return file_list @@ -257,66 +260,73 @@ class PRChecker(object): notHitMapFiles = [] hitMapFiles = [] onlyCommentsFilesOrXpu = [] - for f in self.get_pr_files(): - if current_system == "Darwin" or current_system == "Windows" or self.suffix == ".py3": - f_judge = f.replace(PADDLE_ROOT, '/paddle/', 1) - f_judge = f_judge.replace('//', '/') - else: - f_judge = f - if f_judge not in file_ut_map: - if f_judge.endswith('.md'): - ut_list.append('md_placeholder') - onlyCommentsFilesOrXpu.append(f_judge) - elif 'tests/unittests/xpu' in f_judge or 'tests/unittests/npu' in f_judge: - ut_list.append('xpu_npu_placeholder') - onlyCommentsFilesOrXpu.append(f_judge) - elif f_judge.endswith(('.h', '.cu', '.cc', 'py')): - if f_judge.find('test_') != -1 or f_judge.find( - '_test') != -1: - check_added_ut = True - if self.is_only_comment(f): - ut_list.append('comment_placeholder') + file_list = self.get_pr_files() + if 'removed' in file_list: + print("ipipe_log_param_PRECISION_TEST: false") + print("notHitMapFiles: [rm file]") + return '' + else: + for f in file_list: + if current_system == "Darwin" or current_system == "Windows" or self.suffix == ".py3": + f_judge = f.replace(PADDLE_ROOT, '/paddle/', 1) + f_judge = f_judge.replace('//', '/') + else: + f_judge = f + if f_judge not in file_ut_map: + if f_judge.endswith('.md'): + ut_list.append('md_placeholder') onlyCommentsFilesOrXpu.append(f_judge) + elif 'tests/unittests/xpu' in f_judge or 'tests/unittests/npu' in f_judge: + ut_list.append('xpu_npu_placeholder') + onlyCommentsFilesOrXpu.append(f_judge) + elif f_judge.endswith(('.h', '.cu', '.cc', 'py')): + if f_judge.find('test_') != -1 or f_judge.find( + '_test') != -1: + check_added_ut = True + if self.is_only_comment(f): + ut_list.append('comment_placeholder') + onlyCommentsFilesOrXpu.append(f_judge) + else: + notHitMapFiles.append(f_judge) else: notHitMapFiles.append(f_judge) else: - notHitMapFiles.append(f_judge) + if self.is_only_comment(f): + ut_list.append('comment_placeholder') + onlyCommentsFilesOrXpu.append(f_judge) + else: + hitMapFiles.append(f_judge) + ut_list.extend(file_ut_map.get(f_judge)) + ut_list = list(set(ut_list)) + if len(notHitMapFiles) != 0: + print("ipipe_log_param_PRECISION_TEST: false") + print("notHitMapFiles: %s" % notHitMapFiles) + return '' else: - if self.is_only_comment(f): - ut_list.append('comment_placeholder') - onlyCommentsFilesOrXpu.append(f_judge) - else: - hitMapFiles.append(f_judge) - ut_list.extend(file_ut_map.get(f_judge)) - ut_list = list(set(ut_list)) - if len(notHitMapFiles) != 0: - print("ipipe_log_param_PRECISION_TEST: false") - print("notHitMapFiles: %s" % notHitMapFiles) - return '' - else: - if check_added_ut: - with open('{}/added_ut'.format(PADDLE_ROOT)) as utfile: - for ut in utfile: - ut_list.append(ut.rstrip('\r\n')) - if ut_list: - ret = self.__urlretrieve( - 'https://paddle-docker-tar.bj.bcebos.com/pre_test/prec_delta', - 'prec_delta') - if ret: - with open('prec_delta') as delta: - for ut in delta: + if check_added_ut: + with open('{}/added_ut'.format(PADDLE_ROOT)) as utfile: + for ut in utfile: ut_list.append(ut.rstrip('\r\n')) - else: - print('PREC download prec_delta failed') - exit(1) - print("ipipe_log_param_PRECISION_TEST: true") - print("ipipe_log_param_PRECISION_TEST_Cases_count: %s" % - len(ut_list)) - PRECISION_TEST_Cases_ratio = format( - float(len(ut_list)) / float(self.get_all_count()), '.2f') - print("ipipe_log_param_PRECISION_TEST_Cases_ratio: %s" % - PRECISION_TEST_Cases_ratio) - return '\n'.join(ut_list) + if ut_list: + ret = self.__urlretrieve( + 'https://paddle-docker-tar.bj.bcebos.com/pre_test/prec_delta', + 'prec_delta') + if ret: + with open('prec_delta') as delta: + for ut in delta: + ut_list.append(ut.rstrip('\r\n')) + else: + print('PREC download prec_delta failed') + exit(1) + print("ipipe_log_param_PRECISION_TEST: true") + print("ipipe_log_param_PRECISION_TEST_Cases_count: %s" % + len(ut_list)) + PRECISION_TEST_Cases_ratio = format( + float(len(ut_list)) / float(self.get_all_count()), + '.2f') + print("ipipe_log_param_PRECISION_TEST_Cases_ratio: %s" % + PRECISION_TEST_Cases_ratio) + return '\n'.join(ut_list) if __name__ == '__main__':