diff options
-rw-r--r-- | .gitmodules | 9 | ||||
-rw-r--r-- | CMakeLists.txt | 24 | ||||
-rw-r--r-- | cmake/modules/DownloadASMJIT.cmake | 16 | ||||
-rw-r--r-- | cmake/modules/DownloadCPUINFO.cmake | 16 | ||||
-rw-r--r-- | cmake/modules/DownloadGTEST.cmake | 16 | ||||
-rw-r--r-- | test/CMakeLists.txt | 14 | ||||
m--------- | third_party/asmjit | 0 | ||||
m--------- | third_party/cpuinfo | 0 | ||||
m--------- | third_party/googletest | 0 |
9 files changed, 15 insertions, 80 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..9b3f016 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,9 @@ +[submodule "third_party/asmjit"] + path = third_party/asmjit + url = https://github.com/asmjit/asmjit.git +[submodule "third_party/cpuinfo"] + path = third_party/cpuinfo + url = https://github.com/pytorch/cpuinfo +[submodule "third_party/googletest"] + path = third_party/googletest + url = https://github.com/google/googletest diff --git a/CMakeLists.txt b/CMakeLists.txt index 494e261..6008a34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,16 +106,8 @@ target_compile_options(fbgemm_avx512 PRIVATE if(NOT TARGET asmjit) #Download asmjit from github if ASMJIT_SRC_DIR is not specified. if(NOT DEFINED ASMJIT_SRC_DIR) - message(STATUS "Downloading asmjit to ${FBGEMM_THIRDPARTY_DIR}/asmjit - (define ASMJIT_SRC_DIR to avoid it)") - configure_file("${FBGEMM_SOURCE_DIR}/cmake/modules/DownloadASMJIT.cmake" - "${FBGEMM_BINARY_DIR}/asmjit-download/CMakeLists.txt") - execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . - WORKING_DIRECTORY "${FBGEMM_BINARY_DIR}/asmjit-download") - execute_process(COMMAND "${CMAKE_COMMAND}" --build . - WORKING_DIRECTORY "${FBGEMM_BINARY_DIR}/asmjit-download") - set(ASMJIT_SRC_DIR "${FBGEMM_THIRDPARTY_DIR}/asmjit" CACHE STRING - "asmjit source directory") + set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/third_party/asmjit" + CACHE STRING "asmjit source directory from submodules") endif() #build asmjit @@ -127,16 +119,8 @@ endif() if(NOT TARGET cpuinfo) #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified. if(NOT DEFINED CPUINFO_SOURCE_DIR) - message(STATUS "Downloading cpuinfo to ${FBGEMM_THIRDPARTY_DIR}/cpuinfo - (define CPUINFO_SOURCE_DIR to avoid it)") - configure_file("${FBGEMM_SOURCE_DIR}/cmake/modules/DownloadCPUINFO.cmake" - "${FBGEMM_BINARY_DIR}/cpuinfo-download/CMakeLists.txt") - execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . - WORKING_DIRECTORY "${FBGEMM_BINARY_DIR}/cpuinfo-download") - execute_process(COMMAND "${CMAKE_COMMAND}" --build . - WORKING_DIRECTORY "${FBGEMM_BINARY_DIR}/cpuinfo-download") - set(CPUINFO_SOURCE_DIR "${FBGEMM_THIRDPARTY_DIR}/cpuinfo" CACHE STRING - "cpuinfo source directory") + set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/third_party/cpuinfo" + CACHE STRING "cpuinfo source directory from submodules") endif() #build cpuinfo diff --git a/cmake/modules/DownloadASMJIT.cmake b/cmake/modules/DownloadASMJIT.cmake deleted file mode 100644 index ca39600..0000000 --- a/cmake/modules/DownloadASMJIT.cmake +++ /dev/null @@ -1,16 +0,0 @@ -cmake_minimum_required(VERSION 3.5 FATAL_ERROR) - -project(asmjit-download NONE) - -include(ExternalProject) - -ExternalProject_Add(asmjit - GIT_REPOSITORY https://github.com/asmjit/asmjit - GIT_TAG 673dcefaa048c5f5a2bf8b85daf8f7b9978d018a - SOURCE_DIR "${FBGEMM_THIRDPARTY_DIR}/asmjit" - BINARY_DIR "${FBGEMM_BINARY_DIR}/asmjit" - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" - TEST_COMMAND "" -) diff --git a/cmake/modules/DownloadCPUINFO.cmake b/cmake/modules/DownloadCPUINFO.cmake deleted file mode 100644 index 529dcc2..0000000 --- a/cmake/modules/DownloadCPUINFO.cmake +++ /dev/null @@ -1,16 +0,0 @@ -cmake_minimum_required(VERSION 3.5 FATAL_ERROR) - -project(cpuinfo-download NONE) - -include(ExternalProject) - -ExternalProject_Add(cpuinfo - GIT_REPOSITORY https://github.com/pytorch/cpuinfo - GIT_TAG master - SOURCE_DIR "${FBGEMM_THIRDPARTY_DIR}/cpuinfo" - BINARY_DIR "${FBGEMM_BINARY_DIR}/cpuinfo" - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" - TEST_COMMAND "" -) diff --git a/cmake/modules/DownloadGTEST.cmake b/cmake/modules/DownloadGTEST.cmake deleted file mode 100644 index 2d1286b..0000000 --- a/cmake/modules/DownloadGTEST.cmake +++ /dev/null @@ -1,16 +0,0 @@ -cmake_minimum_required(VERSION 3.5 FATAL_ERROR) - -project(googletest-download NONE) - -include(ExternalProject) - -ExternalProject_Add(googletest - GIT_REPOSITORY https://github.com/google/googletest - GIT_TAG 0fc5466dbb9e623029b1ada539717d10bd45e99e - SOURCE_DIR "${FBGEMM_THIRDPARTY_DIR}/googletest" - BINARY_DIR "${FBGEMM_BINARY_DIR}/googletest" - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" - TEST_COMMAND "" -) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f68da73..a7e531b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -4,17 +4,8 @@ if(FBGEMM_BUILD_TESTS AND NOT TARGET gtest) #Download Googletest framework from github if #GOOGLETEST_SOURCE_DIR is not specified. if(NOT DEFINED GOOGLETEST_SOURCE_DIR) - message(STATUS "Downloading googletest to - ${FBGEMM_THIRDPARTY_DIR}/googletest - (define GOOGLETEST_SOURCE_DIR to avoid it)") - configure_file("${FBGEMM_SOURCE_DIR}/cmake/modules/DownloadGTEST.cmake" - "${FBGEMM_BINARY_DIR}/googletest-download/CMakeLists.txt") - execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . - WORKING_DIRECTORY "${FBGEMM_BINARY_DIR}/googletest-download") - execute_process(COMMAND "${CMAKE_COMMAND}" --build . - WORKING_DIRECTORY "${FBGEMM_BINARY_DIR}/googletest-download") - set(GOOGLETEST_SOURCE_DIR "${FBGEMM_THIRDPARTY_DIR}/googletest" CACHE STRING - "googletest source directory") + set(GOOGLETEST_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/third_party/googletest" + CACHE STRING "googletest source directory from submodules") endif() #build Googletest framework @@ -44,4 +35,3 @@ foreach(TEST_FILE ${TEST_LIST}) add_gtest("${TEST_NAME}" "${TEST_FILE_ONLY}") endforeach() - diff --git a/third_party/asmjit b/third_party/asmjit new file mode 160000 +Subproject 673dcefaa048c5f5a2bf8b85daf8f7b9978d018 diff --git a/third_party/cpuinfo b/third_party/cpuinfo new file mode 160000 +Subproject d5e37adf1406cf899d7d9ec1d317c47506ccb97 diff --git a/third_party/googletest b/third_party/googletest new file mode 160000 +Subproject 0fc5466dbb9e623029b1ada539717d10bd45e99 |