Merge pull request #267 from facebookresearch/pr/list

use standard isl support for lists intead of homegrown alternatives

Author: ftynse

include/tc/core/polyhedral/schedule_tree_elem.h

@@ -152,7 +152,7 @@ struct ScheduleTreeElemMappingFilter : public ScheduleTreeElemFilter {
           typename mapping::MappingId::Hash>& ids)
       : ScheduleTreeElemFilter(us), mappingIds(ids) {
     USING_MAPPING_SHORT_NAMES(BX, BY, BZ, TX, TY, TZ);
-    for (auto s : isl::UNION_SET(us)) {
+    for (auto s : us.get_set_list()) {
       for (auto id : std::vector<mapping::MappingId>{BX, BY, BZ, TX, TY, TZ}) {
         if (mappingIds.count(id) > 0) {
           CHECK_EQ(1, ids.count(id)) << "id: " << id << " mapped >1 times";

include/tc/external/detail/isl_mu_wrappers.h

@@ -129,14 +129,6 @@ struct MUPA : std::vector<UPA> {
   isl::multi_union_pw_aff mupa;
 };
 
-/* WARNING: this does not allow inplace modifications .. ugh */
-struct UNION_SET : std::vector<isl::set> {
-  UNION_SET(isl::union_set us_) : us(us_) {
-    us_.foreach_set([&](isl::set s) { this->push_back(s); });
-  }
-  isl::union_set us;
-};
-
 template <typename T, isl::dim_type DT>
 struct DimIds : public std::vector<isl::id> {
   DimIds(T s) {

src/core/polyhedral/schedule_print.cc

@@ -149,12 +149,12 @@ std::ostream& ScheduleTreeElemBand::write(std::ostream& os) const {
   os << " unroll(";
   std::copy(unroll_.begin(), unroll_.end(), make_ostream_joiner(os, ", "));
   os << ")";
-  for (const auto& upa : isl::MUPA(mupa_)) {
+  for (const auto& upa : mupa_.get_union_pw_aff_list()) {
     os << std::endl
        << w.tab()
        << "-----------------------------------------------------------------------";
-    for (const auto& pa : upa) {
-      os << std::endl << w.tab() << "| " << pa.pa;
+    for (const auto& pa : upa.get_pw_aff_list()) {
+      os << std::endl << w.tab() << "| " << pa;
     }
   }
   os << std::endl
@@ -172,7 +172,7 @@ std::ostream& ScheduleTreeElemContext::write(std::ostream& os) const {
 std::ostream& ScheduleTreeElemDomain::write(std::ostream& os) const {
   WS w;
   os << w.tab() << "domain(";
-  for (const auto& u : isl::UNION_SET(domain_)) {
+  for (const auto& u : domain_.get_set_list()) {
     WS w2;
     os << std::endl << w2.tab() << u;
   }
@@ -189,7 +189,7 @@ std::ostream& ScheduleTreeElemExtension::write(std::ostream& os) const {
 std::ostream& ScheduleTreeElemFilter::write(std::ostream& os) const {
   WS w;
   os << w.tab() << "filter(";
-  for (const auto& u : isl::UNION_SET(filter_)) {
+  for (const auto& u : filter_.get_set_list()) {
     WS w2;
     os << std::endl << w2.tab() << u;
   }
@@ -204,7 +204,7 @@ std::ostream& ScheduleTreeElemMappingFilter::write(std::ostream& os) const {
     os << id << ", ";
   }
   os << ")";
-  for (const auto& u : isl::UNION_SET(filter_)) {
+  for (const auto& u : filter_.get_set_list()) {
     WS w2;
     os << std::endl << w2.tab() << u;
   }