-
Notifications
You must be signed in to change notification settings - Fork 5.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix kill fail bug #11635
Fix kill fail bug #11635
Changes from 5 commits
23e8f4f
61a8656
3f0bf27
79105b9
96a7ae5
aea8821
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,7 +22,7 @@ | |
function print_usage() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. paddle_build.sh的gen_dockerfile函数里面需要pip install 么?不然latest等镜像没有这个包。 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. gen_dockerfile 里添加了 pip install /*.whl, 我理解会把 paddle python 依赖的所有包都加上, opencv-python也是其中之一 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @typhoonzero could you please take a look at this? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. whl installs packages here, in Paddle/python/setup.py.in
|
||
echo -e "\n${RED}Usage${NONE}: | ||
${BOLD}${SCRIPT_NAME}${NONE} [OPTION]" | ||
|
||
echo -e "\n${RED}Options${NONE}: | ||
${BLUE}build${NONE}: run build for x86 platform | ||
${BLUE}build_android${NONE}: run build for android platform | ||
|
@@ -198,7 +198,7 @@ function build_android() { | |
fi | ||
|
||
ANDROID_STANDALONE_TOOLCHAIN=$ANDROID_TOOLCHAINS_DIR/$ANDROID_ARCH-android-$ANDROID_API | ||
|
||
cat <<EOF | ||
============================================ | ||
Generating the standalone toolchain ... | ||
|
@@ -212,13 +212,13 @@ EOF | |
--arch=$ANDROID_ARCH \ | ||
--platform=android-$ANDROID_API \ | ||
--install-dir=$ANDROID_STANDALONE_TOOLCHAIN | ||
|
||
BUILD_ROOT=${PADDLE_ROOT}/build_android | ||
DEST_ROOT=${PADDLE_ROOT}/install_android | ||
|
||
mkdir -p $BUILD_ROOT | ||
cd $BUILD_ROOT | ||
|
||
if [ $ANDROID_ABI == "armeabi-v7a" ]; then | ||
cmake -DCMAKE_SYSTEM_NAME=Android \ | ||
-DANDROID_STANDALONE_TOOLCHAIN=$ANDROID_STANDALONE_TOOLCHAIN \ | ||
|
@@ -286,7 +286,7 @@ function build_ios() { | |
-DWITH_TESTING=OFF \ | ||
-DWITH_SWIG_PY=OFF \ | ||
-DCMAKE_BUILD_TYPE=Release | ||
|
||
make -j 2 | ||
} | ||
|
||
|
@@ -331,14 +331,14 @@ EOF | |
function bind_test() { | ||
# the number of process to run tests | ||
NUM_PROC=6 | ||
|
||
# calculate and set the memory usage for each process | ||
MEM_USAGE=$(printf "%.2f" `echo "scale=5; 1.0 / $NUM_PROC" | bc`) | ||
export FLAGS_fraction_of_gpu_memory_to_use=$MEM_USAGE | ||
|
||
# get the CUDA device count | ||
CUDA_DEVICE_COUNT=$(nvidia-smi -L | wc -l) | ||
|
||
for (( i = 0; i < $NUM_PROC; i++ )); do | ||
cuda_list=() | ||
for (( j = 0; j < $CUDA_DEVICE_COUNT; j++ )); do | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,7 +15,7 @@ if(NOT WITH_DISTRIBUTE) | |
endif(NOT WITH_DISTRIBUTE) | ||
|
||
list(REMOVE_ITEM TEST_OPS test_seq_concat_op) # FIXME(helin): https://github.com/PaddlePaddle/Paddle/issues/8290 | ||
list(REMOVE_ITEM TEST_OPS test_modified_huber_loss_op) # FIXME(qijun) https://github.com/PaddlePaddle/Paddle/issues/5184 | ||
list(REMOVE_ITEM TEST_OPS test_modified_huber_loss_op) # FIXME(qijun) https://github.com/PaddlePaddle/Paddle/issues/5184 | ||
list(REMOVE_ITEM TEST_OPS test_lstm_unit_op) # # FIXME(qijun) https://github.com/PaddlePaddle/Paddle/issues/5185 | ||
list(REMOVE_ITEM TEST_OPS test_nce) # FIXME(qijun) https://github.com/PaddlePaddle/Paddle/issues/7778 | ||
list(REMOVE_ITEM TEST_OPS test_recurrent_op) # FIXME(qijun) https://github.com/PaddlePaddle/Paddle/issues/6152 | ||
|
@@ -43,12 +43,12 @@ list(REMOVE_ITEM TEST_OPS test_warpctc_op) | |
list(REMOVE_ITEM TEST_OPS test_dist_train) | ||
list(REMOVE_ITEM TEST_OPS test_parallel_executor_crf) | ||
list(REMOVE_ITEM TEST_OPS test_parallel_executor_fetch_feed) | ||
# TODO(wuyi): this test hungs on CI, will add it back later | ||
list(REMOVE_ITEM TEST_OPS test_listen_and_serv_op) | ||
foreach(TEST_OP ${TEST_OPS}) | ||
py_test_modules(${TEST_OP} MODULES ${TEST_OP}) | ||
endforeach(TEST_OP) | ||
py_test_modules(test_warpctc_op MODULES test_warpctc_op ENVS FLAGS_warpctc_dir=${WARPCTC_LIB_DIR} SERIAL) | ||
py_test_modules(test_dist_train MODULES test_dist_train SERIAL) | ||
py_test_modules(test_parallel_executor_crf MODULES test_parallel_executor_crf SERIAL) | ||
py_test_modules(test_parallel_executor_fetch_feed MODULES test_parallel_executor_fetch_feed SERIAL) | ||
# (DONE) tests that need to be done in fixed timeout | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can remove this comment |
||
set_tests_properties(test_listen_and_serv_op PROPERTIES TIMEOUT 20) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pip install opencv-python,和apt-get install 并不冲突, @velconia 已经测过,可以正常加载flowers数据集。
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
为什么
pip install opencv-python
会影响进程terminate呢?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
可以参考这个issue的回答