OSSForks/tensorflow
1
0
Fork 0
mirror of https://github.com/zebrajr/tensorflow.git synced 2025-12-07 00:20:20 +01:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Exclude Python test files from CMake PIP package. (#10302)

Browse Source 
* Exclude *_test.py files from the CMake-built PIP package.

* Add stray _test.py file to the PIP package.

* Nit. Convert tabs to spaces in tf_python.cmake
This commit is contained in:
Derek Murray 2017-05-30 15:51:39 -07:00 committed by gunan
parent 684006955f
commit 8b2e8b5669
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tensorflow/contrib/cmake/tf_python.cmake
View File

@ -174,8 +174,15 @@ function(add_python_module MODULE_NAME)
if(NOT ${ADD_PYTHON_MODULE_DONTCOPY}) if(NOT ${ADD_PYTHON_MODULE_DONTCOPY})
foreach(script ${module_python_srcs}) foreach(script ${module_python_srcs})
get_filename_component(REL_DIR ${script} DIRECTORY) get_filename_component(REL_DIR ${script} DIRECTORY)
# NOTE(mrry): This rule may exclude modules that should be part of
# the distributed PIP package
# (e.g. tensorflow/contrib/testing/python/framework/util_test.py),
# so we currently add explicit commands to include those files
# later on in this script.
if (NOT "${script}" MATCHES "_test\.py$")
add_custom_command(TARGET tf_python_copy_scripts_to_destination PRE_BUILD add_custom_command(TARGET tf_python_copy_scripts_to_destination PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/${script} ${CMAKE_CURRENT_BINARY_DIR}/tf_python/${script}) COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/${script} ${CMAKE_CURRENT_BINARY_DIR}/tf_python/${script})
endif()
endforeach() endforeach()
endif() endif()
endfunction() endfunction()
@ -863,9 +870,17 @@ add_dependencies(tf_python_build_pip_package
tf_python_touchup_modules tf_python_touchup_modules
tf_python_ops tf_python_ops
tf_extension_ops) tf_extension_ops)
# Fix-up Python files that were not included by the add_python_module() macros.
add_custom_command(TARGET tf_python_build_pip_package POST_BUILD add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/tensorflow/tools/pip_package/setup.py COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/tensorflow/tools/pip_package/setup.py
${CMAKE_CURRENT_BINARY_DIR}/tf_python/) ${CMAKE_CURRENT_BINARY_DIR}/tf_python/)
# This file is unfortunately excluded by the regex that excludes *_test.py
# files, but it is imported into tf.contrib, so we add it explicitly.
add_custom_command(TARGET tf_python_copy_scripts_to_destination PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/tensorflow/contrib/testing/python/framework/util_test.py
${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/testing/python/framework/)
if(WIN32) if(WIN32)
add_custom_command(TARGET tf_python_build_pip_package POST_BUILD add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/$(Configuration)/pywrap_tensorflow_internal.dll COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/$(Configuration)/pywrap_tensorflow_internal.dll