diff --git a/mindspore/lite/CMakeLists.txt b/mindspore/lite/CMakeLists.txt index 249719cf6e88647deebb8b247b38ff3c186f8947..62da9d7cae84a375cef146d2953a3d8eee5cceab 100644 --- a/mindspore/lite/CMakeLists.txt +++ b/mindspore/lite/CMakeLists.txt @@ -5,15 +5,15 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_ message(FATAL_ERROR "GCC vesion ${CMAKE_CXX_COMPILER_VERSION} must not be less than 7.3.0") endif () -set(MS_VERSION_MAJOY 0) +set(MS_VERSION_MAJOR 0) set(MS_VERSION_MINOR 7) set(MS_VERSION_REVISION 0) set(DIR_PREFIX mindspore-lite) -set(MS_VERSION ${MS_VERSION_MAJOY}.${MS_VERSION_MINOR}.${MS_VERSION_REVISION}) +set(MS_VERSION ${MS_VERSION_MAJOR}.${MS_VERSION_MINOR}.${MS_VERSION_REVISION}) set(MAIN_DIR ${DIR_PREFIX}-${MS_VERSION}) -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMS_VERSION_MAJOY=${MS_VERSION_MAJOY} -DMS_VERSION_MINOR=${MS_VERSION_MINOR} -DMS_VERSION_REVISION=${MS_VERSION_REVISION}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMS_VERSION_MAJOY=${MS_VERSION_MAJOY} -DMS_VERSION_MINOR=${MS_VERSION_MINOR} -DMS_VERSION_REVISION=${MS_VERSION_REVISION}") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMS_VERSION_MAJOR=${MS_VERSION_MAJOR} -DMS_VERSION_MINOR=${MS_VERSION_MINOR} -DMS_VERSION_REVISION=${MS_VERSION_REVISION}") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMS_VERSION_MAJOR=${MS_VERSION_MAJOR} -DMS_VERSION_MINOR=${MS_VERSION_MINOR} -DMS_VERSION_REVISION=${MS_VERSION_REVISION}") if (SUPPORT_GPU) set(PROCESS_UNIT gpu) diff --git a/mindspore/lite/include/version.h b/mindspore/lite/include/version.h index a6f77eb10d50aa18548bcef0e8f8ec016b3bbad4..377d8be9728b5903ed5fed1887d9279f2ef17a7d 100644 --- a/mindspore/lite/include/version.h +++ b/mindspore/lite/include/version.h @@ -24,8 +24,8 @@ namespace lite { /// \brief Global method to get a version string. /// /// \return The version string of MindSpore Lite. -#ifndef MS_VERSION_MAJOY -#define MS_VERSION_MAJOY 0 +#ifndef MS_VERSION_MAJOR +#define MS_VERSION_MAJOR 0 #endif #ifndef MS_VERSION_MINOR #define MS_VERSION_MINOR 7 @@ -34,7 +34,7 @@ namespace lite { #define MS_VERSION_REVISION 0 #endif std::string Version() { - return "MindSpore Lite " + std::to_string(MS_VERSION_MAJOY) + "." + std::to_string(MS_VERSION_MINOR) + "." + + return "MindSpore Lite " + std::to_string(MS_VERSION_MAJOR) + "." + std::to_string(MS_VERSION_MINOR) + "." + std::to_string(MS_VERSION_REVISION); } } // namespace lite diff --git a/mindspore/lite/java/native/CMakeLists.txt b/mindspore/lite/java/native/CMakeLists.txt index e9cb68ef24b0c09f91de7a2c20f3b3a72581fdf7..38a8b549a4dd794cbdf15a557510c384e6acd712 100644 --- a/mindspore/lite/java/native/CMakeLists.txt +++ b/mindspore/lite/java/native/CMakeLists.txt @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.14) project (Lite-java) -set(MS_VERSION_MAJOY 0) +set(MS_VERSION_MAJOR 0) set(MS_VERSION_MINOR 7) set(MS_VERSION_REVISION 0) -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMS_VERSION_MAJOY=${MS_VERSION_MAJOY} -DMS_VERSION_MINOR=${MS_VERSION_MINOR} -DMS_VERSION_REVISION=${MS_VERSION_REVISION}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMS_VERSION_MAJOY=${MS_VERSION_MAJOY} -DMS_VERSION_MINOR=${MS_VERSION_MINOR} -DMS_VERSION_REVISION=${MS_VERSION_REVISION}") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMS_VERSION_MAJOR=${MS_VERSION_MAJOR} -DMS_VERSION_MINOR=${MS_VERSION_MINOR} -DMS_VERSION_REVISION=${MS_VERSION_REVISION}") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMS_VERSION_MAJOR=${MS_VERSION_MAJOR} -DMS_VERSION_MINOR=${MS_VERSION_MINOR} -DMS_VERSION_REVISION=${MS_VERSION_REVISION}") include_directories(${CMAKE_CURRENT_SOURCE_DIR}/) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../lite/) diff --git a/mindspore/lite/src/ops/primitive_c.cc b/mindspore/lite/src/ops/primitive_c.cc index b3f8100fd06be3e8cec853009c66fbc02f5a91c0..319ee75926528881bc0ee0a3ea3ded96eca19536 100644 --- a/mindspore/lite/src/ops/primitive_c.cc +++ b/mindspore/lite/src/ops/primitive_c.cc @@ -118,6 +118,8 @@ #include "src/ops/make_tuple.h" #include "src/ops/quant.h" #include "src/ops/tuple_get_item.h" +#include "src/ops/l2_norm.h" +#include "src/ops/sparse_to_dense.h" namespace mindspore { namespace lite { @@ -434,6 +436,10 @@ PrimitiveC *PrimitiveC::UnPackFromSchemaPrimitiveT(mindspore::schema::PrimitiveT return new ScatterND(primitive); case schema::PrimitiveType_ConstantOfShape: return new ConstantOfShape(primitive); + case schema::PrimitiveType_L2Norm: + return new L2Norm(primitive); + case schema::PrimitiveType_SparseToDense: + return new SparseToDense(primitive); default: MS_LOG(ERROR) << "Unsupported primitive type in UnPackFromSchemaPrimitiveT : " << schema::EnumNamePrimitiveType(op_type); @@ -642,6 +648,10 @@ PrimitiveC *PrimitiveC::UnPackFromSchemaPrimitive(mindspore::schema::Primitive * return new ScatterND(const_cast(primitive)); case schema::PrimitiveType_ConstantOfShape: return new ConstantOfShape(const_cast(primitive)); + case schema::PrimitiveType_L2Norm: + return new L2Norm(const_cast(primitive)); + case schema::PrimitiveType_SparseToDense: + return new SparseToDense(const_cast(primitive)); default: MS_LOG(ERROR) << "Unsupported primitive type in UnPackFromSchemaPrimitive : " << schema::EnumNamePrimitiveType(op_type);