From 63b5cc47eb6e4229882cb70065a61aba2621d090 Mon Sep 17 00:00:00 2001
From: Marat Dukhan <maratek@gmail.com>
Date: Wed, 11 Apr 2018 20:56:38 -0400
Subject: [PATCH] [caffe2] Minor changes in NNPACK CMake scripts (#6532)

- Tell NNPACK to not link pthreadpool, but only its headers
- Remove FindNNPACK.cmake as it is no longer used
---
 cmake/External/nnpack.cmake    |  1 +
 cmake/Modules/FindNNPACK.cmake | 42 ----------------------------------
 2 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 cmake/Modules/FindNNPACK.cmake

diff --git a/cmake/External/nnpack.cmake b/cmake/External/nnpack.cmake
index 239535abc9d0..2cd9efc9a1ec 100644
--- a/cmake/External/nnpack.cmake
+++ b/cmake/External/nnpack.cmake
@@ -61,6 +61,7 @@ if (ANDROID OR IOS OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NA
   if(NOT TARGET nnpack)
     set(NNPACK_BUILD_TESTS OFF CACHE BOOL "")
     set(NNPACK_BUILD_BENCHMARKS OFF CACHE BOOL "")
+    set(NNPACK_CUSTOM_THREADPOOL ON CACHE BOOL "")
     set(NNPACK_LIBRARY_TYPE "static" CACHE STRING "")
     set(PTHREADPOOL_LIBRARY_TYPE "static" CACHE STRING "")
     set(CPUINFO_LIBRARY_TYPE "static" CACHE STRING "")
diff --git a/cmake/Modules/FindNNPACK.cmake b/cmake/Modules/FindNNPACK.cmake
deleted file mode 100644
index 6a9fff3ac068..000000000000
--- a/cmake/Modules/FindNNPACK.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-# - Try to find NNPACK
-#
-# The following variables are optionally searched for defaults
-#  NNPACK_ROOT_DIR:            Base directory where all NNPACK components are found
-#
-# The following are set after configuration is done:
-#  NNPACK_FOUND
-#  NNPACK_INCLUDE_DIRS
-#  NNPACK_LIBRARIES
-#  NNPACK_LIBRARYRARY_DIRS
-
-include(FindPackageHandleStandardArgs)
-
-set(NNPACK_ROOT_DIR "" CACHE PATH "Folder contains NNPACK")
-
-find_path(NNPACK_INCLUDE_DIR nnpack.h
-    PATHS ${NNPACK_ROOT_DIR}
-    PATH_SUFFIXES include)
-
-find_library(NNPACK_LIBRARY nnpack
-    PATHS ${NNPACK_ROOT_DIR}
-    PATH_SUFFIXES lib lib64)
-
-find_library(PTHREADPOOL_LIBRARY pthreadpool
-    PATHS ${NNPACK_ROOT_DIR}
-    PATH_SUFFIXES lib lib64)
-
-find_library(CPUINFO_LIBRARY cpuinfo
-    PATHS ${NNPACK_ROOT_DIR}
-    PATH_SUFFIXES lib lib64)
-
-find_package_handle_standard_args(NNPACK DEFAULT_MSG NNPACK_INCLUDE_DIR NNPACK_LIBRARY PTHREADPOOL_LIBRARY CPUINFO_LIBRARY)
-
-if(NNPACK_FOUND)
-  set(NNPACK_INCLUDE_DIRS ${NNPACK_INCLUDE_DIR})
-  set(NNPACK_LIBRARIES ${NNPACK_LIBRARY} ${PTHREADPOOL_LIBRARY} ${CPUINFO_LIBRARY})
-  message(STATUS "Found NNPACK      (include: ${NNPACK_INCLUDE_DIR}, library: ${NNPACK_LIBRARY})")
-  message(STATUS "Found PTHREADPOOL (library: ${PTHREADPOOL_LIBRARY})")
-  message(STATUS "Found CPUINFO     (library: ${CPUINFO_LIBRARY})")
-  mark_as_advanced(NNPACK_ROOT_DIR NNPACK_LIBRARY_RELEASE NNPACK_LIBRARY_DEBUG
-                                 NNPACK_LIBRARY NNPACK_INCLUDE_DIR)
-endif()