Update onnx-mlir product version

src/Compiler/CMakeLists.txt

@@ -70,7 +70,7 @@ add_onnx_mlir_library(CompilerPasses
 # ONNX_MLIR_PRODUCT_VERSION is specified/cached.
 if (DEFINED ONNX_MLIR_PRODUCT_VERSION)
   string(REGEX MATCH "^([0-9]+)(\\.([0-9]+))?(\\.([0-9]+))?(\\-(.+))$"
-	  VERSION_MATCH ${ONNX_MLIR_PRODUCT_VERSION})
+          VERSION_MATCH ${ONNX_MLIR_PRODUCT_VERSION})
 
   # For a version string 1.2.3-foo,
   # CMAKE_MATCH_1 = 1
@@ -113,6 +113,7 @@ list(APPEND DEFINITIONS "PRODUCT_VERSION_MAJOR=${PRODUCT_VERSION_MAJOR}")
 list(APPEND DEFINITIONS "PRODUCT_VERSION_MINOR=${PRODUCT_VERSION_MINOR}")
 list(APPEND DEFINITIONS "PRODUCT_VERSION_PATCH=${PRODUCT_VERSION_PATCH}")
 list(APPEND DEFINITIONS "PRODUCT_ID=\"${PRODUCT_ID}\"")
+target_compile_definitions(OMVersion PUBLIC ${DEFINITIONS})
 set_property(SOURCE CompilerUtils.cpp APPEND PROPERTY COMPILE_DEFINITIONS ${DEFINITIONS})
 
 add_onnx_mlir_library(CompilerUtils
@@ -126,7 +127,7 @@ add_onnx_mlir_library(CompilerUtils
 
   INCLUDE_DIRS PRIVATE
   ${FILE_GENERATE_DIR}
-  
+
   INCLUDE_DIRS PUBLIC
   ${ONNX_MLIR_SRC_ROOT}/include
 
@@ -164,7 +165,7 @@ add_onnx_mlir_library(OnnxMlirCompiler
   ${FILE_GENERATE_DIR}
 
   EXCLUDE_FROM_OM_LIBS
-  
+
   LINK_LIBS PRIVATE
   CompilerUtils
   )

src/Version/CMakeLists.txt

@@ -73,7 +73,7 @@ else()
   list(APPEND DEFINITIONS "ONNX_VERSION=\"${ONNX_VERSION}\"")
 endif()
 if (ONNX_MLIR_VENDOR)
-  list(APPEND DEFINITIONS "ONNX_MLIR_VENDOR=\"${ONNX_MLIR_VENDOR }\"")
+  list(APPEND DEFINITIONS "ONNX_MLIR_VENDOR=\"${ONNX_MLIR_VENDOR}\"")
 endif()
 list(APPEND DEFINITIONS "LLVM_PACKAGE_VERSION=\"${LLVM_PACKAGE_VERSION}\"")
 target_compile_definitions(OMVersion PUBLIC ${DEFINITIONS})

src/Version/Version.cpp

@@ -82,14 +82,23 @@ std::string getOnnxMlirFullVersion(bool toIncludeLLVM) {
   llvm::raw_string_ostream os(buf);
 #ifdef ONNX_MLIR_VENDOR
   os << ONNX_MLIR_VENDOR;
+#else
+  os << "onnx-mlir product version";
+#endif
+#ifdef ONNX_MLIR_PRODUCT_VERSION
+  os << " " << ONNX_MLIR_PRODUCT_VERSION << '\n';
+#else
+  os << " " << PRODUCT_VERSION_MAJOR << '.';
+  os << PRODUCT_VERSION_MINOR << '.';
+  os << PRODUCT_VERSION_PATCH << '-' << PRODUCT_ID << '\n';
 #endif
   os << "onnx-mlir version " ONNX_MLIR_VERSION;
 #ifdef ONNX_VERSION
   os << ", onnx version " ONNX_VERSION;
 #endif
   std::string repo = getOnnxMlirFullRepositoryVersion(toIncludeLLVM);
   if (!repo.empty()) {
-    os << " " << repo;
+    os << " " << repo << '\n';
   }
 
   return buf;
@@ -119,12 +128,12 @@ std::string getOnnxMlirFullVersion(bool toIncludeLLVM) {
 
 void getVersionPrinter(llvm::raw_ostream &os) {
   os << getOnnxMlirFullVersion(false) << "\n";
-  os << "  LLVM version " << LLVM_PACKAGE_VERSION << ' '
+  os << "LLVM version " << LLVM_PACKAGE_VERSION << ' '
      << getLLVMFullRepositoryVersion() << '\n';
 #if ONNX_MLIR_IS_DEBUG_BUILD
-  os << "  DEBUG build";
+  os << "DEBUG build";
 #else
-  os << "  Optimized build";
+  os << "Optimized build";
 #endif
 #ifndef NDEBUG
   os << " with assertions";
@@ -133,8 +142,8 @@ void getVersionPrinter(llvm::raw_ostream &os) {
   if (CPU == "generic")
     CPU = "(unknown)";
   os << ".\n";
-  os << "  Default target: " << llvm::sys::getDefaultTargetTriple() << '\n'
-     << "  Host CPU: " << CPU << '\n';
+  os << "Default target: " << llvm::sys::getDefaultTargetTriple() << '\n'
+     << "Host CPU: " << CPU << '\n';
 }
 
 } // namespace onnx_mlir

test/mlir/driver/version.mlir

@@ -1,6 +1,7 @@
 // RUN: onnx-mlir --version | FileCheck %s
 
-// CHECK: onnx-mlir version {{[0-9]+}}.{{[0-9]+}}.{{[0-9]+}}, onnx version {{[0-9]+}}.{{[0-9]+}}.{{[0-9]+}}
+// CHECK:   {{.+}} {{[0-9]+}}.{{[0-9]+}}.{{[0-9]+}}-{{.+}}
+// CHECK:   onnx-mlir version {{[0-9]+}}.{{[0-9]+}}.{{[0-9]+}}, onnx version {{[0-9]+}}.{{[0-9]+}}.{{[0-9]+}}
 // CHECK:   LLVM version {{[0-9]+}}.{{[0-9]+}}.{{[0-9]+}}
 // CHECK:   {{[DEBUG|Optimized]}} build{{[ with assertions]*}}
 // CHECK:   Default target: