p06452378
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!48718 fix windows visual studio compile error 

Merge pull request !48718 from wangpingan/windows
This commit is contained in:
i-robot 2023-02-13 03:46:57 +00:00 committed by Gitee
parent 2894821249 39140fb01a
commit 80b9bfa5c0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/pack_fp32.c
View File

@ -1017,52 +1017,52 @@ void RowMajor2Col4MajorParallel(const float *src_ptr, float *dst_ptr, int row, i
}
}
inline void RowMajor2ColMajor(const float *src_ptr, float *dst_ptr, int row, int col) {
void RowMajor2ColMajor(const float *src_ptr, float *dst_ptr, int row, int col) {
RowMajor2ColMajorParallel(src_ptr, dst_ptr, row, col, 0, row);
}
inline void RowMajor2RowMajor(const float *src_ptr, float *dst_ptr, int row, int col) {
void RowMajor2RowMajor(const float *src_ptr, float *dst_ptr, int row, int col) {
RowMajor2RowMajorParallel(src_ptr, dst_ptr, row, col, 0, row);
}
inline void RowMajor2Row4Major(const float *src_ptr, float *dst_ptr, int row, int col) {
void RowMajor2Row4Major(const float *src_ptr, float *dst_ptr, int row, int col) {
RowMajor2Row4MajorParallel(src_ptr, dst_ptr, row, col, 0, row);
}
inline void RowMajor2Row6Major(const float *src_ptr, float *dst_ptr, int row, int col) {
void RowMajor2Row6Major(const float *src_ptr, float *dst_ptr, int row, int col) {
RowMajor2Row6MajorParallel(src_ptr, dst_ptr, row, col, 0, row);
}
inline void RowMajor2Row8Major(const float *src_ptr, float *dst_ptr, int row, int col) {
void RowMajor2Row8Major(const float *src_ptr, float *dst_ptr, int row, int col) {
RowMajor2Row8MajorParallel(src_ptr, dst_ptr, row, col, 0, row);
}
inline void RowMajor2Row12Major(const float *src_ptr, float *dst_ptr, int row, int col) {
void RowMajor2Row12Major(const float *src_ptr, float *dst_ptr, int row, int col) {
RowMajor2Row12MajorParallel(src_ptr, dst_ptr, row, col, 0, row);
}
inline void RowMajor2Row16Major(const float *src_ptr, float *dst_ptr, int row, int col) {
void RowMajor2Row16Major(const float *src_ptr, float *dst_ptr, int row, int col) {
RowMajor2Row16MajorParallel(src_ptr, dst_ptr, row, col, 0, row);
}
inline void RowMajor2Row32Major(const float *src_ptr, float *dst_ptr, int col, int row) {
void RowMajor2Row32Major(const float *src_ptr, float *dst_ptr, int col, int row) {
RowMajor2Row32MajorParallel(src_ptr, dst_ptr, col, row, 0, col);
}
inline void RowMajor2Row64Major(const float *src_ptr, float *dst_ptr, int col, int row) {
void RowMajor2Row64Major(const float *src_ptr, float *dst_ptr, int col, int row) {
RowMajor2Row64MajorParallel(src_ptr, dst_ptr, col, row, 0, col);
}
inline void RowMajor2Col12Major(const float *src_ptr, float *dst_ptr, int row, int col) {
void RowMajor2Col12Major(const float *src_ptr, float *dst_ptr, int row, int col) {
RowMajor2Col12MajorParallel(src_ptr, dst_ptr, row, col, 0, row);
}
inline void RowMajor2Col8Major(const float *src_ptr, float *dst_ptr, int row, int col) {
void RowMajor2Col8Major(const float *src_ptr, float *dst_ptr, int row, int col) {
RowMajor2Col8MajorParallel(src_ptr, dst_ptr, row, col, 0, row);
}
inline void RowMajor2Col16Major(const float *src_ptr, float *dst_ptr, int row, int col) {
void RowMajor2Col16Major(const float *src_ptr, float *dst_ptr, int row, int col) {
RowMajor2Col16MajorParallel(src_ptr, dst_ptr, row, col, 0, row);
}
inline void RowMajor2Col32Major(const float *src_ptr, float *dst_ptr, int row, int col) {
void RowMajor2Col32Major(const float *src_ptr, float *dst_ptr, int row, int col) {
RowMajor2Col32MajorParallel(src_ptr, dst_ptr, row, col, 0, row);
}
inline void RowMajor2Col64Major(const float *src_ptr, float *dst_ptr, int row, int col) {
void RowMajor2Col64Major(const float *src_ptr, float *dst_ptr, int row, int col) {
RowMajor2Col64MajorParallel(src_ptr, dst_ptr, row, col, 0, row);
}
inline void RowMajor2Col6Major(const float *src_ptr, float *dst_ptr, int row, int col) {
void RowMajor2Col6Major(const float *src_ptr, float *dst_ptr, int row, int col) {
RowMajor2Col6MajorParallel(src_ptr, dst_ptr, row, col, 0, row);
}
inline void RowMajor2Col4Major(const float *src_ptr, float *dst_ptr, int row, int col) {
void RowMajor2Col4Major(const float *src_ptr, float *dst_ptr, int row, int col) {
RowMajor2Col4MajorParallel(src_ptr, dst_ptr, row, col, 0, row);
}

4
mindspore/lite/tools/benchmark/CMakeLists.txt
View File

@ -79,6 +79,10 @@ if(NOT (MSLITE_ENABLE_CLOUD_FUSION_INFERENCE OR MSLITE_ENABLE_CLOUD_INFERENCE))
set(C_SRC ${CMAKE_CURRENT_SOURCE_DIR}/benchmark_c_api.cc)
endif()
if(MSVC)
set(COMMON_SRC ${COMMON_SRC} ${CMAKE_CURRENT_SOURCE_DIR}/../converter/converter_context.cc)
endif()
add_executable(benchmark
${CMAKE_CURRENT_SOURCE_DIR}/main.cc
${CMAKE_CURRENT_SOURCE_DIR}/run_benchmark.cc