Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bst_ulong supported by sparsematrix builder

Browse Source
This commit is contained in:
Tianqi Chen 2014-08-26 20:32:33 -07:00
parent 4787108b5f
commit 84e5fc285b
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
R-package/src/xgboost_R.cpp
View File

@ -62,9 +62,9 @@ extern "C" {
int ncol = length(indptr) - 1; int ncol = length(indptr) - 1;
int ndata = length(data); int ndata = length(data);
// transform into CSR format // transform into CSR format
std::vector<size_t> row_ptr; std::vector<bst_ulong> row_ptr;
std::vector< std::pair<unsigned, float> > csr_data; std::vector< std::pair<unsigned, float> > csr_data;
utils::SparseCSRMBuilder< std::pair<unsigned,float> > builder(row_ptr, csr_data); utils::SparseCSRMBuilder<std::pair<unsigned,float>, false, bst_ulong> builder(row_ptr, csr_data);
builder.InitBudget(); builder.InitBudget();
for (int i = 0; i < ncol; ++i) { for (int i = 0; i < ncol; ++i) {
for (int j = col_ptr[i]; j < col_ptr[i+1]; ++j) { for (int j = col_ptr[i]; j < col_ptr[i+1]; ++j) {

12
src/utils/matrix_csr.h
View File

@ -17,26 +17,26 @@ namespace utils {
* \tparam IndexType type of index used to store the index position, usually unsigned or size_t * \tparam IndexType type of index used to store the index position, usually unsigned or size_t
* \tparam whether enabling the usage of aclist, this option must be enabled manually * \tparam whether enabling the usage of aclist, this option must be enabled manually
*/ */
template<typename IndexType, bool UseAcList = false> template<typename IndexType, bool UseAcList = false, typename SizeType = size_t>
struct SparseCSRMBuilder { struct SparseCSRMBuilder {
private: private:
/*! \brief dummy variable used in the indicator matrix construction */ /*! \brief dummy variable used in the indicator matrix construction */
std::vector<size_t> dummy_aclist; std::vector<size_t> dummy_aclist;
/*! \brief pointer to each of the row */ /*! \brief pointer to each of the row */
std::vector<size_t> &rptr; std::vector<SizeType> &rptr;
/*! \brief index of nonzero entries in each row */ /*! \brief index of nonzero entries in each row */
std::vector<IndexType> &findex; std::vector<IndexType> &findex;
/*! \brief a list of active rows, used when many rows are empty */ /*! \brief a list of active rows, used when many rows are empty */
std::vector<size_t> &aclist; std::vector<size_t> &aclist;
public: public:
SparseCSRMBuilder(std::vector<size_t> &p_rptr, SparseCSRMBuilder(std::vector<SizeType> &p_rptr,
std::vector<IndexType> &p_findex) std::vector<IndexType> &p_findex)
:rptr(p_rptr), findex(p_findex), aclist(dummy_aclist) { :rptr(p_rptr), findex(p_findex), aclist(dummy_aclist) {
Assert(!UseAcList, "enabling bug"); Assert(!UseAcList, "enabling bug");
} }
/*! \brief use with caution! rptr must be cleaned before use */ /*! \brief use with caution! rptr must be cleaned before use */
SparseCSRMBuilder(std::vector<size_t> &p_rptr, SparseCSRMBuilder(std::vector<SizeType> &p_rptr,
std::vector<IndexType> &p_findex, std::vector<IndexType> &p_findex,
std::vector<size_t> &p_aclist) std::vector<size_t> &p_aclist)
:rptr(p_rptr), findex(p_findex), aclist(p_aclist) { :rptr(p_rptr), findex(p_findex), aclist(p_aclist) {
@ -62,7 +62,7 @@ struct SparseCSRMBuilder {
* \param row_id the id of the row * \param row_id the id of the row
* \param nelem number of element budget add to this row * \param nelem number of element budget add to this row
*/ */
inline void AddBudget(size_t row_id, size_t nelem = 1) { inline void AddBudget(size_t row_id, SizeType nelem = 1) {
if (rptr.size() < row_id + 2) { if (rptr.size() < row_id + 2) {
rptr.resize(row_id + 2, 0); rptr.resize(row_id + 2, 0);
} }
@ -101,7 +101,7 @@ struct SparseCSRMBuilder {
* element to each row, the number of calls shall be exactly same as add_budget * element to each row, the number of calls shall be exactly same as add_budget
*/ */
inline void PushElem(size_t row_id, IndexType col_id) { inline void PushElem(size_t row_id, IndexType col_id) {
size_t &rp = rptr[row_id + 1]; SizeType &rp = rptr[row_id + 1];
findex[rp++] = col_id; findex[rp++] = col_id;
} }
/*! /*!

4
wrapper/xgboost_R.cpp
View File

@ -62,9 +62,9 @@ extern "C" {
int ncol = length(indptr) - 1; int ncol = length(indptr) - 1;
int ndata = length(data); int ndata = length(data);
// transform into CSR format // transform into CSR format
std::vector<size_t> row_ptr; std::vector<bst_ulong> row_ptr;
std::vector< std::pair<unsigned, float> > csr_data; std::vector< std::pair<unsigned, float> > csr_data;
utils::SparseCSRMBuilder< std::pair<unsigned,float> > builder(row_ptr, csr_data); utils::SparseCSRMBuilder<std::pair<unsigned,float>, false, bst_ulong> builder(row_ptr, csr_data);
builder.InitBudget(); builder.InitBudget();
for (int i = 0; i < ncol; ++i) { for (int i = 0; i < ncol; ++i) {
for (int j = col_ptr[i]; j < col_ptr[i+1]; ++j) { for (int j = col_ptr[i]; j < col_ptr[i+1]; ++j) {