Skip to content

Commit facfec1

Browse files
JiabinYangJiabinYang
committed
fix mac unitest on ci
1 parent 2c31ea9 commit facfec1

File tree

2 files changed

+133
-70
lines changed

2 files changed

+133
-70
lines changed

‎paddle/scripts/paddle_build.sh

Lines changed: 127 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -108,69 +108,133 @@ function cmake_gen() {
108108
fi
109109
fi
110110
fi
111-
111+
112+
if [ "$SYSTEM" == "Darwin" ]; then
112113
cat <<EOF
113-
========================================
114-
Configuring cmake in /paddle/build ...
115-
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
116-
${PYTHON_FLAGS}
117-
-DWITH_DSO=ON
118-
-DWITH_DOC=${WITH_DOC:-OFF}
119-
-DWITH_GPU=${WITH_GPU:-OFF}
120-
-DWITH_AMD_GPU=${WITH_AMD_GPU:-OFF}
121-
-DWITH_DISTRIBUTE=${WITH_DISTRIBUTE:-OFF}
122-
-DWITH_MKL=${WITH_MKL:-ON}
123-
-DWITH_AVX=${WITH_AVX:-OFF}
124-
-DWITH_GOLANG=${WITH_GOLANG:-OFF}
125-
-DCUDA_ARCH_NAME=${CUDA_ARCH_NAME:-All}
126-
-DWITH_C_API=${WITH_C_API:-OFF}
127-
-DWITH_PYTHON=${WITH_PYTHON:-ON}
128-
-DWITH_SWIG_PY=${WITH_SWIG_PY:-ON}
129-
-DCUDNN_ROOT=/usr/
130-
-DWITH_TESTING=${WITH_TESTING:-ON}
131-
-DWITH_FAST_BUNDLE_TEST=ON
132-
-DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake
133-
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
134-
-DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF}
135-
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
136-
-DWITH_CONTRIB=${WITH_CONTRIB:-ON}
137-
-DWITH_INFERENCE=${WITH_INFERENCE:-ON}
138-
-DWITH_INFERENCE_API_TEST=${WITH_INFERENCE_API_TEST:-ON}
139-
-DINFERENCE_DEMO_INSTALL_DIR=${INFERENCE_DEMO_INSTALL_DIR:-/root/.cache/inference_demo}
140-
-DWITH_ANAKIN=${WITH_ANAKIN:-OFF}
141-
-DPY_VERSION=${PY_VERSION:-2.7}
142-
========================================
114+
========================================
115+
Configuring cmake in /paddle/build ...
116+
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
117+
${PYTHON_FLAGS}
118+
-DWITH_DSO=ON
119+
-DWITH_DOC=${WITH_DOC:-OFF}
120+
-DWITH_GPU=${WITH_GPU:-OFF}
121+
-DWITH_AMD_GPU=${WITH_AMD_GPU:-OFF}
122+
-DWITH_DISTRIBUTE=${WITH_DISTRIBUTE:-ON}
123+
-DWITH_MKL=${WITH_MKL:-ON}
124+
-DWITH_AVX=${WITH_AVX:-ON}
125+
-DWITH_GOLANG=${WITH_GOLANG:-OFF}
126+
-DCUDA_ARCH_NAME=${CUDA_ARCH_NAME:-All}
127+
-DWITH_C_API=${WITH_C_API:-OFF}
128+
-DWITH_PYTHON=${WITH_PYTHON:-ON}
129+
-DWITH_SWIG_PY=${WITH_SWIG_PY:-ON}
130+
-DCUDNN_ROOT=/usr/
131+
-DWITH_TESTING=${WITH_TESTING:-ON}
132+
-DWITH_FAST_BUNDLE_TEST=ON
133+
-DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake
134+
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
135+
-DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF}
136+
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
137+
-DWITH_CONTRIB=${WITH_CONTRIB:-ON}
138+
-DWITH_INFERENCE=${WITH_INFERENCE:-ON}
139+
-DWITH_INFERENCE_API_TEST=${WITH_INFERENCE_API_TEST:-ON}
140+
-DWITH_ANAKIN=${WITH_ANAKIN:-OFF}
141+
-DPY_VERSION=${PY_VERSION:-2.7}
142+
========================================
143143
EOF
144-
# Disable UNITTEST_USE_VIRTUALENV in docker because
145-
# docker environment is fully controlled by this script.
146-
# See /Paddle/CMakeLists.txt, UNITTEST_USE_VIRTUALENV option.
147-
cmake .. \
148-
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release} \
149-
${PYTHON_FLAGS} \
150-
-DWITH_DSO=ON \
151-
-DWITH_DOC=${WITH_DOC:-OFF} \
152-
-DWITH_GPU=${WITH_GPU:-OFF} \
153-
-DWITH_AMD_GPU=${WITH_AMD_GPU:-OFF} \
154-
-DWITH_DISTRIBUTE=${WITH_DISTRIBUTE:-OFF} \
155-
-DWITH_MKL=${WITH_MKL:-ON} \
156-
-DWITH_AVX=${WITH_AVX:-OFF} \
157-
-DWITH_GOLANG=${WITH_GOLANG:-OFF} \
158-
-DCUDA_ARCH_NAME=${CUDA_ARCH_NAME:-All} \
159-
-DWITH_SWIG_PY=${WITH_SWIG_PY:-ON} \
160-
-DWITH_C_API=${WITH_C_API:-OFF} \
161-
-DWITH_PYTHON=${WITH_PYTHON:-ON} \
162-
-DCUDNN_ROOT=/usr/ \
163-
-DWITH_TESTING=${WITH_TESTING:-ON} \
164-
-DWITH_FAST_BUNDLE_TEST=ON \
165-
-DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake \
166-
-DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF} \
167-
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
168-
-DWITH_CONTRIB=${WITH_CONTRIB:-ON} \
169-
-DWITH_INFERENCE=${WITH_INFERENCE:-ON} \
170-
-DWITH_INFERENCE_API_TEST=${WITH_INFERENCE_API_TEST:-ON} \
171-
-DINFERENCE_DEMO_INSTALL_DIR=${INFERENCE_DEMO_INSTALL_DIR:-/root/.cache/inference_demo} \
172-
-DWITH_ANAKIN=${WITH_ANAKIN:-OFF} \
173-
-DPY_VERSION=${PY_VERSION:-2.7}
144+
# Disable UNITTEST_USE_VIRTUALENV in docker because
145+
# docker environment is fully controlled by this script.
146+
# See /Paddle/CMakeLists.txt, UNITTEST_USE_VIRTUALENV option.
147+
cmake .. \
148+
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release} \
149+
${PYTHON_FLAGS} \
150+
-DWITH_DSO=ON \
151+
-DWITH_DOC=${WITH_DOC:-OFF} \
152+
-DWITH_GPU=${WITH_GPU:-OFF} \
153+
-DWITH_AMD_GPU=${WITH_AMD_GPU:-OFF} \
154+
-DWITH_DISTRIBUTE=${WITH_DISTRIBUTE:-ON} \
155+
-DWITH_MKL=${WITH_MKL:-ON} \
156+
-DWITH_AVX=${WITH_AVX:-ON} \
157+
-DWITH_GOLANG=${WITH_GOLANG:-OFF} \
158+
-DCUDA_ARCH_NAME=${CUDA_ARCH_NAME:-All} \
159+
-DWITH_SWIG_PY=${WITH_SWIG_PY:-ON} \
160+
-DWITH_C_API=${WITH_C_API:-OFF} \
161+
-DWITH_PYTHON=${WITH_PYTHON:-ON} \
162+
-DCUDNN_ROOT=/usr/ \
163+
-DWITH_TESTING=${WITH_TESTING:-ON} \
164+
-DWITH_FAST_BUNDLE_TEST=ON \
165+
-DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake \
166+
-DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF} \
167+
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
168+
-DWITH_CONTRIB=${WITH_CONTRIB:-ON} \
169+
-DWITH_INFERENCE=${WITH_INFERENCE:-ON} \
170+
-DWITH_INFERENCE_API_TEST=${WITH_INFERENCE_API_TEST:-ON} \
171+
-DWITH_ANAKIN=${WITH_ANAKIN:-OFF} \
172+
-DPY_VERSION=${PY_VERSION:-2.7}
173+
else
174+
cat <<EOF
175+
========================================
176+
Configuring cmake in /paddle/build ...
177+
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
178+
${PYTHON_FLAGS}
179+
-DWITH_DSO=ON
180+
-DWITH_DOC=${WITH_DOC:-OFF}
181+
-DWITH_GPU=${WITH_GPU:-OFF}
182+
-DWITH_AMD_GPU=${WITH_AMD_GPU:-OFF}
183+
-DWITH_DISTRIBUTE=${WITH_DISTRIBUTE:-OFF}
184+
-DWITH_MKL=${WITH_MKL:-ON}
185+
-DWITH_AVX=${WITH_AVX:-OFF}
186+
-DWITH_GOLANG=${WITH_GOLANG:-OFF}
187+
-DCUDA_ARCH_NAME=${CUDA_ARCH_NAME:-All}
188+
-DWITH_C_API=${WITH_C_API:-OFF}
189+
-DWITH_PYTHON=${WITH_PYTHON:-ON}
190+
-DWITH_SWIG_PY=${WITH_SWIG_PY:-ON}
191+
-DCUDNN_ROOT=/usr/
192+
-DWITH_TESTING=${WITH_TESTING:-ON}
193+
-DWITH_FAST_BUNDLE_TEST=ON
194+
-DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake
195+
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
196+
-DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF}
197+
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
198+
-DWITH_CONTRIB=${WITH_CONTRIB:-ON}
199+
-DWITH_INFERENCE=${WITH_INFERENCE:-ON}
200+
-DWITH_INFERENCE_API_TEST=${WITH_INFERENCE_API_TEST:-ON}
201+
-DINFERENCE_DEMO_INSTALL_DIR=${INFERENCE_DEMO_INSTALL_DIR:-/root/.cache/inference_demo}
202+
-DWITH_ANAKIN=${WITH_ANAKIN:-OFF}
203+
-DPY_VERSION=${PY_VERSION:-2.7}
204+
========================================
205+
EOF
206+
# Disable UNITTEST_USE_VIRTUALENV in docker because
207+
# docker environment is fully controlled by this script.
208+
# See /Paddle/CMakeLists.txt, UNITTEST_USE_VIRTUALENV option.
209+
cmake .. \
210+
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release} \
211+
${PYTHON_FLAGS} \
212+
-DWITH_DSO=ON \
213+
-DWITH_DOC=${WITH_DOC:-OFF} \
214+
-DWITH_GPU=${WITH_GPU:-OFF} \
215+
-DWITH_AMD_GPU=${WITH_AMD_GPU:-OFF} \
216+
-DWITH_DISTRIBUTE=${WITH_DISTRIBUTE:-OFF} \
217+
-DWITH_MKL=${WITH_MKL:-ON} \
218+
-DWITH_AVX=${WITH_AVX:-OFF} \
219+
-DWITH_GOLANG=${WITH_GOLANG:-OFF} \
220+
-DCUDA_ARCH_NAME=${CUDA_ARCH_NAME:-All} \
221+
-DWITH_SWIG_PY=${WITH_SWIG_PY:-ON} \
222+
-DWITH_C_API=${WITH_C_API:-OFF} \
223+
-DWITH_PYTHON=${WITH_PYTHON:-ON} \
224+
-DCUDNN_ROOT=/usr/ \
225+
-DWITH_TESTING=${WITH_TESTING:-ON} \
226+
-DWITH_FAST_BUNDLE_TEST=ON \
227+
-DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake \
228+
-DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF} \
229+
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
230+
-DWITH_CONTRIB=${WITH_CONTRIB:-ON} \
231+
-DWITH_INFERENCE=${WITH_INFERENCE:-ON} \
232+
-DWITH_INFERENCE_API_TEST=${WITH_INFERENCE_API_TEST:-ON} \
233+
-DINFERENCE_DEMO_INSTALL_DIR=${INFERENCE_DEMO_INSTALL_DIR:-/root/.cache/inference_demo} \
234+
-DWITH_ANAKIN=${WITH_ANAKIN:-OFF} \
235+
-DPY_VERSION=${PY_VERSION:-2.7}
236+
fi
237+
174238
}
175239

