Merge pull request #476 from nicolasvasilache/pr/tuner-break

Improve autotuner UX (both C++ and python land)

Author: nicolasvasilache

tc/autotuner/autotuner-inl.h

@@ -89,24 +89,28 @@ void TuningHarness<Backend>::doCompile(SearchStrategy& searchStrategy) {
     }
     std::unique_ptr<typename Backend::ExecutorType> pExecutor(nullptr);
     auto pConf = searchStrategy.population.at(current).get();
-    auto options = makeOptions<Backend>(baseMapping_, *pConf);
-    try {
-      if (FLAGS_debug_tuner) {
-        std::stringstream ssInfo;
-        typename Backend::MappingOptionsCppPrinter infoPrinter(ssInfo);
-        infoPrinter << options;
-        LOG(INFO) << "[COMPILE] Start compilation @:" << current;
-        LOG_LINE_BY_LINE(INFO, ssInfo);
+    if (not stopRequested_) {
+      auto options = makeOptions<Backend>(baseMapping_, *pConf);
+      try {
+        if (FLAGS_debug_tuner) {
+          std::stringstream ssInfo;
+          typename Backend::MappingOptionsCppPrinter infoPrinter(ssInfo);
+          infoPrinter << options;
+          LOG(INFO) << "[COMPILE] Start compilation @:" << current;
+          LOG_LINE_BY_LINE(INFO, ssInfo);
+        }
+        pExecutor =
+            tc::compile<Backend>(tcTree_, inputs_.begin()->second, options);
+        LOG_IF(INFO, FLAGS_debug_tuner) << "[COMPILE] Done compilation";
+      } catch (const std::exception& e) {
+        LOG(WARNING) << "[TUNER][COMPILE] failed compilation: " << e.what();
+        std::stringstream ssWarning;
+        typename Backend::MappingOptionsCppPrinter warningPrinter(ssWarning);
+        warningPrinter << options;
+        LOG_LINE_BY_LINE(WARNING, ssWarning);
+        pConf->invalid = true;
       }
-      pExecutor =
-          tc::compile<Backend>(tcTree_, inputs_.begin()->second, options);
-      LOG_IF(INFO, FLAGS_debug_tuner) << "[COMPILE] Done compilation";
-    } catch (const std::exception& e) {
-      LOG(WARNING) << "[TUNER][COMPILE] failed compilation: " << e.what();
-      std::stringstream ssWarning;
-      typename Backend::MappingOptionsCppPrinter warningPrinter(ssWarning);
-      warningPrinter << options;
-      LOG_LINE_BY_LINE(WARNING, ssWarning);
+    } else {
       pConf->invalid = true;
     }
 
@@ -158,6 +162,11 @@ void TuningHarness<Backend>::doEvaluate(
       continue;
     }
 
+    if (stopRequested_) {
+      pConf->invalid = true;
+      continue;
+    }
+
     auto options = makeOptions<Backend>(baseMapping_, *pConf);
     if (FLAGS_debug_tuner) {
       // Always log option to INFO so we can correlate to timing offline
@@ -497,8 +506,7 @@ Autotuner<Backend, SearchStrategy>::tune(
     } catch (const std::exception& e) {
       std::cerr << "Exception during autotuning: " << e.what()
                 << "\n dumping cache to "
-                << tc::makeOptionsFilename(cacheFileName) << "/"
-                << Backend::makeDeviceFilename(cacheFileName) << std::endl;
+                << tc::makeOptionsFilename(cacheFileName) << std::endl;
       storeTopKInCache<Backend>(optionsCache_, cacheFileName);
       tuningHarnessThreadEx = std::current_exception();
     }
@@ -507,11 +515,7 @@ Autotuner<Backend, SearchStrategy>::tune(
   while (not tuningHarnessFinished) {
     std::this_thread::sleep_for(std::chrono::milliseconds(100));
     if (sigint_) {
-      std::cerr
-          << "Autotuning will stop after the current iteration has finished."
-          << std::endl;
       tuningHarness.stopAfterCurrentIteration();
-      tuningHarnessThread.join();
       storeTopKInCache<Backend>(optionsCache_, cacheFileName);
     }
     if (sigterm_) {

tc/autotuner/parameters.cc

@@ -459,9 +459,11 @@ void CudaDimParameters::setRange(
 namespace {
 template <typename Params, typename View>
 void fromMappingOptions(Params& params, const View& options) {
-  CHECK_LE(options.size(), params.dims.size());
-  params.numberDims.selectFromValue(options.size());
-  for (size_t i = 0; i < options.size(); ++i) {
+  // It is possible mapping options are higher dimensional than problem sizes
+  // in which case options could be larger
+  auto min = std::min(options.size(), params.dims.size());
+  params.numberDims.selectFromValue(min);
+  for (size_t i = 0; i < min; ++i) {
     params.dims[i].selectFromValue(options[i]);
   }
 }

tc/core/cpu/cpu_mapping_options.cc

@@ -78,4 +78,12 @@ CpuMappingOptions CpuMappingOptions::makeNaiveMappingOptions() {
   return makeUnmappedMappingOptions().tile(32, 32, 32).unroll(1);
 }
 
+std::ostream& operator<<(
+    std::ostream& os,
+    const CpuMappingOptions& cpuOptions) {
+  OstreamBoolalphaScope scope(os);
+  tc::CpuMappingOptionsAsCpp cpp(cpuOptions);
+  os << cpp;
+  return os;
+}
 } // namespace tc

tc/core/cpu/cpu_mapping_options.h

@@ -79,4 +79,7 @@ class CpuMappingOptions {
  public:
   MappingOptionsView generic;
 };
+
+std::ostream& operator<<(std::ostream& os, const CpuMappingOptions& view);
+
 } // namespace tc

tc/core/cuda/cuda_mapping_options.cc

@@ -47,35 +47,6 @@ std::string CudaDimView::toCommaSeparatedString() const {
   return ss.str();
 }
 
-std::ostream& operator<<(std::ostream& os, const CudaDimView& view) {
-  os << "CudaDim(" << view.toCommaSeparatedString() << ") @" << &view.proto;
-  return os;
-}
-
-std::ostream& operator<<(std::ostream& os, const CudaDim& dim) {
-  os << dim.view;
-  return os;
-}
-
-std::ostream& operator<<(std::ostream& os, const Grid& dim) {
-  os << dim.view;
-  return os;
-}
-
-std::ostream& operator<<(std::ostream& os, const Block& dim) {
-  os << dim.view;
-  return os;
-}
-
-std::ostream& operator<<(
-    std::ostream& os,
-    const CudaMappingOptions& cudaOptions) {
-  OstreamBoolalphaScope scope(os);
-  tc::CudaMappingOptionsAsCpp cpp(cudaOptions);
-  os << cpp;
-  return os;
-}
-
 // CudaDimView & CudaDim
 //
 CudaDim::CudaDim(std::vector<uint64_t> il) : ownedProto_(), view(ownedProto_) {
@@ -400,4 +371,32 @@ CudaMappingOptions CudaMappingOptions::makeGroupConvolutionMappingOptions() {
       .unroll(1);
 }
 
+std::ostream& operator<<(std::ostream& os, const CudaDimView& view) {
+  os << "CudaDim(" << view.toCommaSeparatedString() << ") @" << &view.proto;
+  return os;
+}
+
+std::ostream& operator<<(std::ostream& os, const CudaDim& dim) {
+  os << dim.view;
+  return os;
+}
+
+std::ostream& operator<<(std::ostream& os, const Grid& dim) {
+  os << dim.view;
+  return os;
+}
+
+std::ostream& operator<<(std::ostream& os, const Block& dim) {
+  os << dim.view;
+  return os;
+}
+
+std::ostream& operator<<(
+    std::ostream& os,
+    const CudaMappingOptions& cudaOptions) {
+  OstreamBoolalphaScope scope(os);
+  tc::CudaMappingOptionsAsCpp cpp(cudaOptions);
+  os << cpp;
+  return os;
+}
 } // namespace tc