Merge pull request #536 from facebookresearch/pr/list

bump isl for rename of isl_*_list_get and isl_*_list_n

Author: skimo-openhub

isl_interface/include/isl/cpp.h

@@ -105,7 +105,7 @@ template <typename MappingTypeId>
 detail::ScheduleTree* MappedScop::map(
     detail::ScheduleTree* tree,
     isl::union_pw_aff_list list) {
-  size_t nToMap = list.n();
+  size_t nToMap = list.size();
   const auto& extent = mappingSize<MappingTypeId>(this).view;
   TC_CHECK_LE(nToMap, extent.size()) << "dimension overflow";
 
@@ -116,7 +116,7 @@ detail::ScheduleTree* MappedScop::map(
   auto affList = isl::union_pw_aff_list(list.get_ctx(), 0);
   for (size_t i = 0; i < nToMap; ++i) {
     auto id = MappingTypeId::makeId(i);
-    auto upa = list.get(i);
+    auto upa = list.get_at(i);
     TC_CHECK_NE(extent[i], 0u) << "NYI: mapping to 0";
     upa = upa.mod_val(isl::val(tree->ctx_, extent[i]));
     affList = affList.add(upa);
@@ -143,7 +143,7 @@ detail::ScheduleTree* MappedScop::mapBlocksForward(
   TC_CHECK(bandNode) << "expected a band, got " << *band;
 
   auto list = bandNode->mupa_.get_union_pw_aff_list();
-  list = list.drop(nToMap, list.n() - nToMap);
+  list = list.drop(nToMap, list.size() - nToMap);
   return map<mapping::BlockId>(band, list);
 }
 
@@ -369,7 +369,7 @@ detail::ScheduleTree* MappedScop::mapThreadsBackward(
   insertNodeBelow(band, detail::ScheduleTree::makeThreadSpecificMarker(ctx));
 
   auto list = bandNode->mupa_.get_union_pw_aff_list().reverse();
-  list = list.drop(nToMap, list.n() - nToMap);
+  list = list.drop(nToMap, list.size() - nToMap);
   return map<mapping::ThreadId>(band, list);
 }
 

tc/core/polyhedral/cuda/mapped_scop.cc

@@ -381,7 +381,7 @@ bool accessSubscriptsAreUnrolledLoops(
       }
     }
 
-    auto space = isl::space(leaf->ctx_, 0, unrolledDims.n())
+    auto space = isl::space(leaf->ctx_, 0, unrolledDims.size())
                      .align_params(subdomain.get_space());
     auto unrolledDimsMupa = isl::multi_union_pw_aff(space, unrolledDims);
 

tc/core/polyhedral/cuda/memory_promotion_heuristic.cc

@@ -449,14 +449,14 @@ isl::multi_aff dropDummyTensorDimensions(
   auto list = schedule.get_aff_list();
   auto space = schedule.get_space().domain();
 
-  auto n = list.n();
+  auto n = list.size();
   for (int i = n - 1; i >= 0; --i) {
     if (decl.sizes[i] == 1) {
       list = list.drop(i, 1);
     }
   }
 
-  space = add_range(space, list.n());
+  space = add_range(space, list.size());
   return isl::multi_aff(space, list);
 }
 

tc/core/polyhedral/memory_promotion.cc

@@ -863,7 +863,7 @@ isl::multi_union_pw_aff extractDomainToIds(
       list = list.add(idMap);
     }
     // Ignore this node if it does not map to all required ids.
-    if (static_cast<size_t>(list.n()) != ids.size()) {
+    if (static_cast<size_t>(list.size()) != ids.size()) {
       continue;
     }
     auto nodeToIds = isl::multi_union_pw_aff(space, list);

tc/core/polyhedral/schedule_transforms.cc

@@ -25,11 +25,11 @@ inline ScheduleTreeUPtr ScheduleTree::makeMapping(
     const std::vector<MappingIdType>& mappedIds,
     isl::union_pw_aff_list mappedAffs,
     std::vector<ScheduleTreeUPtr>&& children) {
-  TC_CHECK_EQ(mappedIds.size(), static_cast<size_t>(mappedAffs.n()))
+  TC_CHECK_EQ(mappedIds.size(), static_cast<size_t>(mappedAffs.size()))
       << "expected as many mapped ids as affs";
   ScheduleTreeElemMapping::Mapping mapping;
-  for (size_t i = 0, n = mappedAffs.n(); i < n; ++i) {
-    mapping.emplace(mappedIds.at(i), mappedAffs.get(i));
+  for (size_t i = 0, n = mappedAffs.size(); i < n; ++i) {
+    mapping.emplace(mappedIds.at(i), mappedAffs.get_at(i));
   }
   TC_CHECK_GE(mapping.size(), 1u) << "empty mapping";
   TC_CHECK_EQ(mappedIds.size(), mapping.size())

tc/core/polyhedral/schedule_tree-inl.h

@@ -367,7 +367,7 @@ struct ListIter {
     pos_++;
   }
   E operator*() {
-    return list_.get(pos_);
+    return list_.get_at(pos_);
   }
 
  private:
@@ -376,13 +376,13 @@ struct ListIter {
 };
 
 template <typename L>
-auto begin(L& list) -> ListIter<decltype(list.get(0)), L> {
-  return ListIter<decltype(list.get(0)), L>(list, 0);
+auto begin(L& list) -> ListIter<decltype(list.get_at(0)), L> {
+  return ListIter<decltype(list.get_at(0)), L>(list, 0);
 }
 
 template <typename L>
-auto end(L& list) -> ListIter<decltype(list.get(0)), L> {
-  return ListIter<decltype(list.get(0)), L>(list, list.n());
+auto end(L& list) -> ListIter<decltype(list.get_at(0)), L> {
+  return ListIter<decltype(list.get_at(0)), L>(list, list.size());
 }
 
 } // namespace detail