Skip to content

Commit 9640736

Browse files
committed
test=develop, refine wget issue
1 parent ed7ae47 commit 9640736

File tree

1 file changed

+13
-43
lines changed

1 file changed

+13
-43
lines changed

paddle/scripts/fast_install.sh

Lines changed: 13 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -765,49 +765,19 @@ function macos() {
765765
checkMacAVX
766766
checkMacGPU
767767

768-
wheel_cpu_release="http://paddle-wheel.bj.bcebos.com/${release_version}-${GPU}-mac/paddlepaddle-1.2.0-cp${python_brief_version}-cp${python_brief_version}m-macosx_10_6_intel.whl"
769-
whl_cpu_release="paddlepaddle-1.2.0-cp${python_brief_version}-cp${python_brief_version}m-macosx_10_6_intel.whl"
770-
wheel_cpu_develop="http://paddle-wheel.bj.bcebos.com/latest-cpu-mac/paddlepaddle-latest-cp${python_brief_version}-cp${python_brief_version}m-macosx_10_6_intel.whl"
771-
whl_cpu_develop="paddlepaddle-latest-cp${python_brief_version}-cp${python_brief_version}m-macosx_10_6_intel.whl"
772768

773769
if [[ $paddle_version == "2" ]];then
774-
if [ -f $whl_cpu_release ];then
775-
$python_root -m pip install $whl_cpu_release
776-
if [ $? == "0" ];then
777-
rm -rf $whl_cpu_release
778-
echo "安装成功,可以使用: ${python_root} 来启动安装了PaddlePaddle的Python解释器"
779-
break
780-
else
781-
echo "未能正常安装PaddlePaddle,请尝试更换您输入的python路径,或者ctrl + c退出后请检查您使用的python3对应的pip或pip源是否可用"
782-
echo""
783-
echo "=========================================================================================="
784-
echo""
785-
exit 1
786-
fi
770+
$python_root -m pip install paddlepaddle
771+
if [ $? == "0" ];then
772+
echo "安装成功,可以使用: ${python_root} 来启动安装了PaddlePaddle的Python解释器"
773+
break
787774
else
788-
wget ${path}$wheel_cpu_release -O $whl_cpu_release
789-
if [ $? == "0" ];then
790-
$python_root -m pip install $whl_cpu_release
791-
if [ $? == "0" ];then
792-
rm $whl_cpu_release
793-
echo "安装成功,可以使用: ${python_root} 来启动安装了PaddlePaddle的Python解释器"
794-
break
795-
else
796-
rm $whl_cpu_release
797-
echo "未能正常安装PaddlePaddle,请尝试更换您输入的python路径,或者ctrl + c退出后请检查您使用的python3对应的pip或pip源是否可用"
798-
echo""
799-
echo "=========================================================================================="
800-
echo""
801-
exit 1
802-
fi
803-
else
804-
rm $whl_cpu_release
805-
echo "未能正常安装PaddlePaddle,请检查您的网络,或者ctrl + c退出后反馈至https://github.com/PaddlePaddle/Paddle/issues"
806-
echo""
807-
echo "=========================================================================================="
808-
echo""
809-
exit 1
810-
fi
775+
rm $whl_cpu_release
776+
echo "未能正常安装PaddlePaddle,请尝试更换您输入的python路径,或者ctrl + c退出后请检查您使用的python对应的pip或pip源是否可用"
777+
echo""
778+
echo "=========================================================================================="
779+
echo""
780+
exit 1
811781
fi
812782
else
813783
if [ -f $whl_cpu_develop ];then
@@ -817,7 +787,7 @@ function macos() {
817787
echo "安装成功,可以使用: ${python_root} 来启动安装了PaddlePaddle的Python解释器"
818788
break
819789
else
820-
echo "未能正常安装PaddlePaddle,请尝试更换您输入的python路径,或者ctrl + c退出后请检查您使用的python3对应的pip或pip源是否可用"
790+
echo "未能正常安装PaddlePaddle,请尝试更换您输入的python路径,或者ctrl + c退出后请检查您使用的python对应的pip或pip源是否可用"
821791
echo""
822792
echo "=========================================================================================="
823793
echo""
@@ -833,15 +803,15 @@ function macos() {
833803
break
834804
else
835805
rm $whl_cpu_release
836-
echo "未能正常安装PaddlePaddle,请尝试更换您输入的python路径,或者ctrl + c退出后请检查您使用的python3对应的pip或pip源是否可用"
806+
echo "未能正常安装PaddlePaddle,请尝试更换您输入的python路径,或者ctrl + c退出后请检查您使用的python对应的pip或pip源是否可用"
837807
echo""
838808
echo "=========================================================================================="
839809
echo""
840810
exit 1
841811
fi
842812
else
843813
rm $whl_cpu_develop
844-
echo "未能正常安装PaddlePaddle,请检查您的网络,或者ctrl + c退出后反馈至https://github.com/PaddlePaddle/Paddle/issues"
814+
echo "未能正常安装PaddlePaddle,请检查您的网络 或者确认您是否安装有 wget,或者ctrl + c退出后反馈至https://github.com/PaddlePaddle/Paddle/issues"
845815
echo""
846816
echo "=========================================================================================="
847817
echo""

0 commit comments

Comments
 (0)