Skip to content

Fix for macOS on arm #384

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for macOS on arm #384

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
968cd96
Fix uint64_t and size_t not match on arm64 platform
Sanzo00 Jan 27, 2022
a8d1fe6
Fix for macOS on arm
Sanzo00 Apr 7, 2022
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 lonestar/analytics/cpu/bipart/Coarsening.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void parallelRand(MetisGraph* graph, int) {
T_RAND.start();

galois::do_all(
galois::iterate((uint64_t) 0, fineGGraph->hedges),
galois::iterate((size_t) 0, fineGGraph->hedges),
[&fineGGraph](uint64_t item) {
unsigned netnum = fineGGraph->getData(item, flag_no_lock).netnum;
netnum= hash(netnum);
Expand All @@ -65,7 +65,7 @@ void parallelRand(MetisGraph* graph, int) {
galois::StatTimer T_INDEX("INDEX");
T_INDEX.start();
galois::do_all(
galois::iterate((uint64_t) 0, fineGGraph->hedges),
galois::iterate((size_t) 0, fineGGraph->hedges),
[&fineGGraph](uint64_t item) {
unsigned netnum = fineGGraph->getData(item, flag_no_lock).index;
netnum= hash(1);
Expand Down Expand Up @@ -385,14 +385,14 @@ void coarsePhaseII(MetisGraph* graph, std::vector<bool>& hedges,
void findLoneNodes(GGraph& graph){

galois::do_all(
galois::iterate((uint64_t) graph.hedges, graph.size()),
galois::iterate(graph.hedges, graph.size()),
[&](GNode n){

graph.getData(n).notAlone = false;
}, galois::steal(), galois::loopname("initialize not alone variables"));

galois::do_all(
galois::iterate((uint64_t) 0, graph.hedges),
galois::iterate((size_t) 0, graph.hedges),
[&](GNode h){

for(auto n:graph.edges(h))
Expand Down
4 changes: 2 additions & 2 deletions lonestar/analytics/cpu/bipart/bipart.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ int main(int argc, char** argv) {
kValue[(k + 1) / 2] = k / 2;

galois::do_all(
galois::iterate((uint64_t)graph.hedges, graph.size()),
galois::iterate(graph.hedges, graph.size()),
[&](GNode n) {
unsigned pp = graph.getData(n).getPart();
if (pp == 1) {
Expand Down Expand Up @@ -348,7 +348,7 @@ int main(int argc, char** argv) {

// distribute hyperedges according to their current partition
galois::do_all(
galois::iterate((uint64_t)0, graph.hedges),
galois::iterate((size_t)0, graph.hedges),
[&](GNode h) {
auto edge = *(graph.edges(h).begin());
auto dst = graph.getEdgeDst(edge);
Expand Down
6 changes: 5 additions & 1 deletion lonestar/scientific/cpu/longestedge/test/catch.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7859,7 +7859,11 @@ namespace Catch {

#ifdef CATCH_PLATFORM_MAC

#define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
#if defined(__i386__) || defined(__x86_64__)
#define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
#elif defined(__aarch64__)
#define CATCH_TRAP() __asm__(".inst 0xd4200000")
#endif

#elif defined(CATCH_PLATFORM_IPHONE)

Expand Down