Improve errors and fix the semantic version tags in Prelude

.gitignore

@@ -230,7 +230,3 @@ conda/pkg
 # nix files
 .envrc
 *.nix
-
-# antlr files
-*.tokens
-*.interp

include/tvm/parser/parser.h

@@ -32,7 +32,7 @@
 namespace tvm {
 namespace parser {
 
-IRModule Parse(std::string file_name, std::string file_content);
+IRModule ParseModule(std::string file_name, std::string file_content);
 
 }  // namespace parser
 }  // namespace tvm

python/tvm/relay/std/core.rly

@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-v0.0.4
+
+#[version = "0.0.5"]
 
 extern type Storage

python/tvm/relay/std/prelude.rly

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-v0.0.4
+#[version = "0.0.4"]
 
 // TODO(weberlo): should we add sugar for scalar types (e.g., `int32` => `Tensor[(), int32]`)?
 

src/ir/module.cc

@@ -31,6 +31,7 @@
 // Rationale: We calls into relay's analysis module to verify correctness.
 #include <tvm/relay/analysis.h>
 #include <tvm/relay/transform.h>
+#include <tvm/parser/parser.h>
 
 #include <fstream>
 #include <sstream>
@@ -371,10 +372,7 @@ void IRModuleNode::ImportFromStd(const String& path) {
 std::unordered_set<String> IRModuleNode::Imports() const { return this->import_set_; }
 
 IRModule IRModule::FromText(const String& text, const String& source_path) {
-  auto* f = tvm::runtime::Registry::Get("relay.fromtext");
-  CHECK(f != nullptr) << "The Relay std_path is not set, please register tvm.relay.std_path.";
-  IRModule mod = (*f)(text, source_path);
-  return mod;
+  return tvm::parser::ParseModule(source_path, text);
 }
 
 TVM_REGISTER_NODE_TYPE(IRModuleNode);

src/parser/parser.cc

@@ -593,7 +593,7 @@ class Parser {
       }
     } else if (required) {
       this->diag_ctx->Emit(DiagnosticBuilder(DiagnosticLevel::Error, Peek()->span)
-                           << "expected text format semantic version "
+                           << "expected text format semantic version, found a  " << PrettyPrint(Peek())
                            << "you can annotate it as #[version = \"0.0.5\"]");
     }
     return SemVer(0, 0, 5);

src/parser/source_map.cc

@@ -60,6 +60,7 @@ Source::Source(const std::string& source) : source(source) {
  * \param msg The message to attach.
  */
 void Source::ReportAt(std::ostream& out, const Span& span, const std::string& msg) const {
+  DLOG(INFO) << "Source::ReportAt" << "span = " << span << "msg = " << msg;
   int line = span->line;
   int column = span->column;