!4385 modify cmakefile

Merge pull request !4385 from songhonglei413/roi
pull/4385/MERGE
mindspore-ci-bot 5 years ago committed by Gitee
commit 400fd90e96

@ -9,6 +9,7 @@ file(GLOB KERNEL_SRC
${CMAKE_CURRENT_SOURCE_DIR}/fp32/*.cc ${CMAKE_CURRENT_SOURCE_DIR}/fp32/*.cc
${CMAKE_CURRENT_SOURCE_DIR}/int8/*.cc ${CMAKE_CURRENT_SOURCE_DIR}/int8/*.cc
) )
list(REMOVE_ITEM KERNEL_SRC ${CMAKE_CURRENT_SOURCE_DIR}/nnacl/opt_op_handler.c)
if (SUPPORT_TRAIN) if (SUPPORT_TRAIN)
file (GLOB TRAIN_KERNEL_SRC file (GLOB TRAIN_KERNEL_SRC
@ -20,8 +21,6 @@ endif()
if (PLATFORM_ARM64) if (PLATFORM_ARM64)
# assembly # assembly
file(GLOB ASSEMBLY_SRC nnacl/assembly/arm64/*.s file(GLOB ASSEMBLY_SRC nnacl/assembly/arm64/*.s
nnacl/assembly/opt/*.s
nnacl/assembly/opt/*.S
nnacl/assembly/arm64/*.S) nnacl/assembly/arm64/*.S)
set_property(SOURCE ${ASSEMBLY_SRC} PROPERTY LANGUAGE C) set_property(SOURCE ${ASSEMBLY_SRC} PROPERTY LANGUAGE C)
set(KERNEL_SRC ${KERNEL_SRC} ${ASSEMBLY_SRC}) set(KERNEL_SRC ${KERNEL_SRC} ${ASSEMBLY_SRC})
@ -31,8 +30,6 @@ if (PLATFORM_ARM32)
# assembly # assembly
file(GLOB ASSEMBLY_SRC nnacl/assembly/arm32/*.s file(GLOB ASSEMBLY_SRC nnacl/assembly/arm32/*.s
nnacl/assembly/arm32/*.S nnacl/assembly/arm32/*.S
nnacl/assembly/opt/*.s
nnacl/assembly/opt/*.S
) )
set_property(SOURCE ${ASSEMBLY_SRC} PROPERTY LANGUAGE C) set_property(SOURCE ${ASSEMBLY_SRC} PROPERTY LANGUAGE C)
set(KERNEL_SRC ${KERNEL_SRC} ${ASSEMBLY_SRC}) set(KERNEL_SRC ${KERNEL_SRC} ${ASSEMBLY_SRC})

@ -100,8 +100,6 @@ endif()
if (PLATFORM_ARM64) if (PLATFORM_ARM64)
# assembly # assembly
file(GLOB TEST_ASSEMBLY_SRC ${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/arm64/*.s file(GLOB TEST_ASSEMBLY_SRC ${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/arm64/*.s
${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/opt/*.s
${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/opt/*.S
${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/arm64/*.S) ${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/arm64/*.S)
set_property(SOURCE ${TEST_ASSEMBLY_SRC} PROPERTY LANGUAGE C) set_property(SOURCE ${TEST_ASSEMBLY_SRC} PROPERTY LANGUAGE C)
@ -113,8 +111,6 @@ endif()
if (PLATFORM_ARM32) if (PLATFORM_ARM32)
# assembly # assembly
file(GLOB TEST_ASSEMBLY_SRC file(GLOB TEST_ASSEMBLY_SRC
${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/opt/*.s
${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/opt/*.S
${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/arm32/*.S ${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/arm32/*.S
${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/arm32/*.s) ${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/arm32/*.s)
set_property(SOURCE ${TEST_ASSEMBLY_SRC} PROPERTY LANGUAGE C) set_property(SOURCE ${TEST_ASSEMBLY_SRC} PROPERTY LANGUAGE C)

Loading…
Cancel
Save