diff options
Diffstat (limited to 'tensorflow/contrib/cmake/tf_tests.cmake')
| -rw-r--r-- | tensorflow/contrib/cmake/tf_tests.cmake | 150 |
1 files changed, 66 insertions, 84 deletions
diff --git a/tensorflow/contrib/cmake/tf_tests.cmake b/tensorflow/contrib/cmake/tf_tests.cmake index cca3e6c398..8608d3ff8f 100644 --- a/tensorflow/contrib/cmake/tf_tests.cmake +++ b/tensorflow/contrib/cmake/tf_tests.cmake @@ -70,17 +70,18 @@ function(AddTest) ) foreach(datafile ${_AT_DATA}) + file(RELATIVE_PATH datafile_rel ${tensorflow_source_dir} ${datafile}) add_custom_command( TARGET ${_AT_TARGET} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy - "${CMAKE_CURRENT_SOURCE_DIR}/${datafile}" - "${testdir}/${datafile}" - DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${datafile}" + "${datafile}" + "${testdir}/${datafile_rel}" + DEPENDS "${datafile}" ) endforeach() if (_AT_DEPENDS) - add_dependencies(${_AT_TARGET} ${_AT_DEPENDS}) + add_dependencies(${_AT_TARGET} ${_AT_DEPENDS} googletest) endif() endfunction(AddTest) @@ -98,7 +99,7 @@ function(AddPythonTests) endif(_AT_DEPENDS) foreach(sourcefile ${_AT_SOURCES}) - add_test(NAME ${sourcefile} COMMAND ${PYTHON_EXECUTABLE} ${sourcefile}) + add_test(NAME ${sourcefile} COMMAND ${PYTHON_EXECUTABLE} ${sourcefile} WORKING_DIRECTORY ${tensorflow_source_dir}) if (_AT_DEPENDS) add_dependencies(${_AT_TARGET} ${_AT_DEPENDS}) endif() @@ -116,6 +117,9 @@ if (tensorflow_BUILD_PYTHON_TESTS) # include all test file(GLOB_RECURSE tf_test_src_py "${tensorflow_source_dir}/tensorflow/python/kernel_tests/*.py" + "${tensorflow_source_dir}/tensorflow/python/saved_model/*_test.py" + "${tensorflow_source_dir}/tensorflow/python/training/*_test.py" + "${tensorflow_source_dir}/tensorflow/tensorboard/*_test.py" ) # exclude the onces we don't want @@ -143,22 +147,21 @@ if (tensorflow_BUILD_PYTHON_TESTS) "${tensorflow_source_dir}/tensorflow/python/kernel_tests/cwise_ops_test.py" "${tensorflow_source_dir}/tensorflow/python/kernel_tests/variable_scope_test.py" "${tensorflow_source_dir}/tensorflow/python/kernel_tests/reshape_op_test.py" + "${tensorflow_source_dir}/tensorflow/tensorboard/backend/server_test.py" # int32/int64 mixup "${tensorflow_source_dir}/tensorflow/python/kernel_tests/functional_ops_test.py" "${tensorflow_source_dir}/tensorflow/python/kernel_tests/py_func_test.py" - # issues related to windows fs - "${tensorflow_source_dir}/tensorflow/python/kernel_tests/io_ops_test.py" - # missing kernel - "${tensorflow_source_dir}/tensorflow/python/kernel_tests/conv_ops_test.py" - "${tensorflow_source_dir}/tensorflow/python/kernel_tests/depthwise_conv_op_test.py" - "${tensorflow_source_dir}/tensorflow/python/kernel_tests/fractional_avg_pool_op_test.py" - "${tensorflow_source_dir}/tensorflow/python/kernel_tests/pool_test.py" - "${tensorflow_source_dir}/tensorflow/python/kernel_tests/qr_op_test.py" - "${tensorflow_source_dir}/tensorflow/python/kernel_tests/svd_op_test.py" # cuda launch failed "${tensorflow_source_dir}/tensorflow/python/kernel_tests/diag_op_test.py" "${tensorflow_source_dir}/tensorflow/python/kernel_tests/trace_op_test.py" "${tensorflow_source_dir}/tensorflow/python/kernel_tests/one_hot_op_test.py" # gpu, T=uint8 + # training tests + "${tensorflow_source_dir}/tensorflow/python/training/basic_session_run_hooks_test.py" # Needs tf.contrib fix. + "${tensorflow_source_dir}/tensorflow/python/training/localhost_cluster_performance_test.py" # Needs portpicker. + "${tensorflow_source_dir}/tensorflow/python/training/monitored_session_test.py" # Needs tf.contrib fix. + "${tensorflow_source_dir}/tensorflow/python/training/saver_large_variable_test.py" # Overflow error. + "${tensorflow_source_dir}/tensorflow/python/training/supervisor_test.py" # Flaky I/O error on rename. + "${tensorflow_source_dir}/tensorflow/python/training/sync_replicas_optimizer_test.py" # Needs portpicker. ) endif() list(REMOVE_ITEM tf_test_src_py ${tf_test_src_py_exclude}) @@ -172,7 +175,7 @@ if (tensorflow_BUILD_CC_TESTS) # # cc unit tests. Be aware that by default we include 250+ tests which # will take time and space to build. - # If you wan to cut this down, for example to a specific test, modify + # If you want to cut this down, for example to a specific test, modify # tf_test_src_simple to your needs # @@ -195,6 +198,18 @@ if (tensorflow_BUILD_CC_TESTS) "${tensorflow_source_dir}/tensorflow/c/tf_status_helper.cc" ) + if(WIN32) + set(tf_src_testlib + ${tf_src_testlib} + "${tensorflow_source_dir}/tensorflow/core/platform/windows/test.cc" + ) + else() + set(tf_src_testlib + ${tf_src_testlib} + "${tensorflow_source_dir}/tensorflow/core/platform/posix/test.cc" + ) + endif() + # include all test file(GLOB_RECURSE tf_test_src_simple "${tensorflow_source_dir}/tensorflow/cc/*_test.cc" @@ -204,6 +219,15 @@ if (tensorflow_BUILD_CC_TESTS) "${tensorflow_source_dir}/tensorflow/contrib/rnn/*_test.cc" ) + # exclude the ones we don't want + set(tf_test_src_simple_exclude + # generally not working + "${tensorflow_source_dir}/tensorflow/cc/client/client_session_test.cc" + "${tensorflow_source_dir}/tensorflow/cc/framework/gradients_test.cc" + "${tensorflow_source_dir}/tensorflow/core/distributed_runtime/call_options_test.cc" + "${tensorflow_source_dir}/tensorflow/core/distributed_runtime/tensor_coding_test.cc" + ) + if (NOT tensorflow_ENABLE_GPU) # exclude gpu tests if we are not buildig for gpu set(tf_test_src_simple_exclude @@ -217,15 +241,6 @@ if (tensorflow_BUILD_CC_TESTS) ) endif() - # exclude the onces we don't want - set(tf_test_src_simple_exclude - # generally not working - "${tensorflow_source_dir}/tensorflow/cc/client/client_session_test.cc" - "${tensorflow_source_dir}/tensorflow/cc/framework/gradients_test.cc" - "${tensorflow_source_dir}/tensorflow/core/distributed_runtime/call_options_test.cc" - "${tensorflow_source_dir}/tensorflow/core/distributed_runtime/tensor_coding_test.cc" - ) - if (WIN32) set(tf_test_src_simple_exclude ${tf_test_src_simple_exclude} @@ -235,68 +250,26 @@ if (tensorflow_BUILD_CC_TESTS) # TODO: test failing "${tensorflow_source_dir}/tensorflow/core/common_runtime/simple_placer_test.cc" + "${tensorflow_source_dir}/tensorflow/core/debug/debug_gateway_test.cc" # hangs "${tensorflow_source_dir}/tensorflow/core/distributed_runtime/executor_test.cc" "${tensorflow_source_dir}/tensorflow/core/kernels/quantized_reshape_op_test.cc" "${tensorflow_source_dir}/tensorflow/core/kernels/requantization_range_op_test.cc" "${tensorflow_source_dir}/tensorflow/core/kernels/requantize_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/restore_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/restore_v2_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/save_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/sparse_reduce_sum_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/restore_op_test.cc" "${tensorflow_source_dir}/tensorflow/core/kernels/quantize_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/lib/core/status_test.cc" "${tensorflow_source_dir}/tensorflow/core/lib/strings/str_util_test.cc" "${tensorflow_source_dir}/tensorflow/core/lib/strings/numbers_test.cc" "${tensorflow_source_dir}/tensorflow/core/lib/monitoring/collection_registry_test.cc" - "${tensorflow_source_dir}/tensorflow/core/util/tensor_slice_reader_test.cc" "${tensorflow_source_dir}/tensorflow/core/platform/file_system_test.cc" - "${tensorflow_source_dir}/tensorflow/core/platform/logging_test.cc" - "${tensorflow_source_dir}/tensorflow/core/platform/env_test.cc" - "${tensorflow_source_dir}/tensorflow/core/ops/math_grad_test.cc" "${tensorflow_source_dir}/tensorflow/contrib/cudnn_rnn/cudnn_rnn_ops_test.cc" "${tensorflow_source_dir}/tensorflow/contrib/rnn/ops/gru_ops_test.cc" # status 5 "${tensorflow_source_dir}/tensorflow/contrib/rnn/ops/lstm_ops_test.cc" # status 5 - # TODO: not compiling - "${tensorflow_source_dir}/tensorflow/cc/framework/gradient_checker_test.cc" - "${tensorflow_source_dir}/tensorflow/cc/gradients/math_grad_test.cc" - "${tensorflow_source_dir}/tensorflow/cc/gradients/array_grad_test.cc" - "${tensorflow_source_dir}/tensorflow/cc/saved_model/loader_test.cc" - "${tensorflow_source_dir}/tensorflow/cc/training/queue_runner_test.cc" - "${tensorflow_source_dir}/tensorflow/cc/training/coordinator_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/nn_ops_test.cc" + # TODO: not compiling "${tensorflow_source_dir}/tensorflow/core/kernels/quantization_utils_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/activation_ops_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/batch_norm_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/bias_add_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/concat_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/conv_ops_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/matmul_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/pooling_ops_test.cc" "${tensorflow_source_dir}/tensorflow/core/kernels/quantize_and_dequantize_op_test.cc" "${tensorflow_source_dir}/tensorflow/core/kernels/quantize_down_and_shrink_range_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/parameterized_truncated_normal_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/non_max_suppression_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/fused_batch_norm_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/eigen_backward_spatial_convolutions_test.cc" "${tensorflow_source_dir}/tensorflow/core/kernels/hexagon/quantized_matmul_op_for_hexagon_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/hexagon/hexagon_graph_transferer_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/adjust_contrast_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/batch_norm_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/cast_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/colorspace_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/control_flow_ops_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/conv_ops_test.cc" "${tensorflow_source_dir}/tensorflow/core/kernels/debug_ops_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/resize_bilinear_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/resize_nearest_neighbor_op_benchmark_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/spacetobatch_benchmark_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/sparse_add_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/sparse_dense_binary_op_shared_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/sparse_tensor_dense_matmul_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/summary_image_op_test.cc" - "${tensorflow_source_dir}/tensorflow/core/kernels/summary_op_test.cc" "${tensorflow_source_dir}/tensorflow/core/kernels/quantized_activation_ops_test.cc" "${tensorflow_source_dir}/tensorflow/core/kernels/quantized_bias_add_op_test.cc" "${tensorflow_source_dir}/tensorflow/core/kernels/quantized_concat_op_test.cc" @@ -312,10 +285,8 @@ if (tensorflow_BUILD_CC_TESTS) "${tensorflow_source_dir}/tensorflow/core/platform/cloud/retrying_file_system_test.cc" "${tensorflow_source_dir}/tensorflow/core/platform/cloud/time_util_test.cc" "${tensorflow_source_dir}/tensorflow/core/platform/hadoop/hadoop_file_system_test.cc" - "${tensorflow_source_dir}/tensorflow/core/platform/port_test.cc" "${tensorflow_source_dir}/tensorflow/core/platform/profile_utils/cpu_utils_test.cc" - "${tensorflow_source_dir}/tensorflow/core/common_runtime/direct_session_test.cc" - "${tensorflow_source_dir}/tensorflow/core/common_runtime/direct_session_with_tracking_alloc_test.cc" + "${tensorflow_source_dir}/tensorflow/core/platform/subprocess_test.cc" "${tensorflow_source_dir}/tensorflow/core/common_runtime/gpu/gpu_allocator_retry_test.cc" "${tensorflow_source_dir}/tensorflow/core/common_runtime/gpu/gpu_debug_allocator_test.cc" "${tensorflow_source_dir}/tensorflow/core/distributed_runtime/master_test.cc" @@ -325,20 +296,9 @@ if (tensorflow_BUILD_CC_TESTS) "${tensorflow_source_dir}/tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding_test.cc" "${tensorflow_source_dir}/tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr_test.cc" "${tensorflow_source_dir}/tensorflow/core/distributed_runtime/master_test.cc" - "${tensorflow_source_dir}/tensorflow/core/framework/partial_tensor_shape_test.cc" - "${tensorflow_source_dir}/tensorflow/core/lib/core/notification_test.cc" - "${tensorflow_source_dir}/tensorflow/core/lib/gtl/cleanup_test.cc" - "${tensorflow_source_dir}/tensorflow/core/lib/gtl/edit_distance_test.cc" - "${tensorflow_source_dir}/tensorflow/core/lib/strings/strcat_test.cc" - "${tensorflow_source_dir}/tensorflow/core/ops/array_grad_test.cc" - "${tensorflow_source_dir}/tensorflow/core/ops/nn_ops_test.cc" "${tensorflow_source_dir}/tensorflow/core/example/example_parser_configuration_test.cc" "${tensorflow_source_dir}/tensorflow/core/example/feature_util_test.cc" "${tensorflow_source_dir}/tensorflow/core/util/reporter_test.cc" - "${tensorflow_source_dir}/tensorflow/core/util/memmapped_file_system_test.cc" - "${tensorflow_source_dir}/tensorflow/core/util/sparse_sparse_tensor_test.cc" - "${tensorflow_source_dir}/tensorflow/core/debug/debug_gateway_test.cc" - "${tensorflow_source_dir}/tensorflow/core/debug/debug_io_utils_test.cc" "${tensorflow_source_dir}/tensorflow/contrib/factorization/kernels/clustering_ops_test.cc" "${tensorflow_source_dir}/tensorflow/contrib/session_bundle/bundle_shim_test.cc" "${tensorflow_source_dir}/tensorflow/contrib/session_bundle/bundle_test.cc" @@ -348,7 +308,15 @@ if (tensorflow_BUILD_CC_TESTS) ) endif() - list(REMOVE_ITEM tf_test_src_simple ${tf_test_src_simple_exclude}) + # Tests for saved_model require data, so need to treat them separately. + file(GLOB tf_cc_saved_model_test_srcs + "${tensorflow_source_dir}/tensorflow/cc/saved_model/*_test.cc" + ) + + list(REMOVE_ITEM tf_test_src_simple + ${tf_test_src_simple_exclude} + ${tf_cc_saved_model_test_srcs} + ) set(tf_test_lib tf_test_lib) add_library(${tf_test_lib} STATIC ${tf_src_testlib}) @@ -360,6 +328,7 @@ if (tensorflow_BUILD_CC_TESTS) $<TARGET_OBJECTS:tf_core_cpu> $<TARGET_OBJECTS:tf_core_framework> $<TARGET_OBJECTS:tf_core_kernels> + $<TARGET_OBJECTS:tf_cc> $<TARGET_OBJECTS:tf_cc_framework> $<TARGET_OBJECTS:tf_cc_ops> $<TARGET_OBJECTS:tf_core_ops> @@ -375,10 +344,23 @@ if (tensorflow_BUILD_CC_TESTS) ${tensorflow_EXTERNAL_LIBRARIES} ) + # All tests that require no data. AddTests( SOURCES ${tf_test_src_simple} OBJECTS ${tf_obj_test} LIBS ${tf_test_libs} - DEPENDS googletest ) + + # Tests for tensorflow/cc/saved_model. + file(GLOB_RECURSE tf_cc_saved_model_test_data + "${tensorflow_source_dir}/tensorflow/cc/saved_model/testdata/*" + ) + + AddTests( + SOURCES ${tf_cc_saved_model_test_srcs} + DATA ${tf_cc_saved_model_test_data} + OBJECTS ${tf_obj_test} + LIBS ${tf_test_libs} + ) + endif(tensorflow_BUILD_CC_TESTS) |