Skip to content

Commit 5cc7946

Browse files
authored
Merge pull request #14499 from luotao1/disable_openblas_test
disable two openblas test temporary
2 parents 10ae3ba + 09ee266 commit 5cc7946

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

paddle/fluid/inference/tests/api/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ function(inference_analysis_api_test_with_fake_data target install_dir filename
2727
endfunction()
2828

2929
# RNN1
30-
if(NOT APPLE)
30+
if(NOT APPLE AND WITH_MKLML)
3131
set(RNN1_INSTALL_DIR "${INFERENCE_DEMO_INSTALL_DIR}/rnn1")
3232
download_model_and_data(${RNN1_INSTALL_DIR} "rnn1%2Fmodel.tar.gz" "rnn1%2Fdata.txt.tar.gz")
3333
inference_analysis_api_test(test_analyzer_rnn1 ${RNN1_INSTALL_DIR} analyzer_rnn1_tester.cc)
3434
else()
35-
# TODO: fix this test on MACOS, the reason is that
36-
# fusion_seqexpand_concat_fc_op is not supported on MACOS
37-
message(WARNING "These tests has been disabled in OSX before being fixed: \n test_analyzer_rnn1")
35+
# TODO: fix this test on MACOS and OPENBLAS, the reason is that
36+
# fusion_seqexpand_concat_fc_op is not supported on MACOS and OPENBLAS
37+
message(WARNING "These tests has been disabled in OSX or WITH_MKL=OFF before being fixed: \n test_analyzer_rnn1")
3838
endif()
3939

4040
# RNN2

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ if(APPLE)
4545
list(REMOVE_ITEM TEST_OPS test_dist_se_resnext)
4646
list(REMOVE_ITEM TEST_OPS test_fuse_elewise_add_act_pass)
4747
endif()
48+
if(NOT WITH_MKLML)
49+
# this op is not support on openblas
50+
list(REMOVE_ITEM TEST_OPS test_fusion_seqexpand_concat_fc_op)
51+
endif()
4852

4953
function(py_test_modules TARGET_NAME)
5054
if(WITH_TESTING)

0 commit comments

Comments
 (0)