未验证 提交 580442ce 编写于 作者: Y YUNSHEN XIE 提交者: GitHub

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
上级 da10c5cf
...@@ -20,12 +20,15 @@ import sys ...@@ -20,12 +20,15 @@ import sys
import time import time
import subprocess import subprocess
import requests import requests
import urllib.request
import ssl
import platform import platform
from github import Github from github import Github
PADDLE_ROOT = os.getenv('PADDLE_ROOT', '/paddle/') PADDLE_ROOT = os.getenv('PADDLE_ROOT', '/paddle/')
PADDLE_ROOT += '/' PADDLE_ROOT += '/'
PADDLE_ROOT = PADDLE_ROOT.replace('//', '/') PADDLE_ROOT = PADDLE_ROOT.replace('//', '/')
ssl._create_default_https_context = ssl._create_unverified_context
class PRChecker(object): class PRChecker(object):
...@@ -74,6 +77,9 @@ class PRChecker(object): ...@@ -74,6 +77,9 @@ class PRChecker(object):
while ix < 6: while ix < 6:
if ix // 2 == 0: if ix // 2 == 0:
proxy = '' proxy = ''
else:
if platform.system() == 'Windows':
proxy = '-Y off'
else: else:
proxy = '--no-proxy' proxy = '--no-proxy'
code = subprocess.call( code = subprocess.call(
...@@ -88,6 +94,33 @@ class PRChecker(object): ...@@ -88,6 +94,33 @@ class PRChecker(object):
ix += 1 ix += 1
return False 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): def get_pr_files(self):
""" Get files in pull request. """ """ Get files in pull request. """
page = 0 page = 0
...@@ -202,9 +235,9 @@ class PRChecker(object): ...@@ -202,9 +235,9 @@ class PRChecker(object):
check_added_ut = False check_added_ut = False
ut_list = [] ut_list = []
file_ut_map = None file_ut_map = None
ret = self.__wget_with_retry( ret = self.__urlretrieve(
'https://sys-p0.bj.bcebos.com/prec/file_ut.json{}'.format( 'https://sys-p0.bj.bcebos.com/prec/file_ut.json{}'.format(
self.suffix)) self.suffix), 'file_ut.json{}'.format(self.suffix))
if not ret: if not ret:
print('PREC download file_ut.json failed') print('PREC download file_ut.json failed')
exit(1) exit(1)
...@@ -213,9 +246,11 @@ class PRChecker(object): ...@@ -213,9 +246,11 @@ class PRChecker(object):
for f in self.get_pr_files(): for f in self.get_pr_files():
current_system = platform.system() current_system = platform.system()
if current_system == "Darwin" or current_system == "Windows": if current_system == "Darwin" or current_system == "Windows":
f = f.replace(PADDLE_ROOT, '/paddle/', 1) f_judge = f.replace(PADDLE_ROOT, '/paddle/', 1)
f = f.replace('//', '/') f_judge = f_judge.replace('//', '/')
if f not in file_ut_map: else:
f_judge = f
if f_judge not in file_ut_map:
if f.endswith('.md'): if f.endswith('.md'):
ut_list.append('md_placeholder') ut_list.append('md_placeholder')
elif f.endswith('.h') or f.endswith('.cu'): elif f.endswith('.h') or f.endswith('.cu'):
...@@ -245,7 +280,7 @@ class PRChecker(object): ...@@ -245,7 +280,7 @@ class PRChecker(object):
if self.is_only_comment(f): if self.is_only_comment(f):
ut_list.append('map_comment_placeholder') ut_list.append('map_comment_placeholder')
else: else:
ut_list.extend(file_ut_map.get(f)) ut_list.extend(file_ut_map.get(f_judge))
ut_list = list(set(ut_list)) ut_list = list(set(ut_list))
if check_added_ut: if check_added_ut:
...@@ -255,9 +290,9 @@ class PRChecker(object): ...@@ -255,9 +290,9 @@ class PRChecker(object):
ut_list.append(ut.rstrip('\r\n')) ut_list.append(ut.rstrip('\r\n'))
if ut_list: if ut_list:
ret = self.__wget_with_retry( ret = self.__urlretrieve(
'https://sys-p0.bj.bcebos.com/prec/prec_delta{}'.format( 'https://sys-p0.bj.bcebos.com/prec/prec_delta{}'.format(
self.suffix)) self.suffix), 'prec_delta{}'.format(self.suffix))
if ret: if ret:
with open('prec_delta' + self.suffix) as delta: with open('prec_delta' + self.suffix) as delta:
for ut in delta: for ut in delta:
......
...@@ -221,6 +221,7 @@ if [ ${PRECISION_TEST:-OFF} == "ON" ]; then ...@@ -221,6 +221,7 @@ if [ ${PRECISION_TEST:-OFF} == "ON" ]; then
fi fi
fi fi
set +e
if [ ${PRECISION_TEST:-OFF} == "ON" ] && [[ "$precision_cases" != "" ]];then if [ ${PRECISION_TEST:-OFF} == "ON" ] && [[ "$precision_cases" != "" ]];then
UT_list_prec='' 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"$"}') 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 ...@@ -238,6 +239,7 @@ if [ ${PRECISION_TEST:-OFF} == "ON" ] && [[ "$precision_cases" != "" ]];then
done done
UT_list=$UT_list_prec UT_list=$UT_list_prec
fi fi
set -e
output=$(python ${PADDLE_ROOT}/tools/parallel_UT_rule.py "${UT_list}") output=$(python ${PADDLE_ROOT}/tools/parallel_UT_rule.py "${UT_list}")
eight_parallel_job=$(echo $output | cut -d ";" -f 1) eight_parallel_job=$(echo $output | cut -d ";" -f 1)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册