Skip to content

Commit

Permalink
Merge pull request PaddlePaddle#1221 from HexToString/newtest
Browse files Browse the repository at this point in the history
test2.1.0 error
  • Loading branch information
bjjwwang authored and TeslaZhao committed May 13, 2021
1 parent ef4592f commit 2dd2282
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions cmake/paddlepaddle.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ message( "WITH_GPU = ${WITH_GPU}")
# Paddle Version should be one of:
# latest: latest develop build
# version number like 1.5.2
SET(PADDLE_VERSION "2.0.1")
SET(PADDLE_VERSION "2.1.0")
if (WITH_GPU)
if(CUDA_VERSION EQUAL 11.0)
set(CUDA_SUFFIX "cuda11-cudnn8-avx-mkl")
set(CUDA_SUFFIX "cuda11.0-cudnn8-mkl-gcc8.2")
set(WITH_TRT ON)
elseif(CUDA_VERSION EQUAL 10.2)
set(CUDA_SUFFIX "cuda10.2-cudnn8-avx-mkl")
set(CUDA_SUFFIX "cuda10.2-cudnn8-mkl-gcc8.2")
set(WITH_TRT ON)
elseif(CUDA_VERSION EQUAL 10.1)
set(CUDA_SUFFIX "cuda10.1-cudnn7-avx-mkl")
set(CUDA_SUFFIX "cuda10.1-cudnn7-mkl-gcc8.2")
set(WITH_TRT ON)
elseif(CUDA_VERSION EQUAL 10.0)
set(CUDA_SUFFIX "cuda10-cudnn7-avx-mkl")
Expand Down
4 changes: 2 additions & 2 deletions tools/scripts/ipipe_py3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ function run_env() {
python3.6 -m pip install --upgrade nltk==3.4
python3.6 -m pip install --upgrade scipy==1.2.1
python3.6 -m pip install --upgrade setuptools==41.0.0
python3.6 -m pip install paddlehub ujson paddlepaddle==2.0.0
python3.6 -m pip install paddlehub ujson paddlepaddle==2.0.2
echo "run env configuration is successful.... "
}

Expand Down Expand Up @@ -245,7 +245,7 @@ function build_client() {
function build_app() {
setproxy
python3.6 -m pip install paddlehub ujson Pillow
python3.6 -m pip install paddlepaddle==2.0.0
python3.6 -m pip install paddlepaddle==2.0.2
cd ${build_path}
if [ -d build ];then
rm -rf build
Expand Down

0 comments on commit 2dd2282

Please sign in to comment.