Skip to content

Commit

Permalink
attach_array: remove Z prefix
Browse files Browse the repository at this point in the history
  • Loading branch information
eddy16112 committed Sep 26, 2017
1 parent be0d715 commit 87101f4
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
12 changes: 6 additions & 6 deletions runtime/legion/region_tree.inl
Original file line number Diff line number Diff line change
Expand Up @@ -2783,7 +2783,7 @@ namespace Legion {
{
DETAILED_PROFILER(context->runtime, REALM_CREATE_INSTANCE_CALL);
// Have to wait for the index space to be ready if necessary
Realm::ZIndexSpace<DIM,T> local_space;
Realm::IndexSpace<DIM,T> local_space;
get_realm_index_space(local_space, true/*tight*/);
// No profiling for these kinds of instances currently
Realm::ProfilingRequestSet requests;
Expand All @@ -2794,21 +2794,21 @@ namespace Legion {
PhysicalInstance result;
if (layout_flag == 0) { // SOA
LgEvent ready(PhysicalInstance::create_array_instance_SOA(result,
local_space,
field_ids,
local_space,
field_ids,
field_sizes,
field_pointers,
c_f_resource,
requests));
ready.lg_wait();
} else { // AOS
LgEvent ready(PhysicalInstance::create_array_instance_AOS(result,
local_space,
field_ids,
local_space,
field_ids,
field_sizes,
field_pointers,
aos_base_ptr, aos_stride,
c_f_resource,
c_f_resource,
requests));
ready.lg_wait();
}
Expand Down
24 changes: 12 additions & 12 deletions runtime/realm/attach_array.cc
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ namespace Realm {

template <int N, typename T>
/*static*/ Event RegionInstance::create_array_instance_SOA(RegionInstance& inst,
const ZIndexSpace<N,T>& space,
const std::vector<FieldID> &field_ids,
const IndexSpace<N,T>& space,
const std::vector<FieldID> &field_ids,
const std::vector<size_t> &field_sizes,
const std::vector<void*> &field_pointers,
const std::vector<void*> &field_pointers,
int resource,
const ProfilingRequestSet& reqs,
Event wait_on /*= Event::NO_EVENT*/)
Expand Down Expand Up @@ -83,8 +83,8 @@ namespace Realm {

#define DOIT_ARRAY_SOA(N,T) \
template Event RegionInstance::create_array_instance_SOA<N,T>(RegionInstance&, \
const ZIndexSpace<N,T>&, \
const std::vector<FieldID>&, \
const IndexSpace<N,T>&, \
const std::vector<FieldID>&, \
const std::vector<size_t>&, \
const std::vector<void *>&, \
int, \
Expand All @@ -94,12 +94,12 @@ namespace Realm {

template <int N, typename T>
/*static*/ Event RegionInstance::create_array_instance_AOS(RegionInstance& inst,
const ZIndexSpace<N,T>& space,
const std::vector<FieldID> &field_ids,
const IndexSpace<N,T>& space,
const std::vector<FieldID> &field_ids,
const std::vector<size_t> &field_sizes,
const std::vector<void*> &field_pointers,
const std::vector<void*> &field_pointers,
unsigned char* aos_base_ptr, size_t aos_stride,
int resource,
int resource,
const ProfilingRequestSet& reqs,
Event wait_on /*= Event::NO_EVENT*/)
{
Expand Down Expand Up @@ -156,12 +156,12 @@ namespace Realm {

#define DOIT_ARRAY_AOS(N,T) \
template Event RegionInstance::create_array_instance_AOS<N,T>(RegionInstance&, \
const ZIndexSpace<N,T>&, \
const std::vector<FieldID>&, \
const IndexSpace<N,T>&, \
const std::vector<FieldID>&, \
const std::vector<size_t>&, \
const std::vector<void *>&, \
unsigned char*, size_t, \
int, \
int, \
const ProfilingRequestSet&, \
Event);
FOREACH_NT(DOIT_ARRAY_AOS)
Expand Down
10 changes: 5 additions & 5 deletions runtime/realm/instance.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ namespace Realm {

template <int N, typename T>
static Event create_array_instance_SOA(RegionInstance& inst,
const ZIndexSpace<N,T>& space,
const std::vector<FieldID> &field_ids,
const IndexSpace<N,T>& space,
const std::vector<FieldID> &field_ids,
const std::vector<size_t> &field_sizes,
const std::vector<void*> &field_pointers,
int resource,
Expand All @@ -168,12 +168,12 @@ namespace Realm {

template <int N, typename T>
static Event create_array_instance_AOS(RegionInstance& inst,
const ZIndexSpace<N,T>& space,
const std::vector<FieldID> &field_ids,
const IndexSpace<N,T>& space,
const std::vector<FieldID> &field_ids,
const std::vector<size_t> &field_sizes,
const std::vector<void*> &field_pointers,
unsigned char* aos_base_ptr, size_t aos_stride,
int resource,
int resource,
const ProfilingRequestSet& prs,
Event wait_on = Event::NO_EVENT);

Expand Down

0 comments on commit 87101f4

Please sign in to comment.