diff --git a/.gitmodules b/.gitmodules index 5765c51b9118..5fb6b607fa78 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/cmake/External/nnpack.cmake b/cmake/External/nnpack.cmake index ba9224537728..78302af8e356 100644 --- a/cmake/External/nnpack.cmake +++ b/cmake/External/nnpack.cmake @@ -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") diff --git a/third_party/NNPACK b/third_party/NNPACK index f624fd82ebae..be6f1d2aeb99 160000 --- a/third_party/NNPACK +++ b/third_party/NNPACK @@ -1 +1 @@ -Subproject commit f624fd82ebae2a257df01c999e42c023b7356517 +Subproject commit be6f1d2aeb993920969c00003dd321e33cb66924 diff --git a/third_party/python-enum b/third_party/python-enum new file mode 120000 index 000000000000..daae8779671c --- /dev/null +++ b/third_party/python-enum @@ -0,0 +1 @@ +Subproject commit 4cfedc426c4e2fc52e3f5c2b4297e15ed8d6b8c7 diff --git a/third_party/python-peachpy b/third_party/python-peachpy new file mode 120000 index 000000000000..49d9a274c2f3 --- /dev/null +++ b/third_party/python-peachpy @@ -0,0 +1 @@ +Subproject commit 29a90844d64d41345ed2ff896157c9d2cbf93dcb diff --git a/third_party/python-six b/third_party/python-six new file mode 120000 index 000000000000..53578097e698 --- /dev/null +++ b/third_party/python-six @@ -0,0 +1 @@ +Subproject commit 15e31431af97e5e64b80af0a3f598d382bcdd49a