This is an automated email from the ASF dual-hosted git repository.
jxie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 46c9f48 Rename kvstore/utils.* to kvstore/kvstore_utils.* (#9463)
46c9f48 is described below
commit 46c9f48f014a4aa9413dc32ea881231d8bf5f198
Author: Can Balioglu <cbalio...@users.noreply.github.com>
AuthorDate: Wed Jan 17 14:08:00 2018 -0500
Rename kvstore/utils.* to kvstore/kvstore_utils.* (#9463)
Using an old version of GCC (e.g. 4.9) as the host compiler for nvcc
causes compilation failures in multithreaded builds when there are
multiple CUDA source files with the same name.
---
src/kvstore/comm.h | 2 +-
src/kvstore/kvstore_local.h | 2 +-
src/kvstore/{utils.cc => kvstore_utils.cc} | 4 ++--
src/kvstore/{utils.cu => kvstore_utils.cu} | 6 +++---
src/kvstore/{utils.h => kvstore_utils.h} | 8 ++++----
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/kvstore/comm.h b/src/kvstore/comm.h
index d41fa64..da2d03d 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 78b6c8f..7b3d6fa 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 c22553f..9e14d8b 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 088a49e..00f316f 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 7547345..8255619 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_
--
To stop receiving notification emails like this one, please contact
['"comm...@mxnet.apache.org" <comm...@mxnet.apache.org>'].
