Merge branch 'master' into port-timetest-new-kpi

This commit is contained in:
Albert Angles 2022-12-28 13:57:36 +01:00 committed by GitHub
commit f25bdd1443
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 9 deletions

View File

@ -143,11 +143,11 @@ macro(ie_arm_neon_optimization_flags flags)
if(ANDROID_ABI STREQUAL "arm64-v8a")
set(${flags} -mfpu=neon -Wno-unused-command-line-argument)
elseif(ANDROID_ABI STREQUAL "armeabi-v7a-hard with NEON")
set(${flags} -march=armv7-a -mfloat-abi=hard -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -mfpu=neon -Wno-unused-command-line-argument)
set(${flags} -march=armv7-a+fp -mfloat-abi=hard -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -mfpu=neon -Wno-unused-command-line-argument)
elseif((ANDROID_ABI STREQUAL "armeabi-v7a with NEON") OR
(ANDROID_ABI STREQUAL "armeabi-v7a" AND
DEFINED CMAKE_ANDROID_ARM_NEON AND CMAKE_ANDROID_ARM_NEON))
set(${flags} -march=armv7-a -mfloat-abi=softfp -mfpu=neon -Wno-unused-command-line-argument)
set(${flags} -march=armv7-a+fp -mfloat-abi=softfp -mfpu=neon -Wno-unused-command-line-argument)
endif()
else()
if(AARCH64)

View File

@ -79,7 +79,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)")
set(ARM ON)
endif()
if(ARM AND NOT CMAKE_CROSSCOMPILING)
add_compile_options(-march=armv7-a)
add_compile_options(-march=armv7-a+fp)
endif()
set(CMAKE_POLICY_DEFAULT_CMP0063 NEW)

View File

@ -1,2 +1,2 @@
numpy>=1.16.6,<=1.23.4
tensorflow>=1.15.5,<=2.10.0
tensorflow>=1.15.5,<=2.11.0

View File

@ -11,7 +11,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
ie_add_compiler_flags(/wd4305)
endif()
set(TARGET_NAME "clDNN_unit_tests64")
set(TARGET_NAME "ov_gpu_unit_tests")
file(GLOB_RECURSE SOURCES_MAIN
"${CMAKE_CURRENT_SOURCE_DIR}/*.h"

View File

@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
#
set(TARGET_NAME gpuFuncTests)
set(TARGET_NAME ov_gpu_func_tests)
addIeTargetTest(
NAME

View File

@ -1,5 +1,5 @@
numpy>=1.16.6
tensorflow>=1.15.5,<=2.10.0
tensorflow>=1.15.5,<=2.11.0
mxnet~=1.2.0; sys_platform == 'win32'
mxnet>=1.7.0.post2,<=1.9.1; sys_platform != 'win32'
networkx~=2.5; python_version <= "3.6"

View File

@ -1,5 +1,5 @@
numpy>=1.16.6,<=1.24.0
tensorflow>=1.15.5,<=2.10.0
tensorflow>=1.15.5,<=2.11.0
networkx~=2.5; python_version <= "3.6"
networkx<=2.8.8; python_version > "3.6"
defusedxml>=0.7.1

View File

@ -1,5 +1,5 @@
numpy>=1.16.6,<=1.24.0
tensorflow>=2.5,<=2.10.0
tensorflow>=2.5,<=2.11.0
networkx~=2.5; python_version <= "3.6"
networkx<=2.8.8; python_version > "3.6"
defusedxml>=0.7.1