From 4f70145b43c3550eea859884b6b3d4ed3cb47817 Mon Sep 17 00:00:00 2001
From: sunsuodong <sunsuodong@huawei.com>
Date: Fri, 8 Apr 2022 19:09:26 -0700
Subject: [PATCH] fix win32 build

---
 build.bat                                     | 20 +++++--------------
 .../device/cpu/kernel/nnacl/CMakeLists.txt    |  3 +--
 mindspore/lite/src/cpu_info.h                 |  4 ++--
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/build.bat b/build.bat
index fb4c57973ff..01808172c84 100644
--- a/build.bat
+++ b/build.bat
@@ -21,16 +21,8 @@ SET BUILD_PATH=%BASE_PATH%/build
 SET threads=8
 SET ENABLE_GITEE=OFF
 
-set VERSION_MAJOR=''
-set VERSION_MINOR=''
-set ERSION_REVISION=''
-
-for /f "delims=\= tokens=2" %%a in ('findstr /C:"const int ms_version_major = " mindspore\lite\include\version.h') do (set x=%%a)
-set VERSION_MAJOR=%x:~1,1%
-for /f "delims=\= tokens=2" %%b in ('findstr /C:"const int ms_version_minor = " mindspore\lite\include\version.h') do (set y=%%b)
-set VERSION_MINOR=%y:~1,1%
-for /f "delims=\= tokens=2" %%c in ('findstr /C:"const int ms_version_revision = " mindspore\lite\include\version.h') do (set z=%%c)
-set VERSION_REVISION=%z:~1,1%
+set VERSION_STR=''
+for /f "tokens=1" %%a in (version.txt) do (set VERSION_STR=%%a)
 
 ECHO %2%|FINDSTR "^[0-9][0-9]*$"
 IF %errorlevel% == 0 (
@@ -52,16 +44,14 @@ IF NOT EXIST "%BUILD_PATH%/mindspore" (
 
 cd %BUILD_PATH%/mindspore
 IF "%1%" == "lite" (
-    echo "======Start building MindSpore Lite %VERSION_MAJOR%.%VERSION_MINOR%.%VERSION_REVISION%======"
+    echo "======Start building MindSpore Lite %VERSION_STR%======"
     rd /s /q "%BASE_PATH%\output"
     (git log -1 | findstr "^commit") > %BUILD_PATH%\.commit_id
     IF defined VisualStudioVersion (
-        cmake -DMSLITE_MINDDATA_IMPLEMENT=off -DMSLITE_ENABLE_TRAIN=off ^
-            -DMS_VERSION_MAJOR=%VERSION_MAJOR% -DMS_VERSION_MINOR=%VERSION_MINOR% -DMS_VERSION_REVISION=%VERSION_REVISION% ^
+        cmake -DMSLITE_MINDDATA_IMPLEMENT=off -DMSLITE_ENABLE_TRAIN=off -DVERSION_STR=%VERSION_STR% ^
             -DCMAKE_BUILD_TYPE=Release -G "Ninja" "%BASE_PATH%/mindspore/lite"
     ) ELSE (
-        cmake -DMSLITE_MINDDATA_IMPLEMENT=off -DMSLITE_ENABLE_TRAIN=off ^
-            -DMS_VERSION_MAJOR=%VERSION_MAJOR% -DMS_VERSION_MINOR=%VERSION_MINOR% -DMS_VERSION_REVISION=%VERSION_REVISION% ^
+        cmake -DMSLITE_MINDDATA_IMPLEMENT=off -DMSLITE_ENABLE_TRAIN=off -DVERSION_STR=%VERSION_STR% ^
             -DCMAKE_BUILD_TYPE=Release -G "CodeBlocks - MinGW Makefiles" "%BASE_PATH%/mindspore/lite"
     )
 ) ELSE (
diff --git a/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/CMakeLists.txt b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/CMakeLists.txt
index 61ae7ea7d85..ce6ce74ca76 100644
--- a/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/CMakeLists.txt
+++ b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/CMakeLists.txt
@@ -105,8 +105,7 @@ if(PLATFORM_ARM32)
 endif()
 
 if("${X86_64_SIMD}" STREQUAL "sse")
-    file(GLOB ASSEMBLY_SRC ${NNACL_DIR}/intrinsics/sse/*.c
-            ${NNACL_DIR}/intrinsics/ms_simd_cpu_info.c)
+    file(GLOB ASSEMBLY_SRC ${NNACL_DIR}/intrinsics/sse/*.c)
     set_property(SOURCE ${ASSEMBLY_SRC} PROPERTY LANGUAGE C)
 endif()
 
diff --git a/mindspore/lite/src/cpu_info.h b/mindspore/lite/src/cpu_info.h
index 2f75106dee1..7d766757219 100644
--- a/mindspore/lite/src/cpu_info.h
+++ b/mindspore/lite/src/cpu_info.h
@@ -17,14 +17,14 @@
 #ifndef MINDSPORE_LITE_SRC_CPU_INFO_H
 #define MINDSPORE_LITE_SRC_CPU_INFO_H
 
-#if defined(ENABLE_AVX512) || defined(ENABLE_AVX) || defined(ENABLE_SSE)
+#if defined(ENABLE_AVX512) || defined(ENABLE_AVX)
 #include "nnacl/intrinsics/ms_simd_cpu_info.h"
 #endif
 
 inline bool PlatformInstructionSetSupportCheck() {
   bool flag = true;
 
-#if defined(ENABLE_AVX512) || defined(ENABLE_AVX) || defined(ENABLE_SSE)
+#if defined(ENABLE_AVX512) || defined(ENABLE_AVX)
   flag = IntelX86InstructionSetSupportCheck();
 #endif