experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollback of 'Reland "Fix issues with 32-bit ARM builds"'

Browse Source 
PiperOrigin-RevId: 320495531
Change-Id: I7aa19da802163f705bf706e42918766f61e8bab1
This commit is contained in:
Jared Duke 2020-07-09 16:16:07 -07:00 committed by TensorFlower Gardener
parent 82e1db2bba
commit ad35731ffd
3 changed files with 13 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tensorflow/BUILD
View File

@ -260,36 +260,6 @@ config_setting(
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
) )
config_setting(
name = "armeabi",
values = {"cpu": "armeabi"},
visibility = ["//visibility:public"],
)
config_setting(
name = "armeabi-v7a",
values = {"cpu": "armeabi-v7a"},
visibility = ["//visibility:public"],
)
config_setting(
name = "arm64-v8a",
values = {"cpu": "arm64-v8a"},
visibility = ["//visibility:public"],
)
selects.config_setting_group(
name = "arm_any",
match_any = [
":arm",
":armeabi",
":armeabi-v7a",
":arm64-v8a",
":linux_aarch64",
":linux_armhf",
],
)
config_setting( config_setting(
name = "freebsd", name = "freebsd",
values = {"cpu": "freebsd"}, values = {"cpu": "freebsd"},

14
tensorflow/core/kernels/BUILD
View File

@ -817,9 +817,10 @@ cc_library(
srcs = ["eigen_contraction_kernel.cc"], srcs = ["eigen_contraction_kernel.cc"],
hdrs = ["eigen_contraction_kernel.h"], hdrs = ["eigen_contraction_kernel.h"],
defines = select({ defines = select({
"//tensorflow:android_x86": [], "//tensorflow:android": [],
"//tensorflow:arm_any": [], "//tensorflow:arm": [],
"//tensorflow:ios": [], "//tensorflow:ios": [],
"//tensorflow:linux_aarch64": [],
"//tensorflow:linux_ppc64le": [], "//tensorflow:linux_ppc64le": [],
"//conditions:default": [ "//conditions:default": [
"TENSORFLOW_USE_CUSTOM_CONTRACTION_KERNEL", "TENSORFLOW_USE_CUSTOM_CONTRACTION_KERNEL",
@ -831,9 +832,10 @@ cc_library(
"//third_party/eigen3", "//third_party/eigen3",
"//tensorflow/core/platform:dynamic_annotations", "//tensorflow/core/platform:dynamic_annotations",
] + select({ ] + select({
"//tensorflow:android_x86": [], "//tensorflow:android": [],
"//tensorflow:arm_any": [], "//tensorflow:arm": [],
"//tensorflow:ios": [], "//tensorflow:ios": [],
"//tensorflow:linux_aarch64": [],
"//tensorflow:linux_ppc64le": [], "//tensorflow:linux_ppc64le": [],
"//conditions:default": ["@mkl_dnn//:mkldnn_single_threaded"], "//conditions:default": ["@mkl_dnn//:mkldnn_single_threaded"],
}), }),
@ -3222,8 +3224,8 @@ tf_cc_test(
name = "eigen_mkldnn_contraction_kernel_test", name = "eigen_mkldnn_contraction_kernel_test",
size = "small", size = "small",
srcs = select({ srcs = select({
"//tensorflow:android_x86": [], "//tensorflow:android": [],
"//tensorflow:arm_any": [], "//tensorflow:arm": [],
"//tensorflow:ios": [], "//tensorflow:ios": [],
"//tensorflow:linux_ppc64le": [], "//tensorflow:linux_ppc64le": [],
":no_mkldnn_contraction_kernel": [], ":no_mkldnn_contraction_kernel": [],

14
tensorflow/core/platform/platform.h
View File

@ -41,22 +41,18 @@ limitations under the License.
#elif defined(_WIN32) #elif defined(_WIN32)
#define PLATFORM_WINDOWS #define PLATFORM_WINDOWS
#elif defined(__arm__)
#define PLATFORM_POSIX
#elif defined(__EMSCRIPTEN__) #elif defined(__EMSCRIPTEN__)
#define PLATFORM_PORTABLE_GOOGLE #define PLATFORM_PORTABLE_GOOGLE
#define PLATFORM_POSIX #define PLATFORM_POSIX
// EMSCRIPTEN builds are considered "mobile" for the sake of portability.
#define IS_MOBILE_PLATFORM
#elif defined(__arm__) || defined(__aarch64__)
// If no platform specified, use:
#define PLATFORM_POSIX
// Require an outside macro to tell us if we're building for Raspberry Pi or // Require an outside macro to tell us if we're building for Raspberry Pi or
// another ARM device that's not a mobile platform. // another ARM device that's not a mobile platform.
#if !defined(RASPBERRY_PI) && !defined(ARM_NON_MOBILE) && \ #if !defined(RASPBERRY_PI) && !defined(ARM_NON_MOBILE)
!defined(PLATFORM_GOOGLE)
#define IS_MOBILE_PLATFORM #define IS_MOBILE_PLATFORM
#endif #endif // !defined(RASPBERRY_PI) && !defined(ARM_NON_MOBILE)
#else #else
// If no platform specified, use: // If no platform specified, use: