Vendor NNPACK dependencies with Caffe2

This commit is contained in:
Marat Dukhan 2018-01-31 21:05:07 -08:00
parent bac898dbfa
commit 7ee286c80a
12 changed files with 21 additions and 9 deletions

11
.gitmodules vendored
View file

@ -32,16 +32,16 @@
path = third_party/gloo
url = https://github.com/facebookincubator/gloo
[submodule "third_party/NNPACK_deps/pthreadpool"]
path = third_party/NNPACK_deps/pthreadpool
path = third_party/pthreadpool
url = https://github.com/Maratyszcza/pthreadpool.git
[submodule "third_party/NNPACK_deps/FXdiv"]
path = third_party/NNPACK_deps/FXdiv
path = third_party/FXdiv
url = https://github.com/Maratyszcza/FXdiv.git
[submodule "third_party/NNPACK_deps/FP16"]
path = third_party/NNPACK_deps/FP16
path = third_party/FP16
url = https://github.com/Maratyszcza/FP16.git
[submodule "third_party/NNPACK_deps/psimd"]
path = third_party/NNPACK_deps/psimd
path = third_party/psimd
url = https://github.com/Maratyszcza/psimd.git
[submodule "third_party/aten"]
path = third_party/aten
@ -49,3 +49,6 @@
[submodule "third_party/zstd"]
path = third_party/zstd
url = https://github.com/facebook/zstd.git
[submodule "third-party/cpuinfo"]
path = third_party/cpuinfo
url = https://github.com/Maratyszcza/cpuinfo.git

View file

@ -58,6 +58,14 @@ if (ANDROID OR IOS OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NA
set(CONFU_DEPENDENCIES_BINARY_DIR ${PROJECT_BINARY_DIR}/confu-deps
CACHE PATH "Confu-style dependencies binary directory")
# Directories for NNPACK dependencies submoduled in Caffe2
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")
set(PSIMD_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/psimd" CACHE STRING "PSimd source directory")
set(PTHREADPOOL_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/pthreadpool" CACHE STRING "pthreadpool source directory")
set(GOOGLETEST_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/googletest" CACHE STRING "Google Test source directory")
if(NOT TARGET nnpack)
set(NNPACK_BUILD_TESTS OFF CACHE BOOL "")
set(NNPACK_BUILD_BENCHMARKS OFF CACHE BOOL "")

1
third_party/FP16 vendored Submodule

@ -0,0 +1 @@
Subproject commit af4eeb5c50b02a76a0f89471da00032c26973d41

1
third_party/FXdiv vendored Submodule

@ -0,0 +1 @@
Subproject commit 8d6ecbee2f8261590fae277fb2c7a68ff962737d

2
third_party/NNPACK vendored

@ -1 +1 @@
Subproject commit 12086a580d18328e4c56def401acce625f8f8c9a
Subproject commit 38047b2ed4a54743e0d681cc804117361e042b61

@ -1 +0,0 @@
Subproject commit 2e9eeeb0b463736d13b887d790ac7e72e78fa4bc

@ -1 +0,0 @@
Subproject commit 8f85044fb41e560508cd69ed26c9afb9cc120e8a

@ -1 +0,0 @@
Subproject commit 0b26a3fb98dd6af7e1f4e0796c56df6b32b1c016

@ -1 +0,0 @@
Subproject commit 9e17903a3fc963fe86b151aaddae7cf1b1d34815

1
third_party/cpuinfo vendored Submodule

@ -0,0 +1 @@
Subproject commit d581716a489bc026f1b6398126423d0a40394f51

1
third_party/psimd vendored Submodule

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

1
third_party/pthreadpool vendored Submodule

@ -0,0 +1 @@
Subproject commit b76d1ca08902ed31dd7ae7f364f53ef35190464a