Vendor Python dependencies of NNPACK

Summary:
Include six, enum34, and PeachPy as Caffe2 submodules, and use the versions from submodules instead of downloading them during configuration time
Closes https://github.com/caffe2/caffe2/pull/1901

Differential Revision: D6930731

Pulled By: Maratyszcza

fbshipit-source-id: d0c1c7681605d957de6f51bd24fbb25afc0f282f
This commit is contained in:
Marat Dukhan
2018-02-07 17:45:35 -08:00
committed by Facebook Github Bot
parent e0e124e617
commit 9093eb1ba0
6 changed files with 16 additions and 1 deletions

9
.gitmodules vendored
View File

@ -52,3 +52,12 @@
[submodule "third-party/cpuinfo"]
path = third_party/cpuinfo
url = https://github.com/Maratyszcza/cpuinfo.git
[submodule "third_party/python-enum"]
path = third_party/python-enum
url = https://github.com/PeachPy/enum34.git
[submodule "third_party/python-peachpy"]
path = third_party/python-peachpy
url = https://github.com/Maratyszcza/PeachPy.git
[submodule "third_party/python-six"]
path = third_party/python-six
url = https://github.com/benjaminp/six.git

View File

@ -59,6 +59,9 @@ if (ANDROID OR IOS OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NA
CACHE PATH "Confu-style dependencies binary directory")
# Directories for NNPACK dependencies submoduled in Caffe2
set(PYTHON_SIX_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/python-six" CACHE STRING "six (Python package) source directory")
set(PYTHON_ENUM_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/python-enum" CACHE STRING "enum34 (Python package) source directory")
set(PYTHON_PEACHPY_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/python-peachpy" CACHE STRING "PeachPy (Python package) source directory")
set(CPUINFO_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/cpuinfo" CACHE STRING "cpuinfo source directory")
set(FP16_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/FP16" CACHE STRING "FP16 source directory")
set(FXDIV_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/FXdiv" CACHE STRING "FXdiv source directory")

1
third_party/python-enum vendored Symbolic link
View File

@ -0,0 +1 @@
Subproject commit 4cfedc426c4e2fc52e3f5c2b4297e15ed8d6b8c7

1
third_party/python-peachpy vendored Symbolic link
View File

@ -0,0 +1 @@
Subproject commit 29a90844d64d41345ed2ff896157c9d2cbf93dcb

1
third_party/python-six vendored Symbolic link
View File

@ -0,0 +1 @@
Subproject commit 15e31431af97e5e64b80af0a3f598d382bcdd49a