From c0ec7d56c4a3ea5ec91ec7f1494535c9ec61cb76 Mon Sep 17 00:00:00 2001
From: Changming Sun <chasun@microsoft.com>
Date: Tue, 18 Dec 2018 13:51:01 -0800
Subject: [PATCH] Clean up garbage files (#208)

---
 cmake/CMakeLists.txt             |  2 --
 cmake/external/cub.cmake         | 30 ------------------------------
 cmake/patches/cub/CMakeLists.txt |  6 ------
 cmake/patches/protobuf.patch     | 27 ---------------------------
 4 files changed, 65 deletions(-)
 delete mode 100644 cmake/external/cub.cmake
 delete mode 100644 cmake/patches/cub/CMakeLists.txt
 delete mode 100644 cmake/patches/protobuf.patch

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 7769cee8f3..f91c85b38a 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -431,7 +431,6 @@ if (onnxruntime_USE_CUDA)
   endif ()
   file(TO_CMAKE_PATH ${onnxruntime_CUDNN_HOME} onnxruntime_CUDNN_HOME)
   find_package(CUDA 9.0 REQUIRED)
-  include(cub)
   set(CUDA_LINK_LIBRARIES_KEYWORD PRIVATE)
   if (WIN32)
     link_directories(${onnxruntime_CUDNN_HOME}/lib/x64)
@@ -442,7 +441,6 @@ if (onnxruntime_USE_CUDA)
     set(ONNXRUNTIME_CUDA_LIBRARIES cudnn_static cublas_static culibos)
   endif()
   list(APPEND onnxruntime_EXTERNAL_LIBRARIES ${ONNXRUNTIME_CUDA_LIBRARIES})
-  list(APPEND onnxruntime_EXTERNAL_DEPENDENCIES cub)
 
   set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -gencode=arch=compute_30,code=sm_30") # K series
   set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -gencode=arch=compute_50,code=sm_50") # M series
diff --git a/cmake/external/cub.cmake b/cmake/external/cub.cmake
deleted file mode 100644
index 080e11c7fd..0000000000
--- a/cmake/external/cub.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-include (ExternalProject)
-
-set(cub_URL https://github.com/NVlabs/cub/archive/v1.8.0.zip)
-set(cub_HASH SHA256=6bfa06ab52a650ae7ee6963143a0bbc667d6504822cbd9670369b598f18c58c3)
-set(cub_BUILD ${CMAKE_CURRENT_BINARY_DIR}/cub/src/cub)
-set(cub_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/cub/src/cub)
-set(cub_ARCHIVE_DIR ${CMAKE_CURRENT_BINARY_DIR}/external/cub_archive)
-
-ExternalProject_Add(cub
-    PREFIX cub
-    URL ${cub_URL}
-    URL_HASH ${cub_HASH}
-    DOWNLOAD_DIR "${DOWNLOAD_LOCATION}"
-    BUILD_IN_SOURCE 1
-    PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/patches/cub/CMakeLists.txt ${cub_BUILD}
-    INSTALL_COMMAND  ${CMAKE_COMMAND} -E copy_directory  ${cub_INCLUDE_DIR}/cub ${cub_ARCHIVE_DIR}/cub)
diff --git a/cmake/patches/cub/CMakeLists.txt b/cmake/patches/cub/CMakeLists.txt
deleted file mode 100644
index 8fbb114c34..0000000000
--- a/cmake/patches/cub/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-cmake_minimum_required(VERSION 2.8.3)
-
-project(cub)
diff --git a/cmake/patches/protobuf.patch b/cmake/patches/protobuf.patch
deleted file mode 100644
index 111d5655ca..0000000000
--- a/cmake/patches/protobuf.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/src/google/protobuf/compiler/cpp/cpp_file.cc b/src/google/protobuf/compiler/cpp/cpp_file.cc
-index a066a6a7..636a864f 100644
---- a/src/google/protobuf/compiler/cpp/cpp_file.cc
-+++ b/src/google/protobuf/compiler/cpp/cpp_file.cc
-@@ -972,6 +972,11 @@ void FileGenerator::GenerateTopHeaderGuard(io::Printer* printer,
-       "#ifndef PROTOBUF_$filename_identifier$__INCLUDED\n"
-       "#define PROTOBUF_$filename_identifier$__INCLUDED\n"
-       "\n"
-+      "#ifdef _MSC_VER\n"
-+      "#pragma warning(push)\n"
-+      "#pragma warning(disable: 4800)\n"
-+      "#endif  // _MSC_VER\n"
-+      "\n"
-       "#include <string>\n",
-       "filename", file_->name(), "filename_identifier", filename_identifier);
-   printer->Print("\n");
-@@ -980,6 +985,10 @@ void FileGenerator::GenerateTopHeaderGuard(io::Printer* printer,
- void FileGenerator::GenerateBottomHeaderGuard(
-     io::Printer* printer, const string& filename_identifier) {
-   printer->Print(
-+    "#ifdef _MSC_VER\n"
-+    "#pragma warning(pop)\n"
-+    "#endif  // _MSC_VER\n"
-+    "\n"
-     "#endif  // PROTOBUF_$filename_identifier$__INCLUDED\n",
-     "filename_identifier", filename_identifier);
- }