Remove vcpkg as a submodule and download/install Boost from source

.gitmodules

@@ -25,9 +25,6 @@
 [submodule "cmake/external/re2"]
 	path = cmake/external/re2
 	url = https://github.com/google/re2.git
-[submodule "cmake/external/vcpkg"]
-	path = cmake/external/vcpkg
-	url = https://github.com/Microsoft/vcpkg.git
 [submodule "cmake/external/onnx-tensorrt"]
 	path = cmake/external/onnx-tensorrt
 	url = https://github.com/onnx/onnx-tensorrt.git

cmake/CMakeLists.txt

@@ -585,6 +585,10 @@ if (onnxruntime_BUILD_SHARED_LIB)
   include(onnxruntime.cmake)
 endif()
 
+if (onnxruntime_BUILD_HOSTING)
+  include(onnxruntime_hosting.cmake)
+endif()
+
 # some of the tests rely on the shared libs to be
 # built; hence the ordering
 if (onnxruntime_BUILD_UNIT_TESTS)
@@ -612,6 +616,3 @@ if (onnxruntime_BUILD_CSHARP)
   include(onnxruntime_csharp.cmake)
 endif()
 
-if (onnxruntime_BUILD_HOSTING)
-  include(onnxruntime_hosting.cmake)
-endif()

cmake/get_boost.cmake

