Skip to content

Fof test #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

Open
adrianplenefisch wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Fof test #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d5d725a
temporary changes while testing FoF
johnnyhchen Mar 23, 2023
db4c299
changed vertexID to uint64_t type and updated insertDataNeedBoss to t…
johnnyhchen Apr 4, 2023
a4b4a6a
optimized need_boss queue processing by removing elements from end of…
johnnyhchen Apr 6, 2023
dfd27ec
Added comments to document key unionfind API functions and updated an…
johnnyhchen Apr 10, 2023
4495b94
removed debugging printf's
johnnyhchen Apr 10, 2023
b40ced0
PrefixLib make now uses Makefile.common
adrianplenefisch Aug 25, 2023
18037db
added broadcasts of global variables to allow multiple PE
adrianplenefisch Dec 7, 2023
bcfec08
removed unnecessary print statement
adrianplenefisch Dec 13, 2023
4b49675
removed another unnecessary bugfixing line
adrianplenefisch Dec 14, 2023
0a776aa
commmented out debuging print statement
adrianplenefisch Dec 14, 2023
1ea3673
made union_request check if sending a message is necessary
adrianplenefisch Feb 7, 2024
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
8 changes: 4 additions & 4 deletions Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#set the following variables to absolute paths
CHARM_DIR = /Users/raghu/work/charm/charm
UNION_FIND_DIR = /Users/raghu/work/charm/unionFind/unionFind
CHARM_DIR = $(HOME)/Documents/nbodydir/charm
UNION_FIND_DIR = $(HOME)/Documents/nbodydir/unionfind
PREFIX_LIB_DIR = $(UNION_FIND_DIR)/prefixLib

#charmc options
ANCHOR= -DANCHOR_ALGO
#ANCHOR=
PROFILE= -DPROFILING
CHARMC = $(CHARM_DIR)/bin/charmc $(ANCHOR) $(PROFILE)
CHARMC = $(CHARM_DIR)/bin/charmc $(PROFILE) #$(ANCHOR)
OPTS = -std=c++11 -O3 -g
LD_OPTS =

Expand All @@ -16,4 +16,4 @@ PREFIX_LIBS = -L${PREFIX_LIB_DIR} -lprefix
PREFIX_INC = -I${PREFIX_LIB_DIR}

UNION_FIND_LIBS = -L${UNION_FIND_DIR} -lunionFind ${PREFIX_LIBS}
UNION_FIND_INC = -I${UNION_FIND_DIR} ${PREFIX_INC}
UNION_FIND_INC = -I${UNION_FIND_DIR} ${PREFIX_INC}
6 changes: 3 additions & 3 deletions examples/simple_graph/graph.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ class TreePiece : public CBase_TreePiece {
libPtr = libProxy[thisIndex].ckLocal();
libPtr->initialize_vertices(libVertices, numMyVertices);
libPtr->registerGetLocationFromID(getLocationFromID);
contribute(CkCallback(CkReductionTarget(Main, startWork), mainProxy));
contribute(CkCallback(CkReductionTarget(Main, Main::startWork), mainProxy));
}

void doWork() {
Expand All @@ -172,7 +172,7 @@ class TreePiece : public CBase_TreePiece {
CkAbort("Something wrong in inverted-tree construction!\n");
}
}
contribute(CkCallback(CkReductionTarget(Main, donePrinting), mainProxy));
contribute(CkCallback(CkReductionTarget(Main, Main::donePrinting), mainProxy));
}

void getConnectedComponents() {
Expand Down Expand Up @@ -210,4 +210,4 @@ TreePiece::getLocationFromID(long int vid) {
}


#include "graph.def.h"
#include "graph.def.h"
4 changes: 2 additions & 2 deletions prefixLib/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
CHARMC=/Users/raghu/work/charm/charm/bin/charmc $(OPTS)
include ../Makefile.common

all: libprefix.a

libprefix.a: prefixBalance.o
$(CHARMC) prefixBalance.o -o libprefix.a -language charm++
$(CHARMC) prefixBalance.o -o libprefix.a -language charm++ # -DCK_TEMPLATES_ONLY

prefixBalance.o : prefixBalance.C prefixBalance.def.h prefixBalance.decl.h
$(CHARMC) -c prefixBalance.C
Expand Down
12 changes: 11 additions & 1 deletion types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@ struct findBossData {
}
};

struct needBossData {
uint64_t arrIdx;
uint64_t senderID;

void pup(PUP::er &p) {
p|arrIdx;
p|senderID;
}
};

#ifdef ANCHOR_ALGO
struct anchorData {
uint64_t arrIdx;
Expand All @@ -26,7 +36,7 @@ struct anchorData {

struct shortCircuitData {
uint64_t arrIdx;
uint64_t grandparentID;
int64_t grandparentID;

void pup(PUP::er &p) {
p|arrIdx;
Expand Down
Loading