176240
function abort(){
@@ -232,8 +296,8 @@ function build_mac() {
232296
============================================
233297
EOF
234298
make clean
235-
sudo make -j 8
236-
sudo make install -j 8
299+
make -j 8
300+
make install -j 8
237301
}
238302

239303
function build_android() {

‎python/paddle/fluid/tests/unittests/CMakeLists.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,12 @@ list(REMOVE_ITEM TEST_OPS op_test) # op_test is a helper python file, not a test
3030
list(REMOVE_ITEM TEST_OPS decorators) # decorators is a helper python file, not a test
3131

3232
if(APPLE)
33-
message(WARNING "These tests has been disabled in OSX before being fixed: \n test_detection_map_op \n test_desc_clone \n test_debugger \n test_program_code \n test_dist_transformer \n test_dist_se_resnext")
33+
message(WARNING "These tests has been disabled in OSX before being fixed: \n test_detection_map_op \n test_debugger \n test_dist_se_resnext")
3434
# this op is not support on mac
3535
list(REMOVE_ITEM TEST_OPS test_fusion_seqexpand_concat_fc_op)
3636
# TODO: add the unitest back when it fixed
3737
list(REMOVE_ITEM TEST_OPS test_detection_map_op)
38-
list(REMOVE_ITEM TEST_OPS test_desc_clone)
3938
list(REMOVE_ITEM TEST_OPS test_debugger)
40-
list(REMOVE_ITEM TEST_OPS test_program_code)
41-
list(REMOVE_ITEM TEST_OPS test_dist_transformer)
4239
list(REMOVE_ITEM TEST_OPS test_dist_se_resnext)
4340
endif()
4441

@@ -73,11 +70,13 @@ py_test_modules(test_warpctc_op MODULES test_warpctc_op ENVS FLAGS_warpctc_dir=$
7370
if(WITH_DISTRIBUTE)
7471
py_test_modules(test_dist_train MODULES test_dist_train SERIAL)
7572
set_tests_properties(test_listen_and_serv_op PROPERTIES TIMEOUT 20)
76-
set_tests_properties(test_dist_mnist PROPERTIES TIMEOUT 200)
77-
set_tests_properties(test_dist_word2vec PROPERTIES TIMEOUT 200)
73+
if(NOT APPLE)
74+
set_tests_properties(test_dist_mnist PROPERTIES TIMEOUT 200)
75+
set_tests_properties(test_dist_word2vec PROPERTIES TIMEOUT 200)
76+
py_test_modules(test_dist_se_resnext MODULES test_dist_se_resnext SERIAL)
77+
endif(NOT APPLE)
7878
py_test_modules(test_dist_transpiler MODULES test_dist_transpiler)
7979
py_test_modules(test_dist_transformer MODULES test_dist_transformer SERIAL)
80-
py_test_modules(test_dist_se_resnext MODULES test_dist_se_resnext SERIAL)
8180
endif()
8281
py_test_modules(test_parallel_executor_crf MODULES test_parallel_executor_crf SERIAL)
8382
py_test_modules(test_parallel_executor_fetch_feed MODULES test_parallel_executor_fetch_feed SERIAL)

0 commit comments

Comments
 (0)