Some more changes, now onto new parallel tree building.

This commit is contained in:
Dongryeol Lee
2011-01-22 02:54:36 +00:00
parent 63c6232d88
commit cbb232dcb9
11 changed files with 39 additions and 23 deletions
@@ -1,12 +1,17 @@
/** @file global.cc
*
* An instantiation of global memory mapped file object.
*
* @author Dongryeol Lee (dongryel@cc.gatech.edu)
*/
#include "memory_mapped_file.h"
#include "core/table/memory_mapped_file.h"
namespace core {
namespace table {
/** @brief A global memory mapped file object.
*/
core::table::MemoryMappedFile *global_m_file_ = NULL;
};
};
}
}
@@ -1,4 +1,7 @@
/** @file index_util.h
*
* A set of utilities for serializing/unserializing indices for
* maintaining the mapping order in shuffled points in a table.
*
* @author Dongryeol Lee (dongryel@cc.gatech.edu)
*/
@@ -97,7 +100,7 @@ class IndexUtil< std::pair<int, std::pair<int, int> > > {
}
}
};
};
};
}
}
#endif
@@ -1,4 +1,6 @@
/** @file memory_mapped_file.h
*
* A declaration of memory mapped file object class.
*
* @author Dongryeol Lee (dongryel@cc.gatech.edu)
*/
@@ -84,7 +86,7 @@ class MemoryMappedFile {
boost::interprocess::anonymous_instance)[num_elements_in]();
}
};
};
};
}
}
#endif
@@ -93,7 +93,7 @@ class SubDenseMatrix {
}
BOOST_SERIALIZATION_SPLIT_MEMBER()
};
};
};
}
}
#endif
@@ -47,7 +47,7 @@ class Standardize {
}
}
};
};
};
}
}
#endif
@@ -26,6 +26,8 @@ extern core::table::MemoryMappedFile *global_m_file_;
namespace core {
namespace tree {
/** @brief The utility to initialize old_from_new indices.
*/
template<typename IndexType>
class IndexInitializer {
public:
@@ -43,6 +45,9 @@ class IndexInitializer {
int *new_from_old_out);
};
/** @brief The template specialization of IndexInitializer for the
* distributed table setting.
*/
template<>
class IndexInitializer< std::pair<int, std::pair<int, int> > > {
public:
@@ -73,6 +78,9 @@ class IndexInitializer< std::pair<int, std::pair<int, int> > > {
}
};
/** @brief The template specialization of IndexInitializer for the
* ordinary table setting.
*/
template<>
class IndexInitializer< int > {
public:
@@ -524,8 +532,6 @@ class GeneralBinarySpaceTree {
}
if(left > right) {
// left == right + 1
break;
}
@@ -161,7 +161,7 @@ class AxilrodTeller {
return numerator / denominator / normalizing_constant_;
}
};
};
};
}
}
#endif
@@ -81,7 +81,7 @@ class NbodySimulator {
const std::vector<std::string> &args,
boost::program_options::variables_map *vm);
};
};
};
}
}
#endif
@@ -193,8 +193,8 @@ class TestNbodySimulator {
return 0;
};
};
};
};
}
}
BOOST_AUTO_TEST_SUITE(TestSuiteNbodySimulator)
BOOST_AUTO_TEST_CASE(TestCaseNbodySimulator) {
@@ -52,7 +52,7 @@ class NbodySimulatorArguments {
}
}
};
};
};
}
}
#endif
@@ -870,7 +870,7 @@ class NbodySimulatorStatistic: public boost::noncopyable {
SetZero();
}
};
};
};
}
}
#endif