Consistenly avoid include path stripping to remove some of the dimens…

…ions in debugging build errors with TensorFlow Makefiles. PiperOrigin-RevId: 314779720
wchen342 · Jun 4, 2020 · d4ddc05 · d4ddc05
1 parent 9a8d8f9
commit d4ddc05
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/ruy/BUILD b/ruy/BUILD
@@ -340,7 +340,7 @@ cc_library(
     ] + select({
         ":ppc": [],
         ":fuchsia": [],
-        "//conditions:default": ["@cpuinfo"],
+        "//conditions:default": ["@cpuinfo//:cpuinfo_with_unstripped_include_path"],
     }),
 )
 

diff --git a/ruy/cpuinfo.cc b/ruy/cpuinfo.cc
@@ -11,7 +11,7 @@
 #define RUY_HAVE_CPUINFO (!(RUY_PLATFORM_PPC || RUY_PLATFORM_FUCHSIA))
 
 #if RUY_HAVE_CPUINFO
-#include <cpuinfo.h>
+#include "include/cpuinfo.h"
 #endif
 
 namespace ruy {

diff --git a/third_party/cpuinfo.BUILD b/third_party/cpuinfo.BUILD
@@ -161,6 +161,16 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "cpuinfo_with_unstripped_include_path",
+    hdrs = [
+        "include/cpuinfo.h",
+    ],
+    deps = [
+        ":cpuinfo_impl",
+    ],
+)
+
 ############################# Build configurations #############################
 
 config_setting(