Fixes for building onnx-mlir on Windows with Visual Studio 2022

CMakeLists.txt

@@ -9,6 +9,7 @@ option(ONNX_MLIR_BUILD_TESTS "Build ONNX-MLIR test executables. If OFF, just gen
 option(ONNX_MLIR_CCACHE_BUILD "Set to ON for a ccache enabled build." OFF)
 option(ONNX_MLIR_ENABLE_STABLEHLO "Enable StableHLO support." ON)
 option(ONNX_MLIR_ENABLE_WERROR "Enable warnings as errors." OFF)
+option(ONNX_MLIR_ENABLE_OMP "Enable OpenMP support." ON)
 option(ONNX_MLIR_SUPPRESS_THIRD_PARTY_WARNINGS "Suppress warning in third_party code." ON)
 option(ONNX_MLIR_ENABLE_JAVA "Set to ON for building the Java runtime, tools, and tests" ON)
 option(ONNX_MLIR_ENABLE_PYRUNTIME_LIGHT "Set to ON for building Python driver of running the compiled model without llvm-project." OFF)

docs/BuildOnWindows.md

@@ -101,6 +101,7 @@ call cmake %root_dir%\onnx-mlir -G "Ninja" ^
    -DLLVM_EXTERNAL_LIT=%lit_path% ^
    -DLLVM_LIT_ARGS=-v ^
    -DMLIR_DIR=%root_dir%\llvm-project\build\lib\cmake\mlir ^
+   -DONNX_MLIR_ENABLE_OMP=OFF ^
    -DONNX_MLIR_ENABLE_STABLEHLO=OFF ^
    -DONNX_MLIR_ENABLE_WERROR=ON
 

src/Compiler/CMakeLists.txt

@@ -207,7 +207,7 @@ add_dependencies(OMCompilerUtils cruntime)
 if (ONNX_MLIR_ENABLE_JNI)
   add_dependencies(OMCompilerUtils jniruntime)
 endif()
-if (TARGET omp)
+if ((TARGET omp) AND (ONNX_MLIR_ENABLE_OMP))
   add_dependencies(OMCompilerUtils ompruntime)
 endif()
 

src/Conversion/ONNXToKrnl/Math/Window.cpp

@@ -22,6 +22,10 @@
 
 using namespace mlir;
 
+#if !defined(M_PI)
+#define M_PI 3.14159265358979323846
+#endif
+
 namespace onnx_mlir {
 
 //===----------------------------------------------------------------------===//

src/Dialect/ONNX/Transforms/ConstProp.cpp

@@ -1099,9 +1099,19 @@ Value ConstPropNonZero(
 //===----------------------------------------------------------------------===//
 // Pattern definition.
 //===----------------------------------------------------------------------===//
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(                                                               \
+    disable : 4927) // Disable warning: illegal conversion; more than one
+                    // user-defined conversion has been implicitly applied
+#endif
 
 #include "src/Dialect/ONNX/Transforms/ONNXConstProp.inc"
 
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
 //===----------------------------------------------------------------------===//
 // Code to perform constant propagation for split.
 // Not done with tablegen which doesn't support variadic results.

src/Runtime/omp/CMakeLists.txt

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Only if LLVM is built with openmp enabled
-if(TARGET omp)
+if((TARGET omp) AND (ONNX_MLIR_ENABLE_OMP))
   set(OMP_TOPDIR ${CMAKE_CURRENT_BINARY_DIR})
   set_directory_properties(PROPERTIES EP_BASE ${OMP_TOPDIR})
 

src/onnx-mlir.cpp

@@ -92,7 +92,7 @@ int main(int argc, char *argv[]) {
   // Add the short inputFilename to the first compile phase printout so that we
   // may better determine which compilation we are dealing with.
   std::filesystem::path p(inputFilename);
-  std::string modelShortName = p.filename();
+  std::string modelShortName = p.filename().string();
   // Configure compile phase information.
   SET_TOTAL_COMPILE_PHASE(emissionTarget);
   std::string msg =

utils/build-onnx-mlir.cmd

@@ -8,6 +8,7 @@ call cmake %root_dir%\onnx-mlir -G "Ninja" ^
    -DLLVM_EXTERNAL_LIT=%lit_path% ^
    -DLLVM_LIT_ARGS=-v ^
    -DMLIR_DIR=%root_dir%\llvm-project\build\lib\cmake\mlir ^
+   -DONNX_MLIR_ENABLE_OMP=OFF ^
    -DONNX_MLIR_ENABLE_STABLEHLO=OFF ^
    -DONNX_MLIR_ENABLE_WERROR=ON