From 7de4c114b36c8ae41ad9f56b07995f8c53cb623f Mon Sep 17 00:00:00 2001 From: zhaosida Date: Sat, 27 Nov 2021 15:40:35 +0800 Subject: [PATCH] fix avx512 compile option --- .../ccsrc/backend/kernel_compiler/cpu/nnacl/CMakeLists.txt | 2 +- .../cpu/nnacl/intrinsics/avx/TiledC8MatMulFp32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/CMakeLists.txt b/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/CMakeLists.txt index 53be8014c91..86464cca2ef 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/CMakeLists.txt +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/CMakeLists.txt @@ -130,7 +130,7 @@ if(ENABLE_CPU) elseif("${X86_64_SIMD}" STREQUAL "avx") target_compile_definitions(nnacl_mid PRIVATE ENABLE_SSE ENABLE_AVX) elseif("${X86_64_SIMD}" STREQUAL "avx512") - target_compile_definitions(nnacl_mid PRIVATE ENABLE_AVX512) + target_compile_definitions(nnacl_mid PRIVATE ENABLE_SSE ENABLE_AVX ENABLE_AVX512) target_compile_options(nnacl_mid PRIVATE -mavx512f) endif() target_compile_options(nnacl_mid PRIVATE -fPIC) diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/TiledC8MatMulFp32.c b/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/TiledC8MatMulFp32.c index 5c9b1b5b765..31f2d716046 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/TiledC8MatMulFp32.c +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/TiledC8MatMulFp32.c @@ -20,7 +20,6 @@ #include #endif #include "nnacl/fp32/common_func_fp32.h" -#endif void TiledC8MatmulFp32(float *dst, const float *src, const float *weight, size_t cal_num, size_t ic8, size_t oc8) { const float *src_tmp = src; @@ -242,3 +241,4 @@ void TiledC8MatmulFp32(float *dst, const float *src, const float *weight, size_t dst += cal_num; } } +#endif