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

PYTHON_LIBRARY may be set to empty or NOTFOUND. (#61230)

Browse Source 
Summary:
Not sure why (maybe from dependencies?) but it can certainly break package lookup upon re-entry of cmake.
So instead of checking whether they are defined, we should check whether there is any meaningful value inside.

Fixes https://github.com/pytorch/pytorch/issues/59887

Pull Request resolved: https://github.com/pytorch/pytorch/pull/61230

Reviewed By: H-Huang

Differential Revision: D29668766

Pulled By: malfet

fbshipit-source-id: 79a59578740c4434327aff4f9a22eba9c4bf48d1
This commit is contained in:
Tongliang Liao 2021-07-13 07:07:09 -07:00 committed by Facebook GitHub Bot
parent ac6ec0efa1
commit 0afbb9e81e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/Dependencies.cmake
View File

@ -917,7 +917,7 @@ include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR})
# ---[ Python + Numpy
if(BUILD_PYTHON)
# If not given a Python installation, then use the current active Python
if(NOT DEFINED PYTHON_EXECUTABLE)
if(NOT PYTHON_EXECUTABLE)
execute_process(
COMMAND "which" "python" RESULT_VARIABLE _exitcode OUTPUT_VARIABLE _py_exe)
if(${_exitcode} EQUAL 0)
@ -946,7 +946,7 @@ if(BUILD_PYTHON)
# executable that we already found (if we didn't actually find an executable
# then these will just use "python", but at least they'll be consistent with
# each other).
if(NOT DEFINED PYTHON_INCLUDE_DIR)
if(NOT PYTHON_INCLUDE_DIR)
# TODO: Verify that sysconfig isn't inaccurate
pycmd_no_exit(_py_inc _exitcode "import sysconfig; print(sysconfig.get_path('include'))")
if("${_exitcode}" EQUAL 0 AND IS_DIRECTORY "${_py_inc}")
@ -955,9 +955,9 @@ if(BUILD_PYTHON)
else()
message(WARNING "Could not set Python's include dir to ${_py_inc} from sysconfig")
endif()
endif(NOT DEFINED PYTHON_INCLUDE_DIR)
endif(NOT PYTHON_INCLUDE_DIR)
if(NOT DEFINED PYTHON_LIBRARY)
if(NOT PYTHON_LIBRARY)
pycmd_no_exit(_py_lib _exitcode "import sysconfig; print(sysconfig.get_path('stdlib'))")
if("${_exitcode}" EQUAL 0 AND EXISTS "${_py_lib}" AND EXISTS "${_py_lib}")
set(PYTHON_LIBRARY "${_py_lib}")
@ -967,7 +967,7 @@ if(BUILD_PYTHON)
endif()
message(STATUS "Setting Python's library to ${PYTHON_LIBRARY}")
endif()
endif(NOT DEFINED PYTHON_LIBRARY)
endif(NOT PYTHON_LIBRARY)
# These should fill in the rest of the variables, like versions, but resepct
# the variables we set above