Skip to content

Feature/metall #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KIwabuchi merged 2 commits into from
Jun 6, 2023
Merged

Feature/metall #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1430068
Added top-level configuration and static assertion for binary loading…
Jun 6, 2023
86921ad
QOL bugfixes
Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion include/ripples/configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ namespace ripples {
struct GraphInputConfiguration {
std::string IFileName{""}; //!< The input file name
std::string metall_dir{"/tmp/graph"}; //!< Where is the metall directory?
std::string rr_dir{"/tmp/rr"}; //!< Where is the rr directory?
bool weighted{false}; //!< is Graph weighted?
bool undirected{false}; //!< is Graph undirected?
bool disable_renumbering{false}; //!< trust the input to be clean.
Expand All @@ -74,7 +75,9 @@ struct GraphInputConfiguration {
->group("Input Options")
->required();
app.add_flag("--metall-store-dir", metall_dir,
"Directory to store metall graph data.")
"Directory to store metall graph data.")
->group("Input Options");
app.add_flag("--rr-store-dir", rr_dir, "Directory to store RR data.")
Comment thread
KIwabuchi marked this conversation as resolved.
->group("Input Options");
app.add_flag("--reload-binary", reload, "Reload a graph from binary input")
->group("Input Options");
Expand Down
4 changes: 2 additions & 2 deletions include/ripples/generate_rrr_sets.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ using RRRsetAllocator = libmemkind::pmem::allocator<vertex_type>;
template<typename vertex_type>
using RRRsetAllocator = metall::manager::allocator_type<vertex_type>;

metall::manager &metall_manager_instance() {
static metall::manager manager(metall::create_only, "/dev/shm/metall_tmp");
metall::manager &metall_manager_instance(std::string path) {
static metall::manager manager(metall::create_only, path.c_str());
return manager;
}

Expand Down
6 changes: 6 additions & 0 deletions include/ripples/graph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,12 @@ class Graph {

template <typename FStream>
void load_binary(FStream &FS) {
#ifdef ENABLE_METALL
// Static assert 0
throw 0 && "Not implemented yet, don't use with Metall";
Comment thread
KIwabuchi marked this conversation as resolved.
#endif


if (!FS.is_open()) throw "Bad things happened!!!";

FS.read(reinterpret_cast<char *>(&numNodes), sizeof(numNodes));
Expand Down
4 changes: 2 additions & 2 deletions include/ripples/imm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ auto Sampling(const GraphTy &G, const ConfTy &CFG, double l,

double LB = 0;
#if defined ENABLE_MEMKIND
RRRsetAllocator<vertex_type> allocator("/mnt/bb/reeceneff/memkind_tmp", 0);
RRRsetAllocator<vertex_type> allocator(CFG.rr_dir.c_str(), 0);
#elif defined ENABLE_METALL_RRRSETS
RRRsetAllocator<vertex_type> allocator = metall_manager_instance().get_allocator();
#else
Expand Down Expand Up @@ -266,7 +266,7 @@ auto Sampling(const GraphTy &G, const ConfTy &CFG, double l,

double LB = 0;
#if defined ENABLE_MEMKIND
RRRsetAllocator<vertex_type> allocator("/mnt/bb/reeceneff/memkind_tmp", 0);
RRRsetAllocator<vertex_type> allocator(CFG.rr_dir.c_str(), 0);
#elif defined ENABLE_METALL_RRRSETS
RRRsetAllocator<vertex_type> allocator = metall_manager_instance().get_allocator();
#else
Expand Down