From f92b8e2ac8799ae63c4ed79777eea08a1040ecc0 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Mon, 25 Oct 2021 21:05:45 -0700 Subject: [PATCH] Clean up optional-lite references (#9534) --- ThirdPartyNotices.txt | 34 -------------------- cgmanifests/submodules/cgmanifest.json | 44 ++------------------------ cmake/winml.cmake | 4 --- cmake/winml_unittests.cmake | 1 - 4 files changed, 2 insertions(+), 81 deletions(-) diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index f429f35751..0a0d490cbc 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -4387,40 +4387,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. _____ -optional-lite - -Copyright (c) 2014-2018 Martin Moene - -https://github.com/martinmoene/optional-lite - -Distributed under the Boost Software License, Version 1.0. - -Boost Software License - Version 1.0 - August 17th, 2003 - -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -must be included in all copies of the Software, in whole or in part, and -all derivative works of the Software, unless such copies or derivative -works are solely in the form of machine-executable object code generated by -a source language processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - -_____ - DLPack https://github.com/dmlc/dlpack diff --git a/cgmanifests/submodules/cgmanifest.json b/cgmanifests/submodules/cgmanifest.json index 41c43a6ff1..0e1f23b3bb 100644 --- a/cgmanifests/submodules/cgmanifest.json +++ b/cgmanifests/submodules/cgmanifest.json @@ -100,36 +100,6 @@ "comments": "manylinux dependency" } }, - { - "component": { - "type": "git", - "git": { - "commitHash": "fd5fe3de507d4a19f5923c5d4c267e3d730500a9", - "repositoryUrl": "https://github.com/microsoft/FeaturizersLibrary.git" - }, - "comments": "git submodule at cmake/external/FeaturizersLibrary" - } - }, - { - "component": { - "type": "git", - "git": { - "commitHash": "efd9867ff0e8df23016ac6c9828d0d7bf8bec1b1", - "repositoryUrl": "https://gitlab.com/libeigen/eigen.git" - }, - "comments": "git submodule at cmake/external/FeaturizersLibrary/src/3rdParty/eigen" - } - }, - { - "component": { - "type": "git", - "git": { - "commitHash": "30cad267151fa8f1b17da8c1ef0571da6da9a8f1", - "repositoryUrl": "https://github.com/google/re2.git" - }, - "comments": "git submodule at cmake/external/FeaturizersLibrary/src/3rdParty/re2" - } - }, { "component": { "type": "git", @@ -204,7 +174,7 @@ "component": { "type": "git", "git": { - "commitHash": "f44b84154703d29a946d51ddee08f4e5725a61db", + "commitHash": "a3d65c80d32c3e584b7aab41d516a0043b2a5e84", "repositoryUrl": "https://github.com/emscripten-core/emsdk.git" }, "comments": "git submodule at cmake/external/emsdk" @@ -380,16 +350,6 @@ "comments": "git submodule at cmake/external/onnxruntime-extensions" } }, - { - "component": { - "type": "git", - "git": { - "commitHash": "4acf4553baa886e10e6613fe1452b706b0250e78", - "repositoryUrl": "https://github.com/martinmoene/optional-lite.git" - }, - "comments": "git submodule at cmake/external/optional-lite" - } - }, { "component": { "type": "git", @@ -454,7 +414,7 @@ "component": { "type": "git", "git": { - "commitHash": "a1241a967ec7920310a696a6c22ae2426752e135", + "commitHash": "9ec2b92d180dff8877e402018b97baa574031b8b", "repositoryUrl": "https://github.com/microsoft/onnxruntime-tvm.git" }, "comments": "git submodule at cmake/external/tvm" diff --git a/cmake/winml.cmake b/cmake/winml.cmake index 6e429e01df..c870d4fd9f 100644 --- a/cmake/winml.cmake +++ b/cmake/winml.cmake @@ -408,7 +408,6 @@ target_include_directories(winml_lib_image PRIVATE ${REPO_ROOT}/cmake/external/o target_include_directories(winml_lib_image PRIVATE ${REPO_ROOT}/cmake/external/protobuf/src) target_include_directories(winml_lib_image PRIVATE ${ONNXRUNTIME_INCLUDE_DIR}/core/platform/windows) target_include_directories(winml_lib_image PRIVATE ${REPO_ROOT}/cmake/external/flatbuffers/include) -target_include_directories(winml_lib_image PRIVATE ${REPO_ROOT}/cmake/external/optional-lite/include) target_include_directories(winml_lib_image PRIVATE ${REPO_ROOT}/cmake/external/mp11/include) target_include_directories(winml_lib_image PRIVATE ${REPO_ROOT}/winml) @@ -525,7 +524,6 @@ target_include_directories(winml_lib_api PRIVATE ${REPO_ROOT}/cmake/external/pro target_include_directories(winml_lib_api PRIVATE ${REPO_ROOT}/cmake/external/gsl/include) target_include_directories(winml_lib_api PRIVATE ${REPO_ROOT}/cmake/external/SafeInt) target_include_directories(winml_lib_api PRIVATE ${REPO_ROOT}/cmake/external/flatbuffers/include) -target_include_directories(winml_lib_api PRIVATE ${REPO_ROOT}/cmake/external/optional-lite/include) target_include_directories(winml_lib_api PRIVATE ${REPO_ROOT}/cmake/external/mp11/include) target_include_directories(winml_lib_api PRIVATE ${REPO_ROOT}/winml) @@ -617,7 +615,6 @@ target_include_directories(winml_lib_api_experimental PRIVATE ${REPO_ROOT}/cmake target_include_directories(winml_lib_api_experimental PRIVATE ${REPO_ROOT}/cmake/external/gsl/include) target_include_directories(winml_lib_api_experimental PRIVATE ${REPO_ROOT}/cmake/external/SafeInt) target_include_directories(winml_lib_api_experimental PRIVATE ${REPO_ROOT}/cmake/external/flatbuffers/include) -target_include_directories(winml_lib_api_experimental PRIVATE ${REPO_ROOT}/cmake/external/optional-lite/include) target_include_directories(winml_lib_api_experimental PRIVATE ${REPO_ROOT}/cmake/external/mp11/include) target_include_directories(winml_lib_api_experimental PRIVATE ${REPO_ROOT}/winml) @@ -774,7 +771,6 @@ target_include_directories(winml_dll PRIVATE ${REPO_ROOT}/cmake/external/gsl/inc target_include_directories(winml_dll PRIVATE ${REPO_ROOT}/cmake/external/eigen) target_include_directories(winml_dll PRIVATE ${REPO_ROOT}/cmake/external/SafeInt) target_include_directories(winml_dll PRIVATE ${REPO_ROOT}/cmake/external/flatbuffers/include) -target_include_directories(winml_dll PRIVATE ${REPO_ROOT}/cmake/external/optional-lite/include) target_include_directories(winml_dll PRIVATE ${REPO_ROOT}/cmake/external/mp11/include) target_include_directories(winml_dll PRIVATE ${REPO_ROOT}/winml) diff --git a/cmake/winml_unittests.cmake b/cmake/winml_unittests.cmake index e9ff2e5575..f7da46124b 100644 --- a/cmake/winml_unittests.cmake +++ b/cmake/winml_unittests.cmake @@ -12,7 +12,6 @@ set(WINML_TEST_INC_DIR ${REPO_ROOT}/cmake/external/protobuf/src ${REPO_ROOT}/cmake/external/wil/include ${REPO_ROOT}/cmake/external/SafeInt - ${REPO_ROOT}/cmake/external/optional-lite/include ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/winml_api ${CMAKE_CURRENT_BINARY_DIR}/winml_api/comp_generated