[GitHub] piiswrong closed pull request #9463: Rename kvstore/utils.* to kvstore/kvstore_utils.*

[GitBox <gi...@apache.org>]

piiswrong closed pull request #9463: Rename kvstore/utils.* to kvstore/kvstore_utils.*
URL: https://github.com/apache/incubator-mxnet/pull/9463
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/src/kvstore/comm.h b/src/kvstore/comm.h
index d41fa64cf5..da2d03d519 100644
--- a/src/kvstore/comm.h
+++ b/src/kvstore/comm.h
@@ -34,7 +34,7 @@
 #include "gradient_compression.h"
 #include "../ndarray/ndarray_function.h"
 #include "../operator/tensor/sparse_retain-inl.h"
-#include "./utils.h"
+#include "./kvstore_utils.h"
 namespace mxnet {
 namespace kvstore {
 /**
diff --git a/src/kvstore/kvstore_local.h b/src/kvstore/kvstore_local.h
index 78b6c8f231..7b3d6fa4cd 100644
--- a/src/kvstore/kvstore_local.h
+++ b/src/kvstore/kvstore_local.h
@@ -34,7 +34,7 @@
 #include <functional>
 #include <algorithm>
 #include "./comm.h"
-#include "./utils.h"
+#include "./kvstore_utils.h"
 
 namespace mxnet {
 namespace kvstore {
diff --git a/src/kvstore/utils.cc b/src/kvstore/kvstore_utils.cc
similarity index 96%
rename from src/kvstore/utils.cc
rename to src/kvstore/kvstore_utils.cc
index c22553f3b6..9e14d8ba75 100644
--- a/src/kvstore/utils.cc
+++ b/src/kvstore/kvstore_utils.cc
@@ -18,11 +18,11 @@
  */
 
 /*!
- * \file utils.cc
+ * \file kvstore_utils.cc
  * \brief cpu implementation of util functions
  */
 
-#include "./utils.h"
+#include "./kvstore_utils.h"
 #include "../common/utils.h"
 
 namespace mxnet {
diff --git a/src/kvstore/utils.cu b/src/kvstore/kvstore_utils.cu
similarity index 98%
rename from src/kvstore/utils.cu
rename to src/kvstore/kvstore_utils.cu
index 088a49efc8..00f316fe6d 100644
--- a/src/kvstore/utils.cu
+++ b/src/kvstore/kvstore_utils.cu
@@ -19,7 +19,7 @@
 
 /*!
  *  Copyright (c) 2017 by Contributors
- * \file utils.cu
+ * \file kvstore_utils.cu
  * \brief gpu implementation of util functions
  */
 #if defined(_MSC_VER) && __CUDACC_VER_MAJOR__ == 8 && __CUDACC_VER_BUILD__ != 44
@@ -32,10 +32,10 @@
 #else
 #undef SORT_WITH_THRUST
 #endif
-#include "./utils.h"
-#include "../common/utils.h"
+#include "./kvstore_utils.h"
 #include <cub/cub.cuh>
 #include <mxnet/resource.h>
+#include "../common/utils.h"
 
 namespace mxnet {
 namespace kvstore {
diff --git a/src/kvstore/utils.h b/src/kvstore/kvstore_utils.h
similarity index 89%
rename from src/kvstore/utils.h
rename to src/kvstore/kvstore_utils.h
index 75473452ce..8255619cdb 100644
--- a/src/kvstore/utils.h
+++ b/src/kvstore/kvstore_utils.h
@@ -18,11 +18,11 @@
  */
 
 /*!
- * \file utils.h
+ * \file kvstore_utils.h
  * \brief Basic utilility functions.
  */
-#ifndef MXNET_KVSTORE_UTILS_H_
-#define MXNET_KVSTORE_UTILS_H_
+#ifndef MXNET_KVSTORE_KVSTORE_UTILS_H_
+#define MXNET_KVSTORE_KVSTORE_UTILS_H_
 
 #include <dmlc/logging.h>
 #include <mxnet/ndarray.h>
@@ -44,4 +44,4 @@ void UniqueImpl(const Resource& rsc, mshadow::Stream<xpu> *s,
 }  // namespace kvstore
 }  // namespace mxnet
 
-#endif  // MXNET_KVSTORE_UTILS_H_
+#endif  // MXNET_KVSTORE_KVSTORE_UTILS_H_


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services