From 5ebbfaa8b9a7adfa4c977f7922d4ec1083ad5f53 Mon Sep 17 00:00:00 2001 From: Wu Yi Date: Fri, 20 Jul 2018 18:16:33 +0800 Subject: [PATCH] Get diff for all changes in current branch (#12265) * get diff for all changes in current branch * diff with upstream/develop * let dist test serial --- paddle/scripts/paddle_build.sh | 3 +-- python/paddle/fluid/tests/unittests/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh index 65e7b106255..9e58a39eb09 100755 --- a/paddle/scripts/paddle_build.sh +++ b/paddle/scripts/paddle_build.sh @@ -333,8 +333,7 @@ function assert_api_not_changed() { python ${PADDLE_ROOT}/tools/diff_api.py ${PADDLE_ROOT}/paddle/fluid/API.spec new.spec deactivate - # Use git diff --name-only HEAD^ may not get file changes for update commits in one PR - API_CHANGE=`echo $CHANGED_FILES | grep "paddle/fluid/API.spec" || true` + API_CHANGE=`git diff --name-only upstream/develop | grep "paddle/fluid/API.spec" || true` echo "checking API.spec change, PR: ${GIT_PR_ID}, changes: ${API_CHANGE}" if [ ${API_CHANGE} ] && [ "${GIT_PR_ID}" != "" ]; then # TODO: curl -H 'Authorization: token ${TOKEN}' diff --git a/python/paddle/fluid/tests/unittests/CMakeLists.txt b/python/paddle/fluid/tests/unittests/CMakeLists.txt index 8c564abf986..322d76515e7 100644 --- a/python/paddle/fluid/tests/unittests/CMakeLists.txt +++ b/python/paddle/fluid/tests/unittests/CMakeLists.txt @@ -48,6 +48,7 @@ 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) +list(REMOVE_ITEM TEST_OPS test_dist_se_resnext) foreach(TEST_OP ${TEST_OPS}) py_test_modules(${TEST_OP} MODULES ${TEST_OP}) endforeach(TEST_OP) @@ -60,3 +61,4 @@ if(WITH_DISTRIBUTE) endif() 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) +py_test_modules(test_dist_se_resnext MODULES test_dist_se_resnext SERIAL) -- GitLab