From 580442cebafa80af93f4fe350dfcd00d4768096e Mon Sep 17 00:00:00 2001 From: YUNSHEN XIE <1084314248@qq.com> Date: Tue, 16 Mar 2021 10:23:46 +0800 Subject: [PATCH] fix wget with no proxy on windows (#31505) * fix wget with no proxy on windows * modified import packages * fix format error * fix bug * fix format error * fix format error --- tools/get_pr_ut.py | 53 ++++++++++++++++++++++++++++------ tools/windows/run_unittests.sh | 2 ++ 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/tools/get_pr_ut.py b/tools/get_pr_ut.py index e97f69faf0..001f380049 100644 --- a/tools/get_pr_ut.py +++ b/tools/get_pr_ut.py @@ -20,12 +20,15 @@ import sys import time import subprocess import requests +import urllib.request +import ssl import platform from github import Github PADDLE_ROOT = os.getenv('PADDLE_ROOT', '/paddle/') PADDLE_ROOT += '/' PADDLE_ROOT = PADDLE_ROOT.replace('//', '/') +ssl._create_default_https_context = ssl._create_unverified_context class PRChecker(object): @@ -75,7 +78,10 @@ class PRChecker(object): if ix // 2 == 0: proxy = '' else: - proxy = '--no-proxy' + if platform.system() == 'Windows': + proxy = '-Y off' + else: + proxy = '--no-proxy' code = subprocess.call( 'wget -q {} --no-check-certificate {}'.format(proxy, url), shell=True) @@ -88,6 +94,33 @@ class PRChecker(object): ix += 1 return False + def __urlretrieve(self, url, filename): + ix = 1 + with_proxy = urllib.request.getproxies() + without_proxy = {'http': '', 'http': ''} + while ix < 6: + if ix // 2 == 0: + cur_proxy = urllib.request.ProxyHandler(without_proxy) + else: + cur_proxy = urllib.request.ProxyHandler(with_proxy) + opener = urllib.request.build_opener(cur_proxy, + urllib.request.HTTPHandler) + urllib.request.install_opener(opener) + try: + urllib.request.urlretrieve(url, filename) + except Exception as e: + print(e) + print( + 'PREC download {} error, retry {} time(s) after {} secs.[proxy_option={}]'. + format(url, ix, ix * 10, proxy)) + continue + else: + return True + time.sleep(ix * 10) + ix += 1 + + return False + def get_pr_files(self): """ Get files in pull request. """ page = 0 @@ -202,9 +235,9 @@ class PRChecker(object): check_added_ut = False ut_list = [] file_ut_map = None - ret = self.__wget_with_retry( + ret = self.__urlretrieve( 'https://sys-p0.bj.bcebos.com/prec/file_ut.json{}'.format( - self.suffix)) + self.suffix), 'file_ut.json{}'.format(self.suffix)) if not ret: print('PREC download file_ut.json failed') exit(1) @@ -213,9 +246,11 @@ class PRChecker(object): for f in self.get_pr_files(): current_system = platform.system() if current_system == "Darwin" or current_system == "Windows": - f = f.replace(PADDLE_ROOT, '/paddle/', 1) - f = f.replace('//', '/') - if f not in file_ut_map: + 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.endswith('.md'): ut_list.append('md_placeholder') elif f.endswith('.h') or f.endswith('.cu'): @@ -245,7 +280,7 @@ class PRChecker(object): if self.is_only_comment(f): ut_list.append('map_comment_placeholder') else: - ut_list.extend(file_ut_map.get(f)) + ut_list.extend(file_ut_map.get(f_judge)) ut_list = list(set(ut_list)) if check_added_ut: @@ -255,9 +290,9 @@ class PRChecker(object): ut_list.append(ut.rstrip('\r\n')) if ut_list: - ret = self.__wget_with_retry( + ret = self.__urlretrieve( 'https://sys-p0.bj.bcebos.com/prec/prec_delta{}'.format( - self.suffix)) + self.suffix), 'prec_delta{}'.format(self.suffix)) if ret: with open('prec_delta' + self.suffix) as delta: for ut in delta: diff --git a/tools/windows/run_unittests.sh b/tools/windows/run_unittests.sh index 71b5e65214..312711c514 100644 --- a/tools/windows/run_unittests.sh +++ b/tools/windows/run_unittests.sh @@ -221,6 +221,7 @@ if [ ${PRECISION_TEST:-OFF} == "ON" ]; then fi fi +set +e if [ ${PRECISION_TEST:-OFF} == "ON" ] && [[ "$precision_cases" != "" ]];then UT_list_prec='' re=$(cat ut_list|awk -F ' ' '{print }' | awk 'BEGIN{ all_str=""}{if (all_str==""){all_str=$1}else{all_str=all_str"$|^"$1}} END{print "^"all_str"$"}') @@ -238,6 +239,7 @@ if [ ${PRECISION_TEST:-OFF} == "ON" ] && [[ "$precision_cases" != "" ]];then done UT_list=$UT_list_prec fi +set -e output=$(python ${PADDLE_ROOT}/tools/parallel_UT_rule.py "${UT_list}") eight_parallel_job=$(echo $output | cut -d ";" -f 1) -- GitLab