[REFACTOR] cleanup structure

shaocf · Jan 16, 2016 · d530e0c · d530e0c
1 parent 5ed4dc4
commit d530e0c
Show file tree

Hide file tree

Showing 60 changed files with 42 additions and 51 deletions.
diff --git a/.gitignore b/.gitignore
@@ -51,7 +51,6 @@ Debug
 ./xgboost
 ./xgboost.mpi
 ./xgboost.mock
-rabit
 #.Rbuildignore
 R-package.Rproj
 *.cache*
@@ -65,9 +64,10 @@ java/xgboost4j-demo/data/
 java/xgboost4j-demo/tmp/
 java/xgboost4j-demo/model/
 nb-configuration*
-dmlc-core
 # Eclipse
 .project
 .cproject
 .pydevproject
 .settings/
+build
+
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "dmlc-core"]
+	path = dmlc-core
+	url = https://github.com/dmlc/dmlc-core
+[submodule "rabit"]
+	path = rabit
+	url = https://github.com/dmlc/rabit
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ An optimized general purpose gradient boosting library. The library is paralleli
 
 It implements machine learning algorithms under the [Gradient Boosting](https://en.wikipedia.org/wiki/Gradient_boosting) framework, including [Generalized Linear Model](https://en.wikipedia.org/wiki/Generalized_linear_model) (GLM) and [Gradient Boosted Decision Trees](https://en.wikipedia.org/wiki/Gradient_boosting#Gradient_tree_boosting) (GBDT). XGBoost can also be [distributed](#features) and scale to Terascale data
 
-XGBoost is part of [Distributed Machine Learning Common](http://dmlc.github.io/) <img src=https://avatars2.githubusercontent.com/u/11508361?v=3&s=20> projects
+XGBoost is part of [Distributed Machine Learning Common](http://dmlc.github.io/) projects
 
 Contents
 --------
@@ -68,7 +68,6 @@ Bug Reporting
 
 Contributing to XGBoost
 -----------------------
-
 XGBoost has been developed and used by a group of active community members. Everyone is more than welcome to contribute. It is a way to make the project better and more accessible to more users.
 * Check out [Feature Wish List](https://github.com/dmlc/xgboost/labels/Wish-List) to see what can be improved, or open an issue if you want something.
 * Contribute to the [documents and examples](https://github.com/dmlc/xgboost/blob/master/doc/) to share your experience with other users.
@@ -78,7 +77,3 @@ License
 -------
 © Contributors, 2015. Licensed under an [Apache-2](https://github.com/dmlc/xgboost/blob/master/LICENSE) license.
 
-XGBoost in Graphlab Create
---------------------------
-* XGBoost is adopted as part of boosted tree toolkit in Graphlab Create (GLC). Graphlab Create is a powerful python toolkit that allows you to do data manipulation, graph processing, hyper-parameter search, and visualization of TeraBytes scale data in one framework. Try the [Graphlab Create](http://graphlab.com/products/create/quick-start-guide.html)
-* Nice [blogpost](http://blog.graphlab.com/using-gradient-boosted-trees-to-predict-bike-sharing-demand) by Jay Gu about using GLC boosted tree to solve kaggle bike sharing challenge:
diff --git a/appveyor.yml b/appveyor.yml
diff --git a/dmlc-core b/dmlc-core
diff --git a/include/xgboost/base.h b/include/xgboost/base.h
@@ -0,0 +1,15 @@
+/*!
+ * Copyright (c) 2015 by Contributors
+ * \file base.h
+ * \brief defines configuration macros of xgboost
+ */
+#ifndef XGBOOST_BASE_H_
+#define XGBOOST_BASE_H_
+
+#include <dmlc/base.h>
+
+namespace xgboost {
+
+
+}  // namespace xgboost
+#endif  // XGBOOST_BASE_H_
diff --git a/wrapper/xgboost_wrapper.h → include/xgboost/c_api.h b/wrapper/xgboost_wrapper.h → include/xgboost/c_api.h
@@ -1,12 +1,11 @@
 /*!
- * Copyright (c) 2014 by Contributors
- * \file xgboost_wrapper.h
+ * Copyright (c) 2015 by Contributors
+ * \file c_api.h
  * \author Tianqi Chen
- * \brief a C style wrapper of xgboost
- *  can be used to create wrapper of other languages
+ * \brief C Style API of XGBoost, used to interfacing with other languages.
  */
-#ifndef XGBOOST_WRAPPER_H_
-#define XGBOOST_WRAPPER_H_
+#ifndef XGBOOST_C_API_H_
+#define XGBOOST_C_API_H_
 
 #ifdef __cplusplus
 #define XGB_EXTERN_C extern "C"
@@ -351,4 +350,4 @@ XGB_DLL int XGBoosterDumpModelWithFeatures(BoosterHandle handle,
                                            bst_ulong *len,
                                            const char ***out_models);
 
-#endif  // XGBOOST_WRAPPER_H_
+#endif  // XGBOOST_C_API_H_
diff --git a/include/xgboost/data.h b/include/xgboost/data.h
@@ -0,0 +1,8 @@
+/*!
+ * Copyright (c) 2014 by Contributors
+ * \file data.h
+ * \brief the input data structure for gradient boosting
+ * \author Tianqi Chen
+ */
+#ifndef XGBOOST_DATA_H_
+#define XGBOOST_DATA_H_
diff --git a/src/README.md → old_src/README.md b/src/README.md → old_src/README.md
diff --git a/src/data.h → old_src/data.h b/src/data.h → old_src/data.h
diff --git a/src/gbm/gblinear-inl.hpp → old_src/gbm/gblinear-inl.hpp b/src/gbm/gblinear-inl.hpp → old_src/gbm/gblinear-inl.hpp
diff --git a/src/gbm/gbm.cpp → old_src/gbm/gbm.cpp b/src/gbm/gbm.cpp → old_src/gbm/gbm.cpp
diff --git a/src/gbm/gbm.h → old_src/gbm/gbm.h b/src/gbm/gbm.h → old_src/gbm/gbm.h
diff --git a/src/gbm/gbtree-inl.hpp → old_src/gbm/gbtree-inl.hpp b/src/gbm/gbtree-inl.hpp → old_src/gbm/gbtree-inl.hpp
diff --git a/src/io/dmlc_simple.cpp → old_src/io/dmlc_simple.cpp b/src/io/dmlc_simple.cpp → old_src/io/dmlc_simple.cpp
diff --git a/src/io/io.cpp → old_src/io/io.cpp b/src/io/io.cpp → old_src/io/io.cpp
diff --git a/src/io/io.h → old_src/io/io.h b/src/io/io.h → old_src/io/io.h
diff --git a/src/io/libsvm_parser.h → old_src/io/libsvm_parser.h b/src/io/libsvm_parser.h → old_src/io/libsvm_parser.h
diff --git a/src/io/page_dmatrix-inl.hpp → old_src/io/page_dmatrix-inl.hpp b/src/io/page_dmatrix-inl.hpp → old_src/io/page_dmatrix-inl.hpp
diff --git a/src/io/page_fmatrix-inl.hpp → old_src/io/page_fmatrix-inl.hpp b/src/io/page_fmatrix-inl.hpp → old_src/io/page_fmatrix-inl.hpp
diff --git a/src/io/simple_dmatrix-inl.hpp → old_src/io/simple_dmatrix-inl.hpp b/src/io/simple_dmatrix-inl.hpp → old_src/io/simple_dmatrix-inl.hpp
diff --git a/src/io/simple_fmatrix-inl.hpp → old_src/io/simple_fmatrix-inl.hpp b/src/io/simple_fmatrix-inl.hpp → old_src/io/simple_fmatrix-inl.hpp
diff --git a/src/io/sparse_batch_page.h → old_src/io/sparse_batch_page.h b/src/io/sparse_batch_page.h → old_src/io/sparse_batch_page.h
diff --git a/src/learner/dmatrix.h → old_src/learner/dmatrix.h b/src/learner/dmatrix.h → old_src/learner/dmatrix.h
diff --git a/src/learner/evaluation-inl.hpp → old_src/learner/evaluation-inl.hpp b/src/learner/evaluation-inl.hpp → old_src/learner/evaluation-inl.hpp
diff --git a/src/learner/evaluation.h → old_src/learner/evaluation.h b/src/learner/evaluation.h → old_src/learner/evaluation.h
diff --git a/src/learner/helper_utils.h → old_src/learner/helper_utils.h b/src/learner/helper_utils.h → old_src/learner/helper_utils.h
diff --git a/src/learner/learner-inl.hpp → old_src/learner/learner-inl.hpp b/src/learner/learner-inl.hpp → old_src/learner/learner-inl.hpp
diff --git a/src/learner/objective-inl.hpp → old_src/learner/objective-inl.hpp b/src/learner/objective-inl.hpp → old_src/learner/objective-inl.hpp
diff --git a/src/learner/objective.h → old_src/learner/objective.h b/src/learner/objective.h → old_src/learner/objective.h
diff --git a/src/sync/sync.h → old_src/sync/sync.h b/src/sync/sync.h → old_src/sync/sync.h
diff --git a/src/tree/model.h → old_src/tree/model.h b/src/tree/model.h → old_src/tree/model.h
diff --git a/src/tree/param.h → old_src/tree/param.h b/src/tree/param.h → old_src/tree/param.h
diff --git a/src/tree/updater.cpp → old_src/tree/updater.cpp b/src/tree/updater.cpp → old_src/tree/updater.cpp
diff --git a/src/tree/updater.h → old_src/tree/updater.h b/src/tree/updater.h → old_src/tree/updater.h
diff --git a/src/tree/updater_basemaker-inl.hpp → old_src/tree/updater_basemaker-inl.hpp b/src/tree/updater_basemaker-inl.hpp → old_src/tree/updater_basemaker-inl.hpp
diff --git a/src/tree/updater_colmaker-inl.hpp → old_src/tree/updater_colmaker-inl.hpp b/src/tree/updater_colmaker-inl.hpp → old_src/tree/updater_colmaker-inl.hpp
diff --git a/src/tree/updater_distcol-inl.hpp → old_src/tree/updater_distcol-inl.hpp b/src/tree/updater_distcol-inl.hpp → old_src/tree/updater_distcol-inl.hpp
diff --git a/src/tree/updater_histmaker-inl.hpp → old_src/tree/updater_histmaker-inl.hpp b/src/tree/updater_histmaker-inl.hpp → old_src/tree/updater_histmaker-inl.hpp
diff --git a/src/tree/updater_prune-inl.hpp → old_src/tree/updater_prune-inl.hpp b/src/tree/updater_prune-inl.hpp → old_src/tree/updater_prune-inl.hpp
diff --git a/src/tree/updater_refresh-inl.hpp → old_src/tree/updater_refresh-inl.hpp b/src/tree/updater_refresh-inl.hpp → old_src/tree/updater_refresh-inl.hpp
diff --git a/src/tree/updater_skmaker-inl.hpp → old_src/tree/updater_skmaker-inl.hpp b/src/tree/updater_skmaker-inl.hpp → old_src/tree/updater_skmaker-inl.hpp
diff --git a/src/tree/updater_sync-inl.hpp → old_src/tree/updater_sync-inl.hpp b/src/tree/updater_sync-inl.hpp → old_src/tree/updater_sync-inl.hpp
diff --git a/src/utils/base64-inl.h → old_src/utils/base64-inl.h b/src/utils/base64-inl.h → old_src/utils/base64-inl.h
diff --git a/src/utils/bitmap.h → old_src/utils/bitmap.h b/src/utils/bitmap.h → old_src/utils/bitmap.h
diff --git a/src/utils/config.h → old_src/utils/config.h b/src/utils/config.h → old_src/utils/config.h
diff --git a/src/utils/fmap.h → old_src/utils/fmap.h b/src/utils/fmap.h → old_src/utils/fmap.h
diff --git a/src/utils/group_data.h → old_src/utils/group_data.h b/src/utils/group_data.h → old_src/utils/group_data.h
diff --git a/src/utils/io.h → old_src/utils/io.h b/src/utils/io.h → old_src/utils/io.h
diff --git a/src/utils/iterator.h → old_src/utils/iterator.h b/src/utils/iterator.h → old_src/utils/iterator.h
diff --git a/src/utils/math.h → old_src/utils/math.h b/src/utils/math.h → old_src/utils/math.h
diff --git a/src/utils/omp.h → old_src/utils/omp.h b/src/utils/omp.h → old_src/utils/omp.h
diff --git a/src/utils/quantile.h → old_src/utils/quantile.h b/src/utils/quantile.h → old_src/utils/quantile.h
diff --git a/src/utils/random.h → old_src/utils/random.h b/src/utils/random.h → old_src/utils/random.h
diff --git a/src/utils/thread.h → old_src/utils/thread.h b/src/utils/thread.h → old_src/utils/thread.h
diff --git a/src/utils/thread_buffer.h → old_src/utils/thread_buffer.h b/src/utils/thread_buffer.h → old_src/utils/thread_buffer.h
diff --git a/src/utils/utils.h → old_src/utils/utils.h b/src/utils/utils.h → old_src/utils/utils.h
diff --git a/src/xgboost_main.cpp → old_src/xgboost_main.cpp b/src/xgboost_main.cpp → old_src/xgboost_main.cpp
diff --git a/rabit b/rabit
diff --git a/src/c_api.cc b/src/c_api.cc
@@ -0,0 +1,2 @@
+#include <xgboost/c_api.h>
+