diff --git a/.gitmodules b/.gitmodules index 5a48626674..109570c9f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,9 +31,6 @@ [submodule "cmake/external/mimalloc"] path = cmake/external/mimalloc url = https://github.com/microsoft/mimalloc.git -[submodule "cmake/external/cub"] - path = cmake/external/cub - url = https://github.com/NVlabs/cub.git [submodule "cmake/external/wil"] path = cmake/external/wil url = https://github.com/microsoft/wil.git diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index 2ff1385a89..56813c8422 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -3279,35 +3279,6 @@ https://github.com/abseil/abseil-cpp limitations under the License. -_____ - -NVlabs/cub - -Copyright (c) 2010-2011, Duane Merrill. All rights reserved. -Copyright (c) 2011-2018, NVIDIA CORPORATION. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the NVIDIA CORPORATION nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - _____ microsoft/wil @@ -4776,4 +4747,4 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json index 8cfff8b5bc..bc7c0047cb 100644 --- a/cgmanifests/generated/cgmanifest.json +++ b/cgmanifests/generated/cgmanifest.json @@ -109,16 +109,6 @@ "comments": "git submodule at cmake/external/XNNPACK" } }, - { - "component": { - "type": "git", - "git": { - "commitHash": "c3cceac115c072fb63df1836ff46d8c60d9eb304", - "repositoryUrl": "https://github.com/NVlabs/cub.git" - }, - "comments": "git submodule at cmake/external/cub" - } - }, { "component": { "type": "git", diff --git a/cmake/external/cub b/cmake/external/cub deleted file mode 160000 index c3cceac115..0000000000 --- a/cmake/external/cub +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c3cceac115c072fb63df1836ff46d8c60d9eb304 diff --git a/cmake/onnxruntime_providers.cmake b/cmake/onnxruntime_providers.cmake index 40f6208e70..d6088d2215 100644 --- a/cmake/onnxruntime_providers.cmake +++ b/cmake/onnxruntime_providers.cmake @@ -472,10 +472,6 @@ if (onnxruntime_USE_CUDA) target_link_libraries(onnxruntime_providers_cuda PRIVATE nvToolsExt) endif() - if (CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 11) - target_include_directories(onnxruntime_providers_cuda PRIVATE ${PROJECT_SOURCE_DIR}/external/cub) - endif() - if (onnxruntime_ENABLE_TRAINING OR onnxruntime_ENABLE_TRAINING_OPS) target_include_directories(onnxruntime_providers_cuda PRIVATE ${ORTTRAINING_ROOT} ${MPI_CXX_INCLUDE_DIRS}) if(onnxruntime_USE_MPI)