From 4fb5a2676c1a8d8b83c6b1b419a7bcbf419ad8bc Mon Sep 17 00:00:00 2001 From: Dmitri Smirnov Date: Mon, 13 Jan 2020 15:14:55 -0800 Subject: [PATCH 1/3] Add submodule. --- .gitmodules | 3 +++ cmake/external/FeaturizersLibrary | 1 + 2 files changed, 4 insertions(+) create mode 160000 cmake/external/FeaturizersLibrary diff --git a/.gitmodules b/.gitmodules index 19ec40f0ed5b5..bbe9507627428 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,3 +46,6 @@ [submodule "server/external/spdlog"] path = server/external/spdlog url = https://github.com/gabime/spdlog.git +[submodule "cmake/external/FeaturizersLibrary"] + path = cmake/external/FeaturizersLibrary + url = https://github.com/microsoft/FeaturizersLibrary.git diff --git a/cmake/external/FeaturizersLibrary b/cmake/external/FeaturizersLibrary new file mode 160000 index 0000000000000..097bba1700c2c --- /dev/null +++ b/cmake/external/FeaturizersLibrary @@ -0,0 +1 @@ +Subproject commit 097bba1700c2c9940ebe7890da8134c0063aa769 From 9376d51d0e98158f2479b09a5b84e333c576878b Mon Sep 17 00:00:00 2001 From: Dmitri Smirnov Date: Mon, 13 Jan 2020 15:16:30 -0800 Subject: [PATCH 2/3] Advance to the latest. --- cmake/external/FeaturizersLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/external/FeaturizersLibrary b/cmake/external/FeaturizersLibrary index 097bba1700c2c..ebec32ef06859 160000 --- a/cmake/external/FeaturizersLibrary +++ b/cmake/external/FeaturizersLibrary @@ -1 +1 @@ -Subproject commit 097bba1700c2c9940ebe7890da8134c0063aa769 +Subproject commit ebec32ef06859b6399bf8854f18b91158c87760b From 90e50396b08a1fb296fce6d75e6696c61251c7ed Mon Sep 17 00:00:00 2001 From: Dmitri Smirnov Date: Mon, 13 Jan 2020 17:59:21 -0800 Subject: [PATCH 3/3] Update cmake to build for git submodule. --- cmake/external/featurizers.cmake | 40 ++++---------------------------- 1 file changed, 5 insertions(+), 35 deletions(-) diff --git a/cmake/external/featurizers.cmake b/cmake/external/featurizers.cmake index 5f1c49b73b2f7..5c10ee15a54c0 100644 --- a/cmake/external/featurizers.cmake +++ b/cmake/external/featurizers.cmake @@ -2,48 +2,17 @@ # Licensed under the MIT License. # This source code should not depend on the onnxruntime and may be built independently -set(featurizers_URL "https://github.com/microsoft/FeaturizersLibrary.git") -set(featurizers_TAG "ebec32ef06859b6399bf8854f18b91158c87760b") - set(featurizers_pref FeaturizersLibrary) set(featurizers_ROOT ${PROJECT_SOURCE_DIR}/external/${featurizers_pref}) set(featurizers_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/external/${featurizers_pref}) -# Windows required git config setting -# and an a switch whether we link to MSVCRT statically or dynamically -if (WIN32) - ExternalProject_Add(featurizers_lib - PREFIX ${featurizers_pref} - GIT_REPOSITORY ${featurizers_URL} - GIT_TAG ${featurizers_TAG} - # Need this to properly checkout crlf - GIT_CONFIG core.autocrlf=input - SOURCE_DIR ${featurizers_ROOT} - # Location of CMakeLists.txt - SOURCE_SUBDIR src/Featurizers - BINARY_DIR ${featurizers_BINARY_DIR} - CMAKE_ARGS -Dfeaturizers_MSVC_STATIC_RUNTIME=${onnxruntime_MSVC_STATIC_RUNTIME} - INSTALL_COMMAND "" - - ) -else() - ExternalProject_Add(featurizers_lib - PREFIX ${featurizers_pref} - GIT_REPOSITORY ${featurizers_URL} - GIT_TAG ${featurizers_TAG} - SOURCE_DIR ${featurizers_ROOT} - # Location of CMakeLists.txt - SOURCE_SUBDIR src/Featurizers - BINARY_DIR ${featurizers_BINARY_DIR} - CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON - INSTALL_COMMAND "" - ) -endif() +add_subdirectory(external/FeaturizersLibrary/src/Featurizers ${featurizers_BINARY_DIR} EXCLUDE_FROM_ALL) +set_target_properties(FeaturizersCode PROPERTIES FOLDER "External/FeaturizersLibrary") add_library(onnxruntime_featurizers STATIC IMPORTED) -add_dependencies(onnxruntime_featurizers featurizers_lib) -target_include_directories(onnxruntime_featurizers INTERFACE ${featurizers_ROOT}/src) +add_dependencies(onnxruntime_featurizers FeaturizersCode) +target_include_directories(onnxruntime_featurizers INTERFACE ${featurizers_ROOT}/src) if(MSVC) set_property(TARGET onnxruntime_featurizers PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/${featurizers_pref}/${CMAKE_BUILD_TYPE}/FeaturizersCode.lib) @@ -52,6 +21,7 @@ else() ${CMAKE_CURRENT_BINARY_DIR}/external/${featurizers_pref}/libFeaturizersCode.a) endif() + if (WIN32) # Add Code Analysis properties to enable C++ Core checks. Have to do it via a props file include. set_target_properties(onnxruntime_featurizers PROPERTIES VS_USER_PROPS ${PROJECT_SOURCE_DIR}/ConfigureVisualStudioCodeAnalysis.props)