From e6ce384402de43f6692f860d2d5cfbb2a98f5c98 Mon Sep 17 00:00:00 2001
From: Yulong Wang <f.s@qq.com>
Date: Thu, 26 Sep 2019 16:10:39 +0800
Subject: [PATCH] add dependency 'cub' as submodule (#1924)

---
 .gitmodules                       |  3 +++
 ThirdPartyNotices.txt             | 29 +++++++++++++++++++++++++++++
 cgmanifest.json                   |  9 +++++++++
 cmake/external/cub                |  1 +
 cmake/onnxruntime_providers.cmake |  2 +-
 5 files changed, 43 insertions(+), 1 deletion(-)
 create mode 160000 cmake/external/cub

diff --git a/.gitmodules b/.gitmodules
index 4b16a02897..86a8656636 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -44,3 +44,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
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index 9bea2e7c00..54c262f6e2 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -3740,3 +3740,32 @@ https://github.com/abseil/abseil-cpp
    See the License for the specific language governing permissions and
    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.
diff --git a/cgmanifest.json b/cgmanifest.json
index a0b61c55e7..7d566ff432 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -419,6 +419,15 @@
             },
             "comments": "used by onnxruntime"
          }
+      },
+      {
+         "component": {
+            "git": {
+               "commitHash": "c3cceac115c072fb63df1836ff46d8c60d9eb304",
+               "repositoryUrl": "https://github.com/NVlabs/cub.git"
+            },
+            "type": "git"
+         }
       }
    ],
    "Version": 1
diff --git a/cmake/external/cub b/cmake/external/cub
new file mode 160000
index 0000000000..c3cceac115
--- /dev/null
+++ b/cmake/external/cub
@@ -0,0 +1 @@
+Subproject commit c3cceac115c072fb63df1836ff46d8c60d9eb304
diff --git a/cmake/onnxruntime_providers.cmake b/cmake/onnxruntime_providers.cmake
index eb7b9f6a16..9a672d3af7 100644
--- a/cmake/onnxruntime_providers.cmake
+++ b/cmake/onnxruntime_providers.cmake
@@ -221,7 +221,7 @@ if (onnxruntime_USE_CUDA)
   endif()
   onnxruntime_add_include_to_target(onnxruntime_providers_cuda onnxruntime_common onnxruntime_framework gsl onnx onnx_proto protobuf::libprotobuf)
   add_dependencies(onnxruntime_providers_cuda ${onnxruntime_EXTERNAL_DEPENDENCIES} ${onnxruntime_tvm_dependencies})
-  target_include_directories(onnxruntime_providers_cuda PRIVATE ${ONNXRUNTIME_ROOT} ${onnxruntime_CUDNN_HOME}/include ${eigen_INCLUDE_DIRS} ${TVM_INCLUDES} PUBLIC ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
+  target_include_directories(onnxruntime_providers_cuda PRIVATE ${ONNXRUNTIME_ROOT} ${PROJECT_SOURCE_DIR}/external/cub ${onnxruntime_CUDNN_HOME}/include ${eigen_INCLUDE_DIRS} ${TVM_INCLUDES} PUBLIC ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
   install(DIRECTORY ${PROJECT_SOURCE_DIR}/../include/onnxruntime/core/providers/cuda  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/onnxruntime/core/providers)
   set_target_properties(onnxruntime_providers_cuda PROPERTIES LINKER_LANGUAGE CUDA)
   set_target_properties(onnxruntime_providers_cuda PROPERTIES FOLDER "ONNXRuntime")