[checkpoint] woops, left target str debug in

Added Target::ToDebugString() so I can see the hosts since
they were giving me a lot of trouble.

Author: mbs-octoml

include/tvm/target/target.h

@@ -66,6 +66,15 @@ class TargetNode : public Object {
   /*! \return The Optional<Target> typed target host of the TargetNode */
   TVM_DLL Optional<Target> GetHost() const;
 
+  /*!
+   * \brief Returns a human readable representation of \p Target which includes all fields,
+   * especially the host. Useful for diagnostic messages and debugging.
+   *
+   * TODO(mbs): The ReprPrinter version should perhaps switch to this form, however currently
+   * code depends on str() and << being the same.
+   */
+  String ToDebugString() const;
+
   void VisitAttrs(AttrVisitor* v) {
     v->Visit("kind", &kind);
     v->Visit("tag", &tag);

src/relay/backend/graph_executor_codegen.cc

@@ -203,7 +203,7 @@ class GraphExecutorCodegen : public backend::MemoizedExprTranslator<std::vector<
     VLOG_CONTEXT << "GraphExecutorCodegen";
     VLOG(1) << "compiling:" << std::endl << PrettyPrint(func);
     for (const auto& pair : targets_) {
-      VLOG(1) << "target: " << pair.first << " = " << pair.second->str();
+      VLOG(1) << "target: " << pair.first << " = " << pair.second->ToDebugString();
     }
 
     // This first phase moves from implicit use of compile engine,

src/relay/backend/interpreter.cc

@@ -389,12 +389,12 @@ class Interpreter : public ExprFunctor<ObjectRef(const Expr& n)>,
         per_target_module_std_map = backend::TargetModuleMapToTargetStrModuleMap(per_target_module);
     auto mod_itr = per_target_module_std_map.find(target);
     ICHECK(mod_itr != per_target_module_std_map.end())
-        << "No target module for target '" << target->str() << "'";
+        << "No target module for target " << target->ToDebugString();
     const IRModule& target_module = (*mod_itr).second;
     for (const auto& var : all_tir_fn_vars) {
       ICHECK(target_module->ContainGlobalVar(var->name_hint))
-          << "No global var for '" << var->name_hint << "' in module for target '" << target->str()
-          << "'";
+          << "No global var for '" << var->name_hint << "' in module for target "
+          << target->ToDebugString();
       lowered_projected_mod->Add(var, target_module->Lookup(var->name_hint));
     }
 
@@ -410,8 +410,9 @@ class Interpreter : public ExprFunctor<ObjectRef(const Expr& n)>,
     // Extract all the packed functions.
     for (const auto& var : all_tir_fn_vars) {
       PackedFunc packed_func = runtime_module.GetFunction(var->name_hint);
-      ICHECK(packed_func != nullptr) << "No packed function for global var '" << var->name_hint
-                                     << "' in compiled module for target '" << target->str() << "'";
+      ICHECK(packed_func != nullptr)
+          << "No packed function for global var '" << var->name_hint
+          << "' in compiled module for target " << target->ToDebugString();
       compiled_packed_funcs_.emplace(std::make_pair(target, var->name_hint), packed_func);
     }
 

src/relay/backend/te_compiler.cc

@@ -464,7 +464,8 @@ class LowerTensorExprMutator : public DeviceAwareExprMutator {
     }
 
     // Non-External Relay Function
-    VLOG(1) << "lowering to target '" << target->str() << "' for primitive:\n" << PrettyPrint(func);
+    VLOG(1) << "lowering to target " << target->ToDebugString() << " for primitive:" << std::endl
+            << PrettyPrint(func);
     CCacheKey key = CCacheKey(func, target);
     CachedFunc lowered_func = compiler_->Lower(key, module_name_);
     VLOG(1) << "lowered primitive bound to '" << PrettyPrint(lowered_func->prim_fn_var) << "'";
@@ -512,8 +513,8 @@ class LowerTensorExprMutator : public DeviceAwareExprMutator {
       // on the host cpu irrespective of where the primitive runs.
       // TODO(mbs): Cleanup target handling.
       Target shape_target("llvm");
-      VLOG(1) << "lowering to target '" << shape_target->str()
-              << "' for dynamic shape function for primitive";
+      VLOG(1) << "lowering to target " << shape_target->ToDebugString()
+              << " for dynamic shape function for primitive";
       CCacheKey shape_key(func, shape_target);
       CachedFunc lowered_shape_func = compiler_->LowerShapeFunc(shape_key);
       // Capture the shape function's global var and parameters 'states' in call

src/target/compilation_config.cc

@@ -61,39 +61,40 @@ void CompilationConfigNode::EstablishDefaultSEScopes(const transform::PassContex
   if (host_target.defined()) {
     CHECK(!host_target->host.defined()) << "Host targets are not expected to have hosts";
     host_device_type = static_cast<DLDeviceType>(host_target->kind->device_type);
-    LOG(INFO) << "Using the given host target '" << host_target << "' of device type "
-              << host_device_type << " for the host target";
+    LOG(INFO) << "Using the given host target " << host_target->ToDebugString()
+              << " of device type " << host_device_type << " for the host target";
     for (const auto& primitive_target : primitive_targets) {
       if (primitive_target->host.defined() &&
           !StructuralEqual()(primitive_target->host, host_target)) {
-        LOG(WARNING) << "The primitive target '" << primitive_target
-                     << "' already has a host which disagrees with the desired host target. It "
+        LOG(WARNING) << "The primitive target " << primitive_target->ToDebugString()
+                     << " already has a host which disagrees with the desired host target. It "
                         "will be ignored.";
       }
     }
   } else if (primitive_targets.size() == 1 && primitive_targets.front()->host.defined()) {
     host_target = primitive_targets.front()->GetHost().value();
     CHECK(!host_target->host.defined()) << "Host targets are not expected to have hosts";
     host_device_type = static_cast<DLDeviceType>(host_target->kind->device_type);
-    LOG(INFO) << "Using the host of the unique primitive target, namely '" << host_target
-              << "' of device type " << host_device_type << " for the host target";
+    LOG(INFO) << "Using the host of the unique primitive target, namely "
+              << host_target->ToDebugString() << " of device type " << host_device_type
+              << " for the host target";
   } else if (primitive_targets.size() == 1 &&
              primitive_targets.front()->kind->device_type == kDLCPU) {
     // In the homogenous case without an explicit host target just use the given target so long as
     // it's a CPU.
     host_device_type = kDLCPU;
     host_target = primitive_targets.front();
-    LOG(INFO) << "Using the unique primitive target '" << host_target << "' of device type "
-              << host_device_type << " for the host target";
+    LOG(INFO) << "Using the unique primitive target " << host_target->ToDebugString()
+              << " of device type " << host_device_type << " for the host target";
   } else {
     // Fallback.
     host_device_type = kDLCPU;
     // Even if the list of available targets already includes one for kDLCPU we won't use it
     // in the hetrogeneous case since its options may not be appropriate for host code
     // (eg shape functions). Instead, create a fresh default Target.
     host_target = MakeDefaultTarget(host_device_type);
-    LOG(WARNING) << "Using the default target '" << host_target << "' of device type "
-                 << host_device_type << " for the host target";
+    LOG(WARNING) << "Using the default target " << host_target->ToDebugString()
+                 << " of device type " << host_device_type << " for the host target";
   }
   ICHECK(host_target.defined());
   ICHECK(!host_target->host.defined());
@@ -189,10 +190,10 @@ CompilationConfig::CompilationConfig(const transform::PassContext& pass_ctx,
   auto node = make_object<CompilationConfigNode>();
 
   for (const auto& pair : legacy_target_map_arg) {
-    VLOG(0) << "Available primitive target " << pair.first << " = '" << pair.second << "'";
+    VLOG(0) << "Available primitive target " << pair.first << " = " << pair.second->ToDebugString();
   }
   if (optional_host_target_arg.defined()) {
-    VLOG(0) << "Available host target '" << optional_host_target_arg << "'";
+    VLOG(0) << "Available host target " << optional_host_target_arg->ToDebugString();
   }
 
   // Capture the arguments in our representation.
@@ -221,8 +222,8 @@ CompilationConfig::CompilationConfig(const transform::PassContext& pass_ctx,
       node->primitive_targets.size() == 1 ? *node->primitive_targets.begin() : Target();
 
   for (const auto& target : node->primitive_targets) {
-    LOG(INFO) << "Target '" << target << "' of device type " << target->kind->device_type
-              << " is available for primitives";
+    LOG(INFO) << "Target " << target->ToDebugString() << " of device type "
+              << target->kind->device_type << " is available for primitives";
   }
   LOG(INFO) << "Using default primitive scope " << node->default_primitive_se_scope;
   LOG(INFO) << "Using host scope " << node->host_se_scope;

src/target/se_scope.cc

@@ -52,7 +52,7 @@ TVM_STATIC_IR_FUNCTOR(ReprPrinter, vtable)
           if (need_sep) {
             p->stream << ", ";
           }
-          p->stream << "target='" << node->target << "'";
+          p->stream << "target=" << node->target->ToDebugString();
           need_sep = true;
         }
         if (!node->memory_scope.empty()) {
@@ -72,7 +72,7 @@ TVM_STATIC_IR_FUNCTOR(ReprPrinter, vtable)
 SEScope::SEScope(DLDeviceType device_type, int virtual_device_id, Target target,
                  MemoryScope memory_scope) {
   ICHECK(!target.defined() || device_type == target->kind->device_type)
-      << "target '" << target << "' has device type " << target->kind->device_type
+      << "target " << target->ToDebugString() << " has device type " << target->kind->device_type
       << " but scope has device type " << device_type;
   auto node = make_object<SEScopeNode>();
   node->device_type_int = device_type;
@@ -177,7 +177,7 @@ SEScope SEScopeCache::Make(DLDeviceType device_type, int virtual_device_id, Targ
     cache_.emplace(prototype);
     return prototype;
   } else {
-    VLOG(1) << "reusing '" << *itr << "' for '" << prototype << "'";
+    VLOG(1) << "reusing existing scope " << *itr;
     ICHECK_EQ(prototype->target.defined(), (*itr)->target.defined());
     if (prototype->target.defined()) {
       ICHECK_EQ(prototype->target->host.defined(), (*itr)->target->host.defined());

src/target/target.cc

@@ -457,9 +457,6 @@ const std::string& TargetNode::str() const {
     if (Optional<String> attrs_str = TargetInternal::StringifyAttrsToRaw(attrs)) {
       os << ' ' << attrs_str.value();
     }
-    if (host.defined()) {
-      os << " host='" << host << "'";
-    }
 
     str_repr_ = os.str();
   }
@@ -535,6 +532,34 @@ Optional<Target> TargetNode::GetHost() const {
   return GetRef<Optional<Target>>(this->host.as<TargetNode>());
 }
 
+String TargetNode::ToDebugString() const {
+  std::ostringstream os;
+  os << "Target(tag='" << tag << "'";
+  os << ", kind='" << kind->name << "'";
+  if (!tag.empty()) {
+    os << ", tag='" << tag << "'";
+  }
+  if (!keys.empty()) {
+    os << ", keys={";
+    for (const auto& key : keys) {
+      os << "'" << key << "',";
+    }
+    os << "}";
+  }
+  if (!attrs.empty()) {
+    os << ", attrs={";
+    for (const auto& pair : attrs) {
+      os << '"' << pair.first << "': " << pair.second << ",";
+    }
+    os << "}";
+  }
+  if (host.defined()) {
+    os << ", host=" << host.value();
+  }
+  os << ")";
+  return os.str();
+}
+
 bool TargetNode::SEqualReduce(const TargetNode* other, SEqualReducer equal) const {
   return equal(kind.get(), other->kind.get()) && equal(host, other->host) &&
          equal(tag, other->tag) && equal(keys, other->keys) && equal(attrs, other->attrs);

tests/python/unittest/test_auto_scheduler_measure.py

@@ -424,16 +424,7 @@ def foo():
 
 
 if __name__ == "__main__":
-    test_record_split_reorder_fuse_annotation()
-    test_record_compute_at_root_inline_cache_read_write()
-    test_record_follow_split_follow_fused_split()
-    test_record_pragma_storage_align_rfactor()
-    test_recover_measure_input()
-    test_workload_dis_factor()
-    test_measure_local_builder_runner()
-    test_dag_measure_local_builder_runner()
-    test_workload_serialization()
-    test_measure_local_builder_rpc_runner()
-    test_measure_target_host()
-    test_measure_special_inputs_map_by_name_local_runner()
-    test_measure_special_inputs_map_by_name_rpc_runner()
+    import sys
+    import pytest
+
+    sys.exit(pytest.main([__file__] + sys.argv[1:]))

tests/python/unittest/test_micro_model_library_format.py

@@ -18,7 +18,6 @@
 import datetime
 import json
 import os
-import sys
 import tarfile
 
 import numpy
@@ -411,4 +410,7 @@ def test_export_byoc_c_module():
 
 
 if __name__ == "__main__":
-    sys.exit(pytest.main([__file__] + sys.argv[1:]))
+    import sys
+
+    # sys.exit(pytest.main([__file__] + sys.argv[1:]))
+    test_export_operator_model_library_format()