Skip to content

Commit

Permalink
Delete CUB (microsoft#13534)
Browse files Browse the repository at this point in the history
### Description
Delete CUB

### Motivation and Context
Because it is already in CUDA SDK.
  • Loading branch information
snnn authored Nov 2, 2022
1 parent 5914a7e commit b1e1b25
Showing 5 changed files with 1 addition and 48 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
31 changes: 1 addition & 30 deletions ThirdPartyNotices.txt
Original file line number Diff line number Diff line change
@@ -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.
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10 changes: 0 additions & 10 deletions cgmanifests/generated/cgmanifest.json
Original file line number Diff line number Diff line change
@@ -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",
1 change: 0 additions & 1 deletion cmake/external/cub
Submodule cub deleted from c3ccea
4 changes: 0 additions & 4 deletions cmake/onnxruntime_providers.cmake
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit b1e1b25

Please sign in to comment.