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

Consolidate the places that find pybind11 include dirs (#29659)

Browse Source 
Summary:
Also move the logic that installs the pybind11 headers from setup.py to cmake (to align with other headers).
Pull Request resolved: https://github.com/pytorch/pytorch/pull/29659

Differential Revision: D18458208

Pulled By: bddppq

fbshipit-source-id: cfd1e74b892d4a65591626ab321780c8c87b810d
This commit is contained in:
Junjie Bai 2019-11-12 14:48:37 -08:00 committed by Facebook Github Bot
parent fd8f74e688
commit b0c245d52d
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
caffe2/core/nomnigraph/CMakeLists.txt
View File

@ -8,7 +8,7 @@ list(APPEND Caffe2_CPU_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include)
list(APPEND Caffe2_CPU_TEST_SRCS ${NOMNI_TEST_SRCS})
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include
DESTINATION include
DESTINATION ${CMAKE_INSTALL_PREFIX}
FILES_MATCHING PATTERN "*.h")
# ---[ Send the lists to the parent scope.

9
cmake/Dependencies.cmake
View File

@ -795,12 +795,15 @@ endif()
if(pybind11_FOUND)
message(STATUS "System pybind11 found")
message(STATUS "pybind11 include dirs: " "${pybind11_INCLUDE_DIRS}")
include_directories(SYSTEM ${pybind11_INCLUDE_DIRS})
else()
message(STATUS "Using third_party/pybind11.")
include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/pybind11/include)
set(pybind11_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/../third_party/pybind11/include)
endif()
message(STATUS "pybind11 include dirs: " "${pybind11_INCLUDE_DIRS}")
include_directories(SYSTEM ${pybind11_INCLUDE_DIRS})
install(DIRECTORY ${pybind11_INCLUDE_DIRS}
DESTINATION ${CMAKE_INSTALL_PREFIX}
FILES_MATCHING PATTERN "*.h")
# ---[ MPI
if(USE_MPI)

5
setup.py
View File

@ -164,7 +164,7 @@
from __future__ import print_function
from setuptools import setup, Extension, distutils, find_packages
from collections import defaultdict
from distutils import core, dir_util
from distutils import core
from distutils.core import Distribution
from distutils.errors import DistutilsArgError
import setuptools.command.build_ext
@ -346,9 +346,6 @@ def build_deps():
if not same:
shutil.copyfile(orig_file, sym_file)
dir_util.copy_tree('third_party/pybind11/include/pybind11/',
'torch/include/pybind11')
################################################################################
# Building dependent libraries
################################################################################

2
torch/CMakeLists.txt
View File

@ -125,7 +125,7 @@ set(TORCH_PYTHON_INCLUDE_DIRECTORIES
${TORCH_ROOT}/third_party/gloo
${TORCH_ROOT}/third_party/onnx
${TORCH_ROOT}/third_party/pybind11/include
${pybind11_INCLUDE_DIRS}
${TORCH_SRC_DIR}/csrc
${TORCH_SRC_DIR}/csrc/api/include