apaam/mlpack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some changes in the distributed tree build.

Browse Source
This commit is contained in:
Dongryeol Lee
2011-02-06 05:05:47 +00:00
parent c6c9362da6
commit bcaf5ff742
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fastlib/trunk/contrib/dongryel/thesis_research/core/table/distributed_table.h
+16 -4
View File
@@ -56,7 +56,8 @@ class DistributedTable: public boost::noncopyable {
typedef std::pair<int, int> IndexType;
// For giving private access to the distributed tree builder class.
friend class core::parallel::VanillaDistributedTreeBuilder<DistributedTableType>;
friend class core::parallel::VanillaDistributedTreeBuilder <
DistributedTableType >;
public:
class TreeIterator {
@@ -198,11 +199,16 @@ class DistributedTable: public boost::noncopyable {
owned_table_->n_attributes(), world.size());
core::table::DensePoint root_bound_center;
owned_table_->get_tree()->bound().center(&root_bound_center);
boost::mpi::all_gather(
boost::mpi::gather(
world,
root_bound_center.ptr(),
owned_table_->n_attributes(), global_table_->data().ptr());
global_table_->IndexData(metric_in, 1);
owned_table_->n_attributes(), global_table_->data().ptr(), 0);
// The master builds the tree and broadcasts the nodes.
if(world.rank() == 0) {
global_table_->IndexData(metric_in, 1);
}
boost::mpi::broadcast(world, *global_table_, 0);
}
public:
@@ -277,6 +283,12 @@ class DistributedTable: public boost::noncopyable {
return owned_table_.get();
}
/** @brief Retrieves the global new from old mapping.
*/
int *new_from_old() {
return global_table_->new_from_old();
}
/** @brief Retrieves the global tree.
*/
TreeType *get_tree() {