@@ -0,0 +1,74 @@
+set(BOOST_REQUESTED_VERSION 1.69.0 CACHE STRING "")
+set(BOOST_SHA1 8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406 CACHE STRING "")
+set(BOOST_USE_STATIC_LIBS false CACHE BOOL "")
+
+set(BOOST_COMPONENTS program_options system thread)
+
+if(WIN32)
+  message(FATAL_ERROR "Windows not currently supported")
+endif()
+
+if(BOOST_USE_STATIC_LIBS)
+  set(LIBRARY_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX})
+  set(LIBRARY_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
+else()
+  set(LIBRARY_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX})
+  set(LIBRARY_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+endif()
+
+foreach(component ${BOOST_COMPONENTS})
+  list(APPEND BOOST_COMPONENTS_FOR_BUILD --with-${component})
+endforeach()
+
+set(BOOST_ROOT_DIR ${CMAKE_BINARY_DIR}/boost CACHE PATH "")
+
+# TODO: let user give their own Boost installation
+macro(DOWNLOAD_BOOST)
+  if(NOT BOOST_REQUESTED_VERSION)
+    message(FATAL_ERROR "BOOST_REQUESTED_VERSION is not defined.")
+  endif()
+
+  string(REPLACE "." "_" BOOST_REQUESTED_VERSION_UNDERSCORE ${BOOST_REQUESTED_VERSION})
+
+  set(BOOST_MAYBE_STATIC)
+  if(BOOST_USE_STATIC_LIBS)
+    set(BOOST_MAYBE_STATIC "link=static")
+  endif()
+
+  set(VARIANT "release")
+  if(CMAKE_BUILD_TYPE MATCHES Debug)
+    set(VARIANT "debug")
+  endif()
+
+  message(STATUS "Adding Boost components")
+  include(ExternalProject)
+  ExternalProject_Add(
+      Boost
+      URL http://dl.bintray.com/boostorg/release/${BOOST_REQUESTED_VERSION}/source/boost_${BOOST_REQUESTED_VERSION_UNDERSCORE}.tar.bz2
+      URL_HASH SHA256=${BOOST_SHA1}
+      DOWNLOAD_DIR ${BOOST_ROOT_DIR}
+      SOURCE_DIR ${BOOST_ROOT_DIR}
+      UPDATE_COMMAND ""
+      CONFIGURE_COMMAND ./bootstrap.sh --prefix=${BOOST_ROOT_DIR}
+      BUILD_COMMAND ./b2 install ${BOOST_MAYBE_STATIC} --prefix=${BOOST_ROOT_DIR} variant=${VARIANT} ${BOOST_COMPONENTS_FOR_BUILD}
+      BUILD_IN_SOURCE true
+      INSTALL_COMMAND ""
+      INSTALL_DIR ${BOOST_ROOT_DIR}
+      LOG_BUILD ON
+  )
+
+  ExternalProject_Get_Property(Boost INSTALL_DIR)
+  set(Boost_INCLUDE_DIR ${INSTALL_DIR}/include)
+
+  macro(libraries_to_fullpath varname)
+    set(${varname})
+    foreach(component ${BOOST_COMPONENTS})
+      list(APPEND ${varname} ${INSTALL_DIR}/lib/${LIBRARY_PREFIX}boost_${component}${LIBRARY_SUFFIX})
+    endforeach()
+  endmacro()
+
+  libraries_to_fullpath(Boost_LIBRARIES)
+  mark_as_advanced(Boost_LIBRARIES Boost_INCLUDE_DIR)
+endmacro()
+
+DOWNLOAD_BOOST()

cmake/onnxruntime_hosting.cmake

@@ -21,7 +21,7 @@ if(NOT WIN32)
 endif()
 
 # Setup dependencies
-find_package(Boost 1.69 COMPONENTS system context thread program_options REQUIRED)
+include(get_boost.cmake)
 set(re2_src ${REPO_ROOT}/cmake/external/re2)
 
 # Setup source code
@@ -61,6 +61,7 @@ target_include_directories(onnxruntime_hosting_http_core_lib
   ${Boost_INCLUDE_DIR}
   ${re2_src}
 )
+add_dependencies(onnxruntime_hosting_http_core_lib Boost)
 target_link_libraries(onnxruntime_hosting_http_core_lib PRIVATE
   ${Boost_LIBRARIES}
 )

cmake/onnxruntime_unittests.cmake

@@ -67,7 +67,7 @@ endfunction(AddTest)
 #can propagate correctly.
 
 file(GLOB onnxruntime_test_utils_src
-  "${TEST_SRC_DIR}/util/http/*.h"
+  "${TEST_SRC_DIR}/util/include/*.h"
   "${TEST_SRC_DIR}/util/*.cc"
 )
 
@@ -551,10 +551,9 @@ if (onnxruntime_BUILD_HOSTING)
     endif()
   endif()
 
-  find_package(Boost 1.69 COMPONENTS system context thread program_options REQUIRED)
   add_library(onnxruntime_test_utils_for_hosting ${onnxruntime_test_hosting_src})
   onnxruntime_add_include_to_target(onnxruntime_test_utils_for_hosting onnxruntime_test_utils gtest gmock gsl onnx onnx_proto hosting_proto)
-  add_dependencies(onnxruntime_test_utils_for_hosting onnxruntime_hosting ${onnxruntime_EXTERNAL_DEPENDENCIES})
+  add_dependencies(onnxruntime_test_utils_for_hosting onnxruntime_hosting Boost ${onnxruntime_EXTERNAL_DEPENDENCIES})
   target_include_directories(onnxruntime_test_utils_for_hosting PUBLIC ${Boost_INCLUDE_DIR} ${REPO_ROOT}/cmake/external/re2 ${CMAKE_CURRENT_BINARY_DIR}/onnx ${ONNXRUNTIME_ROOT}/hosting/http ${ONNXRUNTIME_ROOT}/hosting/http/core PRIVATE ${ONNXRUNTIME_ROOT} )
   target_link_libraries(onnxruntime_test_utils_for_hosting ${Boost_LIBRARIES} ${onnx_test_libs})
 

tools/ci_build/build.py

@@ -217,17 +217,6 @@ def install_python_deps(numpy_version=""):
     dep_packages.append('numpy==%s' % numpy_version if numpy_version else 'numpy')
     run_subprocess([sys.executable, '-m', 'pip', 'install', '--trusted-host', 'files.pythonhosted.org'] + dep_packages)
 
-def install_hosting_deps(source_dir):
-    vcpkg_folder_path = os.path.join(source_dir, "cmake", "external", "vcpkg")
-    vcpkg_executable = os.path.join(vcpkg_folder_path, 'vcpkg')
-
-    if (not os.path.exists(vcpkg_executable)):
-        file_ending = '.bat' if is_windows() else '.sh'
-        boostrap_path = os.path.join(vcpkg_folder_path, 'bootstrap-vcpkg' + file_ending)
-        run_subprocess([boostrap_path])
-
-    run_subprocess([vcpkg_executable, 'install', 'boost-beast', 'boost-program-options', 'boost-uuid'])
-
 def check_md5(filename, expected_md5):
     if not os.path.exists(filename):
         return False
@@ -361,10 +350,6 @@ def generate_build_tree(cmake_path, source_dir, build_dir, cuda_home, cudnn_home
     if path_to_protoc_exe:
         cmake_args += ["-DONNX_CUSTOM_PROTOC_EXECUTABLE=%s" % path_to_protoc_exe]
 
-    if args.build_hosting:
-        toolchain_path = os.path.join(cmake_dir, 'external', 'vcpkg', 'scripts', 'buildsystems', 'vcpkg.cmake')
-        cmake_args += ["-DCMAKE_TOOLCHAIN_FILE=" + toolchain_path]
-
     if args.gen_doc:
         cmake_args += ["-Donnxruntime_PYBIND_EXPORT_OPSCHEMA=ON"]
 
@@ -713,8 +698,6 @@ def main():
             install_python_deps(args.numpy_version)
         if (not args.skip_submodule_sync):
             update_submodules(source_dir)
-        if (args.build_hosting):
-            install_hosting_deps(source_dir)
 
         if args.enable_onnx_tests or args.download_test_data:
             if not args.test_data_url or not args.test_data_checksum:

tools/ci_build/github/linux/ubuntu16.04/install.sh

@@ -28,10 +28,8 @@ apt-get update && apt-get install -y --no-install-recommends \
         unzip \
         rsync libunwind8 \
         python3-setuptools python3-numpy python3-wheel python python3-pip \
-        software-properties-common
+        g++
 
-add-apt-repository ppa:ubuntu-toolchain-r/test
-apt-get update && apt-get install -y --no-install-recommends g++-7
 
 locale-gen en_US.UTF-8
 update-locale LANG=en_US.UTF-8