diff --git a/lulesh/CMakeLists.txt b/lulesh/CMakeLists.txt index 75407f8..9bf3b60 100644 --- a/lulesh/CMakeLists.txt +++ b/lulesh/CMakeLists.txt @@ -9,7 +9,7 @@ set(DASH_DART_IMPL "MPI") file(GLOB SOURCES *.cc) set(CXX_FLAGS "-O3 -Ofast -DUSE_DASH") -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 14) ## Do not edit below this line unless you know what you are doing diff --git a/lulesh/lulesh-comm-dash.cc b/lulesh/lulesh-comm-dash.cc index d3b49e2..fa596df 100644 --- a/lulesh/lulesh-comm-dash.cc +++ b/lulesh/lulesh-comm-dash.cc @@ -197,16 +197,15 @@ Int_t DASHComm::offset(Int_t desc) return offs; } -dash::GlobIter> +DASHComm::global_iterator DASHComm::dest(Int_t rank, Int_t desc) { auto& pat = m_commDataRecv->pattern(); auto offs = offset(desc); - dash::GlobIter > it - = m_commDataRecv->begin() + pat.global_index(dash::team_unit_t(rank), - {offs}); + auto it = m_commDataRecv->begin() + + pat.global_index( dash::team_unit_t{rank}, {offs} ); return it; } diff --git a/lulesh/lulesh-comm-dash.h b/lulesh/lulesh-comm-dash.h index 285d1d1..cdf6f44 100644 --- a/lulesh/lulesh-comm-dash.h +++ b/lulesh/lulesh-comm-dash.h @@ -63,7 +63,8 @@ class DASHComm dash::Array *m_commDataRecv; public: - typedef dash::Array array_type; + typedef dash::Array array_type; + typedef array_type::iterator global_iterator; public: DASHComm(Domain& dom); @@ -94,12 +95,12 @@ class DASHComm // determine global destination pointer for a target unit rank and // location descriptor - dash::GlobIter> + global_iterator dest( Int_t rank, Int_t desc ); // 26 = 6 faces + 12 edges + 8 corners - dash::Future recvRequest[26]; - dash::Future sendRequest[26]; + dash::Future recvRequest[26]; + dash::Future sendRequest[26]; double wtime(); template T allreduce_min(T val);