Skip to content

Fix compile error for the flash bc algorithm on ubuntu #2839

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
merged 2 commits into from
Jun 8, 2023
Merged

Fix compile error for the flash bc algorithm on ubuntu #2839

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
b2d1c25
Fix compile error for flash bc algorithm on ubuntu
lixueclaire Jun 8, 2023
156af57
Merge branch 'main' into fix-flash-bc
acezen Jun 8, 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
11 changes: 7 additions & 4 deletions analytical_engine/apps/flash/api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ template <typename fragment_t, typename fw_t, typename value_t, class F,
class M, class C>
VSet edgeMapDenseFunction(const fragment_t& graph,
const std::shared_ptr<fw_t> fw, VSet& U, int h,
VSet& T, F& f, M& m, C& c, bool b = true) {
VSet& T, bool is_join, F& f, M& m, C& c,
bool b = true) {
if ((&T) == (&All))
return edgeMapDenseFunction(graph, fw, U, h, f, m, c, b);
using vertex_t = typename fragment_t::vertex_t;
Expand Down Expand Up @@ -219,7 +220,8 @@ template <typename fragment_t, typename fw_t, typename value_t, class F,
class M, class C, class H>
VSet edgeMapDenseFunction(const fragment_t& graph,
const std::shared_ptr<fw_t> fw, VSet& U, H& h,
VSet& T, F& f, M& m, C& c, bool b = true) {
VSet& T, bool is_join, F& f, M& m, C& c,
bool b = true) {
using vid_t = typename fragment_t::vid_t;
using edata_t = typename fragment_t::edata_t;
bool flag = ((&U) == (&All));
Expand Down Expand Up @@ -381,8 +383,9 @@ template <typename fragment_t, typename fw_t, typename value_t, class F,
class M, class C, class H>
inline VSet edgeMapFunction(const fragment_t& graph,
const std::shared_ptr<fw_t> fw, VSet& U, H h,
VSet& T, F& f, M& m, C& c, bool b = true) {
return edgeMapDenseFunction(graph, fw, U, h, T, f, m, c, b);
VSet& T, bool is_join, F& f, M& m, C& c,
bool b = true) {
return edgeMapDenseFunction(graph, fw, U, h, T, is_join, f, m, c, b);
}

template <typename fragment_t, typename fw_t>
Expand Down
2 changes: 1 addition & 1 deletion analytical_engine/apps/flash/flash_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ namespace gs {
#define CTrueV cTrueV<vid_t, value_t>
#define CTrueE cTrueE<vid_t, value_t, edata_t>

#define EjoinV(E, V) E, V
#define EjoinV(E, V) E, V, true
#define VjoinP(property) \
std::vector<vid_t> res; \
res.clear(); \
Expand Down