Move ruy's code to a ruy/ subdirectory.

The motivation is that having source files in the repository root runs into a number of corner cases with copybara setups and with external CMake build systems, so enclosing all code in ruy/ avoids that while generally making our setup much more similar to that of other related projects (TensorFlow, IREE).

PiperOrigin-RevId: 303448881
Change-Id: Id099055cba4d3c50ae60171d645614b57a8d3ee7

tensorflow/lite/experimental/ruy/WORKSPACE

@@ -0,0 +1,17 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Workspace file for the Ruy project.
+
+workspace(name = "com_google_ruy")

tensorflow/lite/experimental/ruy/ruy/BUILD

@@ -131,7 +131,7 @@ cc_library(
         ":opt_set",
         ":platform",
         ":time",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -209,7 +209,7 @@ cc_library(
         ":path",
         ":side_pair",
         ":size_util",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -383,7 +383,7 @@ cc_library(
         ":size_util",
         ":spec",
         ":tune",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -405,7 +405,7 @@ cc_library(
         ":path",
         ":platform",
         ":tune",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -421,7 +421,7 @@ cc_library(
         ":kernel_common",
         ":opt_set",
         ":platform",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -436,7 +436,7 @@ cc_library(
         ":opt_set",
         ":pack_common",
         ":platform",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -456,7 +456,7 @@ cc_library(
         ":kernel_common",
         ":opt_set",
         ":platform",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -473,7 +473,7 @@ cc_library(
         ":pack_common",
         ":path",
         ":platform",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -509,7 +509,7 @@ cc_library(
         ":kernel_common",
         ":opt_set",
         ":platform",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -526,7 +526,7 @@ cc_library(
         ":pack_common",
         ":path",
         ":platform",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -566,7 +566,7 @@ cc_library(
         ":kernel_common",
         ":opt_set",
         ":platform",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -583,7 +583,7 @@ cc_library(
         ":pack_common",
         ":path",
         ":platform",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -623,7 +623,7 @@ cc_library(
         ":kernel_common",
         ":opt_set",
         ":platform",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -640,7 +640,7 @@ cc_library(
         ":pack_common",
         ":path",
         ":platform",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -685,7 +685,7 @@ cc_library(
         ":size_util",
         ":spec",
         ":tune",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -711,7 +711,7 @@ cc_library(
         ":path",
         ":platform",
         ":tune",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -796,7 +796,7 @@ cc_library(
         ":trace",
         ":trmul_params",
         ":tune",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -829,7 +829,7 @@ cc_library(
         ":trmul",
         ":trmul_params",
         ":tune",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -877,7 +877,7 @@ cc_library(
         ":time",
         "@com_google_googletest//:gtest",
         ":platform",
-        "//tensorflow/lite/experimental/ruy/profiler:profiler",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:profiler",
     ] + ruy_test_ext_deps(),
 )
 
@@ -894,8 +894,8 @@ ruy_benchmark(
         ("i8", "i8", "i32", "i32"),
     ],
     deps = [
-        "//tensorflow/lite/experimental/ruy:test_lib",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy:test_lib",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
     ],
 )
 
@@ -915,7 +915,7 @@ ruy_test(
         ("i8", "u8", "i32", "i32"),
     ],
     deps = [
-        "//tensorflow/lite/experimental/ruy:test_lib",
+        "//tensorflow/lite/experimental/ruy/ruy:test_lib",
         "@com_google_googletest//:gtest_main",
     ],
 )
@@ -933,7 +933,7 @@ ruy_test(
     ],
     tags = ["slow"],
     deps = [
-        "//tensorflow/lite/experimental/ruy:test_lib",
+        "//tensorflow/lite/experimental/ruy/ruy:test_lib",
         "@com_google_googletest//:gtest_main",
     ],
 )
@@ -948,7 +948,7 @@ ruy_test(
         ("u8", "u8", "i32", "i16"),
     ],
     deps = [
-        "//tensorflow/lite/experimental/ruy:test_lib",
+        "//tensorflow/lite/experimental/ruy/ruy:test_lib",
         "@com_google_googletest//:gtest_main",
     ],
 )

tensorflow/lite/experimental/ruy/ruy/allocator.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/allocator.h"
+#include "tensorflow/lite/experimental/ruy/ruy/allocator.h"
 
 #include <cstdint>
 #include <cstdlib>

tensorflow/lite/experimental/ruy/ruy/allocator.h

@@ -13,16 +13,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_ALLOCATOR_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_ALLOCATOR_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_ALLOCATOR_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_ALLOCATOR_H_
 
 #include <cstddef>
 #include <cstdint>
 #include <memory>
 #include <vector>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/size_util.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/size_util.h"
 
 namespace ruy {
 
@@ -182,4 +182,4 @@ class Allocator {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_ALLOCATOR_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_ALLOCATOR_H_

tensorflow/lite/experimental/ruy/ruy/allocator_test.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/allocator.h"
+#include "tensorflow/lite/experimental/ruy/ruy/allocator.h"
 
 #include <gtest/gtest.h>
 

tensorflow/lite/experimental/ruy/ruy/benchmark.cc

@@ -17,7 +17,7 @@ limitations under the License.
 #include <cstdlib>
 #include <string>
 
-#include "tensorflow/lite/experimental/ruy/test.h"
+#include "tensorflow/lite/experimental/ruy/ruy/test.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/block_map.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/block_map.h"
+#include "tensorflow/lite/experimental/ruy/ruy/block_map.h"
 
 #include <algorithm>
 #include <cstdint>
@@ -24,10 +24,10 @@ limitations under the License.
 #include <string>
 #endif
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
-#include "tensorflow/lite/experimental/ruy/size_util.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/size_util.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/block_map.h

@@ -13,11 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_BLOCK_MAP_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_BLOCK_MAP_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_BLOCK_MAP_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_BLOCK_MAP_H_
 
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/side_pair.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/side_pair.h"
 
 namespace ruy {
 
@@ -158,4 +158,4 @@ inline int NumBlocks(const BlockMap& block_map) {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_BLOCK_MAP_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_BLOCK_MAP_H_

tensorflow/lite/experimental/ruy/ruy/block_map_test.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/block_map.h"
+#include "tensorflow/lite/experimental/ruy/ruy/block_map.h"
 
 #include <cstddef>
 #include <cstdint>
@@ -22,9 +22,9 @@ limitations under the License.
 #include <vector>
 
 #include <gtest/gtest.h>
-#include "tensorflow/lite/experimental/ruy/cpu_cache_size.h"
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/side_pair.h"
+#include "tensorflow/lite/experimental/ruy/ruy/cpu_cache_size.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/side_pair.h"
 
 namespace ruy {
 namespace {

tensorflow/lite/experimental/ruy/ruy/blocking_counter.cc

@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/blocking_counter.h"
+#include "tensorflow/lite/experimental/ruy/ruy/blocking_counter.h"
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/wait.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/wait.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/blocking_counter.h

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_BLOCKING_COUNTER_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_BLOCKING_COUNTER_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_BLOCKING_COUNTER_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_BLOCKING_COUNTER_H_
 
 #include <atomic>
 #include <condition_variable>  // NOLINT(build/c++11) // IWYU pragma: keep
@@ -59,4 +59,4 @@ class BlockingCounter {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_BLOCKING_COUNTER_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_BLOCKING_COUNTER_H_

tensorflow/lite/experimental/ruy/ruy/check_macros.h

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_CHECK_MACROS_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_CHECK_MACROS_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CHECK_MACROS_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CHECK_MACROS_H_
 
 #include <cstdio>
 #include <cstdlib>
@@ -135,4 +135,4 @@ inline void Failure(const char* file, int line, const char* macro,
 }  // end namespace check_macros
 }  // end namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_CHECK_MACROS_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CHECK_MACROS_H_

tensorflow/lite/experimental/ruy/ruy/check_macros_test.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
 
 #include <gtest/gtest.h>
 

tensorflow/lite/experimental/ruy/ruy/common.h

@@ -15,17 +15,17 @@ limitations under the License.
 
 // Miscellaneous helpers internal library.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_COMMON_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_COMMON_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_COMMON_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_COMMON_H_
 
 #include <limits>
 #include <type_traits>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
 
 #if RUY_OPT_ENABLED(RUY_OPT_PREFETCH_LOAD)
 #define RUY_PREFETCH_LOAD(X) X
@@ -70,4 +70,4 @@ Scalar SymmetricZeroPoint() {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_COMMON_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_COMMON_H_

tensorflow/lite/experimental/ruy/ruy/context.cc

@@ -13,13 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/context.h"
+#include "tensorflow/lite/experimental/ruy/ruy/context.h"
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/detect_arm.h"
-#include "tensorflow/lite/experimental/ruy/detect_x86.h"
-#include "tensorflow/lite/experimental/ruy/have_built_path_for.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/detect_arm.h"
+#include "tensorflow/lite/experimental/ruy/ruy/detect_x86.h"
+#include "tensorflow/lite/experimental/ruy/ruy/have_built_path_for.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/context.h

@@ -13,19 +13,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_CONTEXT_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_CONTEXT_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CONTEXT_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CONTEXT_H_
 
 #include <cstddef>
 #include <memory>
 #include <vector>
 
-#include "tensorflow/lite/experimental/ruy/allocator.h"
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/prepacked_cache.h"
-#include "tensorflow/lite/experimental/ruy/thread_pool.h"
-#include "tensorflow/lite/experimental/ruy/trace.h"
-#include "tensorflow/lite/experimental/ruy/tune.h"
+#include "tensorflow/lite/experimental/ruy/ruy/allocator.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/prepacked_cache.h"
+#include "tensorflow/lite/experimental/ruy/ruy/thread_pool.h"
+#include "tensorflow/lite/experimental/ruy/ruy/trace.h"
+#include "tensorflow/lite/experimental/ruy/ruy/tune.h"
 
 namespace ruy {
 
@@ -106,4 +106,4 @@ struct Context final {
 
 }  // end namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_CONTEXT_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CONTEXT_H_

tensorflow/lite/experimental/ruy/ruy/context_test.cc

@@ -13,11 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/context.h"
+#include "tensorflow/lite/experimental/ruy/ruy/context.h"
 
 #include <gtest/gtest.h>
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
 
 namespace ruy {
 namespace {

tensorflow/lite/experimental/ruy/ruy/cpu_cache_size.h

@@ -13,11 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_CPU_CACHE_SIZE_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_CPU_CACHE_SIZE_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CPU_CACHE_SIZE_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CPU_CACHE_SIZE_H_
 
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
 
 namespace ruy {
 
@@ -78,4 +78,4 @@ inline int SharedDataCacheSize(Path path) {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_CPU_CACHE_SIZE_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CPU_CACHE_SIZE_H_

tensorflow/lite/experimental/ruy/ruy/detect_arm.cc

@@ -40,7 +40,7 @@ limitations under the License.
  * file - in actual code for (A) and in a comment for (B).
  */
 
-#include "tensorflow/lite/experimental/ruy/detect_arm.h"
+#include "tensorflow/lite/experimental/ruy/ruy/detect_arm.h"
 
 #if defined __linux__ && defined __aarch64__
 #include <sys/auxv.h>

tensorflow/lite/experimental/ruy/ruy/detect_arm.h

@@ -15,8 +15,8 @@ limitations under the License.
 
 // Temporary dotprod-detection code until we can rely on getauxval.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_DETECT_ARM_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_DETECT_ARM_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DETECT_ARM_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DETECT_ARM_H_
 
 namespace ruy {
 
@@ -26,4 +26,4 @@ bool DetectDotprod();
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_DETECT_ARM_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DETECT_ARM_H_

tensorflow/lite/experimental/ruy/ruy/detect_x86.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/detect_x86.h"
+#include "tensorflow/lite/experimental/ruy/ruy/detect_x86.h"
 
 #include <cstdint>
 

tensorflow/lite/experimental/ruy/ruy/detect_x86.h

@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_DETECT_X86_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_DETECT_X86_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DETECT_X86_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DETECT_X86_H_
 
-#include "tensorflow/lite/experimental/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
 
 namespace ruy {
 
@@ -46,4 +46,4 @@ inline bool DetectCpuAvxVnni() { return false; }
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_DETECT_X86_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DETECT_X86_H_

tensorflow/lite/experimental/ruy/ruy/dispatch.h

@@ -30,31 +30,31 @@ limitations under the License.
 //
 // This file also performs some checking of invariants to catch user errors.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_DISPATCH_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_DISPATCH_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DISPATCH_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DISPATCH_H_
 
 #include <algorithm>
 #include <cstdint>
 #include <limits>  // IWYU pragma: keep
 #include <type_traits>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/common.h"
-#include "tensorflow/lite/experimental/ruy/context.h"
-#include "tensorflow/lite/experimental/ruy/internal_matrix.h"
-#include "tensorflow/lite/experimental/ruy/kernel.h"
-#include "tensorflow/lite/experimental/ruy/kernel_common.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/pack.h"
-#include "tensorflow/lite/experimental/ruy/pack_common.h"
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
-#include "tensorflow/lite/experimental/ruy/side_pair.h"
-#include "tensorflow/lite/experimental/ruy/size_util.h"
-#include "tensorflow/lite/experimental/ruy/spec.h"
-#include "tensorflow/lite/experimental/ruy/trmul.h"
-#include "tensorflow/lite/experimental/ruy/trmul_params.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/context.h"
+#include "tensorflow/lite/experimental/ruy/ruy/internal_matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/kernel.h"
+#include "tensorflow/lite/experimental/ruy/ruy/kernel_common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/pack.h"
+#include "tensorflow/lite/experimental/ruy/ruy/pack_common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/side_pair.h"
+#include "tensorflow/lite/experimental/ruy/ruy/size_util.h"
+#include "tensorflow/lite/experimental/ruy/ruy/spec.h"
+#include "tensorflow/lite/experimental/ruy/ruy/trmul.h"
+#include "tensorflow/lite/experimental/ruy/ruy/trmul_params.h"
 
 namespace ruy {
 
@@ -479,4 +479,4 @@ void DispatchMul(const Matrix<LhsScalar>& lhs, const Matrix<RhsScalar>& rhs,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_DISPATCH_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DISPATCH_H_

tensorflow/lite/experimental/ruy/ruy/example.cc

@@ -16,7 +16,7 @@ limitations under the License.
 #include <cstdint>
 #include <iostream>
 
-#include "tensorflow/lite/experimental/ruy/ruy.h"
+#include "tensorflow/lite/experimental/ruy/ruy/ruy.h"
 
 void ExampleMulFloat(ruy::Context *context) {
   const float lhs_data[] = {1, 2, 3, 4};

tensorflow/lite/experimental/ruy/ruy/example_advanced.cc

@@ -18,7 +18,7 @@ limitations under the License.
 #include <memory>
 #include <vector>
 
-#include "tensorflow/lite/experimental/ruy/ruy_advanced.h"
+#include "tensorflow/lite/experimental/ruy/ruy/ruy_advanced.h"
 
 // Simple allocator for allocating pre-packed matrices.
 class SimpleAllocator {

tensorflow/lite/experimental/ruy/ruy/have_built_path_for.h

@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_HAVE_BUILT_PATH_FOR_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_HAVE_BUILT_PATH_FOR_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_HAVE_BUILT_PATH_FOR_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_HAVE_BUILT_PATH_FOR_H_
 
-#include "tensorflow/lite/experimental/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
 
 namespace ruy {
 
@@ -29,4 +29,4 @@ bool HaveBuiltPathForAvxVnni();
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_HAVE_BUILT_PATH_FOR_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_HAVE_BUILT_PATH_FOR_H_

tensorflow/lite/experimental/ruy/ruy/have_built_path_for_avx2.cc

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/have_built_path_for.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/have_built_path_for.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/have_built_path_for_avx512.cc

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/have_built_path_for.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/have_built_path_for.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/have_built_path_for_avxvnni.cc

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/have_built_path_for.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/have_built_path_for.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/have_built_path_for_sse42.cc

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/have_built_path_for.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/have_built_path_for.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/internal_matrix.h

@@ -87,18 +87,18 @@ limitations under the License.
 // exists is so that PMatrix is not exposed to users -- we prefer to keep the
 // internal matrix types hidden, even from "advanced" users.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_INTERNAL_MATRIX_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_INTERNAL_MATRIX_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_INTERNAL_MATRIX_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_INTERNAL_MATRIX_H_
 
 #include <cstddef>
 #include <cstdint>
 #include <type_traits>
 #include <utility>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/common.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/size_util.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/size_util.h"
 
 namespace ruy {
 
@@ -385,4 +385,4 @@ KernelLayout ToKernelLayout() {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_INTERNAL_MATRIX_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_INTERNAL_MATRIX_H_

tensorflow/lite/experimental/ruy/ruy/kernel.h

@@ -13,19 +13,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_H_
 
-#include "tensorflow/lite/experimental/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
 
 // IWYU pragma: begin_exports
 #if RUY_PLATFORM(NEON)
-#include "tensorflow/lite/experimental/ruy/kernel_arm.h"
+#include "tensorflow/lite/experimental/ruy/ruy/kernel_arm.h"
 #elif RUY_PLATFORM(X86)
-#include "tensorflow/lite/experimental/ruy/kernel_x86.h"
+#include "tensorflow/lite/experimental/ruy/ruy/kernel_x86.h"
 #else
-#include "tensorflow/lite/experimental/ruy/kernel_common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/kernel_common.h"
 #endif
 // IWYU pragma: end_exports
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_H_

tensorflow/lite/experimental/ruy/ruy/kernel_arm.h

@@ -13,24 +13,24 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_ARM_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_ARM_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_ARM_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_ARM_H_
 
 #include <cstddef>
 #include <cstdint>
 
-#include "tensorflow/lite/experimental/ruy/common.h"
-#include "tensorflow/lite/experimental/ruy/internal_matrix.h"
-#include "tensorflow/lite/experimental/ruy/kernel_common.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
-#include "tensorflow/lite/experimental/ruy/side_pair.h"
-#include "tensorflow/lite/experimental/ruy/size_util.h"
-#include "tensorflow/lite/experimental/ruy/spec.h"
-#include "tensorflow/lite/experimental/ruy/tune.h"
+#include "tensorflow/lite/experimental/ruy/ruy/common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/internal_matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/kernel_common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/side_pair.h"
+#include "tensorflow/lite/experimental/ruy/ruy/size_util.h"
+#include "tensorflow/lite/experimental/ruy/ruy/spec.h"
+#include "tensorflow/lite/experimental/ruy/ruy/tune.h"
 
 namespace ruy {
 
@@ -208,4 +208,4 @@ struct Kernel<Path::kNeonDotprod, float, float, float,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_ARM_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_ARM_H_

tensorflow/lite/experimental/ruy/ruy/kernel_arm32.cc

@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/kernel.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/kernel.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/kernel_arm64.cc

@@ -15,11 +15,11 @@ limitations under the License.
 
 #include <cstdint>
 
-#include "tensorflow/lite/experimental/ruy/common.h"
-#include "tensorflow/lite/experimental/ruy/kernel.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/kernel.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/kernel_avx2.cc

@@ -16,11 +16,11 @@ limitations under the License.
 #include <algorithm>
 #include <cstdint>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/kernel.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/kernel.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
 
 #if RUY_PLATFORM(AVX2) && RUY_OPT_ENABLED(RUY_OPT_ASM)
 #include <immintrin.h>  // IWYU pragma: keep

tensorflow/lite/experimental/ruy/ruy/kernel_avx512.cc

@@ -16,11 +16,11 @@ limitations under the License.
 #include <algorithm>
 #include <cstdint>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/kernel.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/kernel.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
 
 #if RUY_PLATFORM(AVX512) && RUY_OPT_ENABLED(RUY_OPT_ASM)
 #include <immintrin.h>  // IWYU pragma: keep

tensorflow/lite/experimental/ruy/ruy/kernel_avxvnni.cc

@@ -16,11 +16,11 @@ limitations under the License.
 #include <algorithm>
 #include <cstdint>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/kernel.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/kernel.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
 
 #if RUY_PLATFORM(AVX_VNNI) && RUY_OPT_ENABLED(RUY_OPT_ASM)
 #include <immintrin.h>  // IWYU pragma: keep

tensorflow/lite/experimental/ruy/ruy/kernel_common.h

@@ -13,25 +13,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_COMMON_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_COMMON_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_COMMON_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_COMMON_H_
 
 #include <algorithm>
 #include <cstdint>
 #include <type_traits>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/common.h"
-#include "tensorflow/lite/experimental/ruy/internal_matrix.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
-#include "tensorflow/lite/experimental/ruy/side_pair.h"
-#include "tensorflow/lite/experimental/ruy/size_util.h"
-#include "tensorflow/lite/experimental/ruy/spec.h"
-#include "tensorflow/lite/experimental/ruy/tune.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/internal_matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/side_pair.h"
+#include "tensorflow/lite/experimental/ruy/ruy/size_util.h"
+#include "tensorflow/lite/experimental/ruy/ruy/spec.h"
+#include "tensorflow/lite/experimental/ruy/ruy/tune.h"
 
 namespace ruy {
 
@@ -478,4 +478,4 @@ struct KernelParamsFloat {};
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_COMMON_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_COMMON_H_

tensorflow/lite/experimental/ruy/ruy/kernel_sse42.cc

@@ -16,11 +16,11 @@ limitations under the License.
 #include <algorithm>
 #include <cstdint>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/kernel.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/kernel.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
 
 #if RUY_PLATFORM(SSE42) && RUY_OPT_ENABLED(RUY_OPT_ASM)
 #include <immintrin.h>  // IWYU pragma: keep

tensorflow/lite/experimental/ruy/ruy/kernel_x86.h

@@ -13,20 +13,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_X86_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_X86_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_X86_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_X86_H_
 
 #include <cstdint>
 
-#include "tensorflow/lite/experimental/ruy/common.h"
-#include "tensorflow/lite/experimental/ruy/internal_matrix.h"
-#include "tensorflow/lite/experimental/ruy/kernel_common.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/spec.h"
-#include "tensorflow/lite/experimental/ruy/tune.h"
+#include "tensorflow/lite/experimental/ruy/ruy/common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/internal_matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/kernel_common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/spec.h"
+#include "tensorflow/lite/experimental/ruy/ruy/tune.h"
 
 namespace ruy {
 
@@ -219,4 +219,4 @@ struct Kernel<Path::kAvxVnni, float, float, float, BasicSpec<float, float>> {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_X86_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_X86_H_

tensorflow/lite/experimental/ruy/ruy/matrix.h

@@ -13,14 +13,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_MATRIX_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_MATRIX_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_MATRIX_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_MATRIX_H_
 
 #include <cstddef>
 #include <cstdint>  // IWYU pragma: keep
 #include <type_traits>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
 
 namespace ruy {
 
@@ -179,4 +179,4 @@ constexpr int FixedKernelLayout<tOrder, tRows, tCols>::kRows;
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_MATRIX_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_MATRIX_H_

tensorflow/lite/experimental/ruy/ruy/opt_set.h

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_OPT_SET_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_OPT_SET_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_OPT_SET_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_OPT_SET_H_
 
 // RUY_OPT_SET is a compile-time API that Ruy provides for enabling/disabling
 // certain optimizations. It should be used by defining that macro on the
@@ -48,4 +48,4 @@ limitations under the License.
 
 #define RUY_OPT_ENABLED(ruy_opt) ((RUY_OPT_SET & ruy_opt) != 0)
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_OPT_SET_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_OPT_SET_H_

tensorflow/lite/experimental/ruy/ruy/pack.h

@@ -80,19 +80,19 @@ limitations under the License.
 // column sums for quantization (and never row sums, since the LHS is
 // transposed).
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_H_
 
-#include "tensorflow/lite/experimental/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
 
 // IWYU pragma: begin_exports
 #if RUY_PLATFORM(NEON)
-#include "tensorflow/lite/experimental/ruy/pack_arm.h"
+#include "tensorflow/lite/experimental/ruy/ruy/pack_arm.h"
 #elif RUY_PLATFORM(X86)
-#include "tensorflow/lite/experimental/ruy/pack_x86.h"
+#include "tensorflow/lite/experimental/ruy/ruy/pack_x86.h"
 #else
-#include "tensorflow/lite/experimental/ruy/pack_common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/pack_common.h"
 #endif
 // IWYU pragma: end_exports
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_H_

tensorflow/lite/experimental/ruy/ruy/pack_arm.cc

@@ -14,11 +14,11 @@ limitations under the License.
 ==============================================================================*/
 #include <cstdint>
 
-#include "tensorflow/lite/experimental/ruy/common.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/pack.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/pack.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/pack_arm.h

@@ -80,22 +80,22 @@ limitations under the License.
 // column sums for quantization (and never row sums, since the LHS is
 // transposed).
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_ARM_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_ARM_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_ARM_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_ARM_H_
 
 #include <cstdint>
 #include <type_traits>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/common.h"
-#include "tensorflow/lite/experimental/ruy/internal_matrix.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/pack_common.h"
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
-#include "tensorflow/lite/experimental/ruy/tune.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/internal_matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/pack_common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/tune.h"
 
 namespace ruy {
 
@@ -494,4 +494,4 @@ struct PackImpl<Path::kNeon, FixedKernelLayout<Order::kRowMajor, 1, 4>, float,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_ARM_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_ARM_H_

tensorflow/lite/experimental/ruy/ruy/pack_avx2.cc

@@ -16,13 +16,13 @@ limitations under the License.
 #include <cstdint>
 #include <cstring>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/pack.h"
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/pack.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
 
 #if RUY_PLATFORM(AVX2) && RUY_OPT_ENABLED(RUY_OPT_INTRINSICS)
 #include <immintrin.h>  // IWYU pragma: keep

tensorflow/lite/experimental/ruy/ruy/pack_avx512.cc

@@ -16,13 +16,13 @@ limitations under the License.
 #include <cstdint>
 #include <cstring>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/pack.h"
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/pack.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
 
 #if RUY_PLATFORM(AVX512) && RUY_OPT_ENABLED(RUY_OPT_INTRINSICS)
 #include <immintrin.h>  // IWYU pragma: keep

tensorflow/lite/experimental/ruy/ruy/pack_avxvnni.cc

@@ -16,13 +16,13 @@ limitations under the License.
 #include <cstdint>
 #include <cstring>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/pack.h"
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/pack.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
 
 #if RUY_PLATFORM(AVX_VNNI) && RUY_OPT_ENABLED(RUY_OPT_INTRINSICS)
 #include <immintrin.h>  // IWYU pragma: keep

tensorflow/lite/experimental/ruy/ruy/pack_common.h

@@ -80,20 +80,20 @@ limitations under the License.
 // column sums for quantization (and never row sums, since the LHS is
 // transposed).
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_COMMON_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_COMMON_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_COMMON_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_COMMON_H_
 
 #include <cstdint>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/common.h"
-#include "tensorflow/lite/experimental/ruy/internal_matrix.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
-#include "tensorflow/lite/experimental/ruy/tune.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/internal_matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/tune.h"
 
 namespace ruy {
 
@@ -243,4 +243,4 @@ void RunPack(Tuning tuning, const DMatrix& src_matrix, PMatrix* packed_matrix,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_COMMON_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_COMMON_H_

tensorflow/lite/experimental/ruy/ruy/pack_sse42.cc

@@ -16,13 +16,13 @@ limitations under the License.
 #include <cstdint>
 #include <cstring>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/pack.h"
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/pack.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
 
 #if RUY_PLATFORM(SSE42) && RUY_OPT_ENABLED(RUY_OPT_INTRINSICS)
 #include <immintrin.h>  // IWYU pragma: keep

tensorflow/lite/experimental/ruy/ruy/pack_x86.h

@@ -80,23 +80,23 @@ limitations under the License.
 // column sums for quantization (and never row sums, since the LHS is
 // transposed).
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_X86_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_X86_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_X86_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_X86_H_
 
 #include <cstdint>
 #include <cstring>
 #include <type_traits>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/common.h"
-#include "tensorflow/lite/experimental/ruy/internal_matrix.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/pack_common.h"
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
-#include "tensorflow/lite/experimental/ruy/tune.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/internal_matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/pack_common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/tune.h"
 
 namespace ruy {
 
@@ -458,4 +458,4 @@ struct PackImpl<Path::kAvxVnni, FixedKernelLayout<Order::kRowMajor, 1, 16>,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_X86_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_X86_H_

tensorflow/lite/experimental/ruy/ruy/path.h

@@ -13,13 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PATH_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PATH_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PATH_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PATH_H_
 
 #include <cstdint>
 
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/size_util.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/size_util.h"
 
 namespace ruy {
 
@@ -159,4 +159,4 @@ constexpr Path kAllPaths = Path::kReference | Path::kStandardCpp;
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PATH_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PATH_H_

tensorflow/lite/experimental/ruy/ruy/platform.h

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PLATFORM_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PLATFORM_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PLATFORM_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PLATFORM_H_
 
 #ifdef __ANDROID_NDK__
 #include <android/ndk-version.h>
@@ -153,4 +153,4 @@ limitations under the License.
 #define RUY_DONOTUSEDIRECTLY_EMSCRIPTEN 0
 #endif
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PLATFORM_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PLATFORM_H_

tensorflow/lite/experimental/ruy/ruy/pmu.cc

@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/pmu.h"
+#include "tensorflow/lite/experimental/ruy/ruy/pmu.h"
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
 
 #ifdef __linux__
 #include <asm/unistd.h>

tensorflow/lite/experimental/ruy/ruy/pmu.h

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PMU_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PMU_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PMU_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PMU_H_
 
 namespace ruy {
 
@@ -41,4 +41,4 @@ class PmuEvents {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PMU_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PMU_H_

tensorflow/lite/experimental/ruy/ruy/prepack.h

@@ -15,24 +15,24 @@ limitations under the License.
 
 // Implementation of low-level pre-packing API.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PREPACK_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PREPACK_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PREPACK_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PREPACK_H_
 
 #include <cstddef>
 #include <functional>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/context.h"
-#include "tensorflow/lite/experimental/ruy/dispatch.h"
-#include "tensorflow/lite/experimental/ruy/internal_matrix.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
-#include "tensorflow/lite/experimental/ruy/side_pair.h"
-#include "tensorflow/lite/experimental/ruy/spec.h"
-#include "tensorflow/lite/experimental/ruy/trmul.h"
-#include "tensorflow/lite/experimental/ruy/trmul_params.h"
-#include "tensorflow/lite/experimental/ruy/tune.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/context.h"
+#include "tensorflow/lite/experimental/ruy/ruy/dispatch.h"
+#include "tensorflow/lite/experimental/ruy/ruy/internal_matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/side_pair.h"
+#include "tensorflow/lite/experimental/ruy/ruy/spec.h"
+#include "tensorflow/lite/experimental/ruy/ruy/trmul.h"
+#include "tensorflow/lite/experimental/ruy/ruy/trmul_params.h"
+#include "tensorflow/lite/experimental/ruy/ruy/tune.h"
 
 namespace ruy {
 
@@ -105,4 +105,4 @@ void MulWithPrepackedInternal(const Matrix<LhsScalar>& lhs,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PREPACK_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PREPACK_H_

tensorflow/lite/experimental/ruy/ruy/prepacked_cache.cc

@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/prepacked_cache.h"
+#include "tensorflow/lite/experimental/ruy/ruy/prepacked_cache.h"
 
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/prepacked_cache.h

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PREPACKED_CACHE_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PREPACKED_CACHE_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PREPACKED_CACHE_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PREPACKED_CACHE_H_
 
 #include <cstddef>
 #include <iostream>
@@ -22,9 +22,9 @@ limitations under the License.
 #include <queue>
 #include <vector>
 
-#include "tensorflow/lite/experimental/ruy/allocator.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/time.h"
+#include "tensorflow/lite/experimental/ruy/ruy/allocator.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/time.h"
 
 namespace ruy {
 
@@ -127,4 +127,4 @@ class PrepackedCache {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PREPACKED_CACHE_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PREPACKED_CACHE_H_

tensorflow/lite/experimental/ruy/ruy/prepacked_cache_test.cc

@@ -13,13 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/prepacked_cache.h"
+#include "tensorflow/lite/experimental/ruy/ruy/prepacked_cache.h"
 
 #include <thread>  // NOLINT(build/c++11)
 
 #include <gtest/gtest.h>
-#include "tensorflow/lite/experimental/ruy/ruy.h"
-#include "tensorflow/lite/experimental/ruy/time.h"
+#include "tensorflow/lite/experimental/ruy/ruy/ruy.h"
+#include "tensorflow/lite/experimental/ruy/ruy/time.h"
 
 namespace ruy {
 namespace {

tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
 
 #ifdef RUY_PROFILER
 

tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_INSTRUMENTATION_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_INSTRUMENTATION_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_INSTRUMENTATION_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_INSTRUMENTATION_H_
 
 #ifdef RUY_PROFILER
 #include <cstdio>
@@ -200,4 +200,4 @@ class ScopeLabel {
 }  // namespace profiler
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_INSTRUMENTATION_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_INSTRUMENTATION_H_

tensorflow/lite/experimental/ruy/ruy/profiler/profiler.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/profiler/profiler.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/profiler.h"
 
 #ifdef RUY_PROFILER
 #include <atomic>
@@ -24,8 +24,8 @@ limitations under the License.
 #include <vector>
 #endif
 
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
-#include "tensorflow/lite/experimental/ruy/profiler/treeview.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/treeview.h"
 
 namespace ruy {
 namespace profiler {

tensorflow/lite/experimental/ruy/ruy/profiler/profiler.h

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_PROFILER_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_PROFILER_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_PROFILER_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_PROFILER_H_
 
 #include <cstdio>
 
@@ -25,8 +25,8 @@ limitations under the License.
 #include <vector>
 #endif
 
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
-#include "tensorflow/lite/experimental/ruy/profiler/treeview.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/treeview.h"
 
 namespace ruy {
 namespace profiler {
@@ -103,4 +103,4 @@ struct ScopeProfile {
 }  // namespace profiler
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_PROFILER_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_PROFILER_H_

tensorflow/lite/experimental/ruy/ruy/profiler/test.cc

@@ -18,9 +18,9 @@ limitations under the License.
 #include <thread>
 
 #include <gtest/gtest.h>
-#include "tensorflow/lite/experimental/ruy/profiler/profiler.h"
-#include "tensorflow/lite/experimental/ruy/profiler/test_instrumented_library.h"
-#include "tensorflow/lite/experimental/ruy/profiler/treeview.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/profiler.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/test_instrumented_library.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/treeview.h"
 
 namespace ruy {
 namespace profiler {

tensorflow/lite/experimental/ruy/ruy/profiler/test_instrumented_library.cc

@@ -15,7 +15,7 @@ limitations under the License.
 
 #include <vector>
 
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
 
 namespace {
 

tensorflow/lite/experimental/ruy/ruy/profiler/test_instrumented_library.h

@@ -13,11 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_TEST_INSTRUMENTED_LIBRARY_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_TEST_INSTRUMENTED_LIBRARY_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_TEST_INSTRUMENTED_LIBRARY_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_TEST_INSTRUMENTED_LIBRARY_H_
 
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
 
 void MergeSort(int size, int* data);
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_TEST_INSTRUMENTED_LIBRARY_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_TEST_INSTRUMENTED_LIBRARY_H_

tensorflow/lite/experimental/ruy/ruy/profiler/treeview.cc

@@ -15,7 +15,7 @@ limitations under the License.
 
 #ifdef RUY_PROFILER
 
-#include "tensorflow/lite/experimental/ruy/profiler/treeview.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/treeview.h"
 
 #include <algorithm>
 #include <cstdio>

tensorflow/lite/experimental/ruy/ruy/profiler/treeview.h

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_TREEVIEW_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_TREEVIEW_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_TREEVIEW_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_TREEVIEW_H_
 
 #ifdef RUY_PROFILER
 
@@ -23,7 +23,7 @@ limitations under the License.
 #include <memory>
 #include <vector>
 
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
 
 namespace ruy {
 namespace profiler {
@@ -127,4 +127,4 @@ void CollapseNodesMatchingFormatted(const TreeView& treeview_in, int depth,
 
 #endif  // RUY_PROFILER
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_TREEVIEW_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_TREEVIEW_H_

tensorflow/lite/experimental/ruy/ruy/ruy.h

@@ -15,14 +15,14 @@ limitations under the License.
 
 // This is the only Ruy header that users should #include.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_RUY_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_RUY_H_
 
-#include "tensorflow/lite/experimental/ruy/context.h"
-#include "tensorflow/lite/experimental/ruy/dispatch.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/spec.h"
+#include "tensorflow/lite/experimental/ruy/ruy/context.h"
+#include "tensorflow/lite/experimental/ruy/ruy/dispatch.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/spec.h"
 
 namespace ruy {
 
@@ -39,4 +39,4 @@ void Mul(const Matrix<LhsScalar>& lhs, const Matrix<RhsScalar>& rhs,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_RUY_H_

tensorflow/lite/experimental/ruy/ruy/ruy_advanced.h

@@ -13,17 +13,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_ADVANCED_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_ADVANCED_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_RUY_ADVANCED_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_RUY_ADVANCED_H_
 
 #include <cstddef>
 #include <functional>
 
-#include "tensorflow/lite/experimental/ruy/context.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/path.h"
-#include "tensorflow/lite/experimental/ruy/prepack.h"
-#include "tensorflow/lite/experimental/ruy/side_pair.h"
+#include "tensorflow/lite/experimental/ruy/ruy/context.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/path.h"
+#include "tensorflow/lite/experimental/ruy/ruy/prepack.h"
+#include "tensorflow/lite/experimental/ruy/ruy/side_pair.h"
 
 namespace ruy {
 
@@ -66,4 +66,4 @@ void MulWithPrepacked(const Matrix<LhsScalar>& lhs,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_ADVANCED_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_RUY_ADVANCED_H_

tensorflow/lite/experimental/ruy/ruy/side_pair.h

@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_SIDE_PAIR_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_SIDE_PAIR_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SIDE_PAIR_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SIDE_PAIR_H_
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
 
 namespace ruy {
 
@@ -61,4 +61,4 @@ class SidePair final {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_SIDE_PAIR_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SIDE_PAIR_H_

tensorflow/lite/experimental/ruy/ruy/size_util.h

@@ -13,12 +13,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_SIZE_UTIL_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_SIZE_UTIL_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SIZE_UTIL_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SIZE_UTIL_H_
 
 #include <type_traits>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
 
 #ifdef _WIN32
 #include <intrin.h>
@@ -90,4 +90,4 @@ Integer round_up_pot(Integer value, Modulo modulo) {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_SIZE_UTIL_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SIZE_UTIL_H_

tensorflow/lite/experimental/ruy/ruy/size_util_test.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/size_util.h"
+#include "tensorflow/lite/experimental/ruy/ruy/size_util.h"
 
 #include <cstddef>
 #include <cstdint>

tensorflow/lite/experimental/ruy/ruy/spec.h

@@ -13,14 +13,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_SPEC_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_SPEC_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SPEC_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SPEC_H_
 
 #include <limits>
 #include <type_traits>
 
-#include "tensorflow/lite/experimental/ruy/cpu_cache_size.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/cpu_cache_size.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
 
 namespace ruy {
 
@@ -115,4 +115,4 @@ struct BasicSpec {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_SPEC_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SPEC_H_

tensorflow/lite/experimental/ruy/ruy/test.h

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_TEST_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_TEST_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TEST_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TEST_H_
 
 #include <math.h>
 
@@ -37,13 +37,13 @@ limitations under the License.
 #include <vector>
 
 #include <gtest/gtest.h>  // IWYU pragma: export
-#include "tensorflow/lite/experimental/ruy/matrix.h"  // IWYU pragma: export
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/pmu.h"
-#include "tensorflow/lite/experimental/ruy/ruy.h"
-#include "tensorflow/lite/experimental/ruy/ruy_advanced.h"
-#include "tensorflow/lite/experimental/ruy/spec.h"  // IWYU pragma: export
-#include "tensorflow/lite/experimental/ruy/time.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"  // IWYU pragma: export
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/pmu.h"
+#include "tensorflow/lite/experimental/ruy/ruy/ruy.h"
+#include "tensorflow/lite/experimental/ruy/ruy/ruy_advanced.h"
+#include "tensorflow/lite/experimental/ruy/ruy/spec.h"  // IWYU pragma: export
+#include "tensorflow/lite/experimental/ruy/ruy/time.h"
 
 #ifdef RUY_TEST_EXTERNAL_PATHS
 #define EIGEN_USE_THREADS
@@ -55,7 +55,7 @@ limitations under the License.
 #endif
 
 #ifdef RUY_PROFILER
-#include "tensorflow/lite/experimental/ruy/profiler/profiler.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/profiler.h"
 #endif
 
 namespace ruy {
@@ -2122,4 +2122,4 @@ void TestLinearAllOrders(int rows, int depth, int cols) {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_TEST_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TEST_H_

tensorflow/lite/experimental/ruy/ruy/test_fast.cc

@@ -17,7 +17,7 @@ limitations under the License.
 
 #include <vector>
 
-#include "tensorflow/lite/experimental/ruy/test.h"
+#include "tensorflow/lite/experimental/ruy/ruy/test.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/test_slow.cc

@@ -15,7 +15,7 @@ limitations under the License.
 
 // This test contains more expensive test cases.
 
-#include "tensorflow/lite/experimental/ruy/test.h"
+#include "tensorflow/lite/experimental/ruy/ruy/test.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/test_special_specs.cc

@@ -15,7 +15,7 @@ limitations under the License.
 
 // This test covers non-basic specs.
 
-#include "tensorflow/lite/experimental/ruy/test.h"
+#include "tensorflow/lite/experimental/ruy/ruy/test.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/thread_pool.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/thread_pool.h"
+#include "tensorflow/lite/experimental/ruy/ruy/thread_pool.h"
 
 #include <atomic>
 #include <chrono>              // NOLINT(build/c++11)
@@ -24,8 +24,8 @@ limitations under the License.
 #include <mutex>               // NOLINT(build/c++11)
 #include <thread>              // NOLINT(build/c++11)
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/wait.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/wait.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/thread_pool.h

@@ -16,12 +16,12 @@ limitations under the License.
 // This file is a fork of gemmlowp's multi_thread_gemm.h, under Apache 2.0
 // license.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_THREAD_POOL_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_THREAD_POOL_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_THREAD_POOL_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_THREAD_POOL_H_
 
 #include <vector>
 
-#include "tensorflow/lite/experimental/ruy/blocking_counter.h"
+#include "tensorflow/lite/experimental/ruy/ruy/blocking_counter.h"
 
 namespace ruy {
 
@@ -99,4 +99,4 @@ class ThreadPool {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_THREAD_POOL_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_THREAD_POOL_H_

tensorflow/lite/experimental/ruy/ruy/time.h

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_TIME_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_TIME_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TIME_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TIME_H_
 
 #include <chrono>  // NOLINT(build/c++11)
 #include <cstdint>  // IWYU pragma: keep
@@ -78,4 +78,4 @@ inline TimePoint CoarseNow() {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_TIME_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TIME_H_

tensorflow/lite/experimental/ruy/ruy/trace.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/trace.h"
+#include "tensorflow/lite/experimental/ruy/ruy/trace.h"
 
 #include <algorithm>
 #include <cerrno>  // IWYU pragma: keep
@@ -22,9 +22,9 @@ limitations under the License.
 #include <string>
 #include <vector>
 
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/side_pair.h"
-#include "tensorflow/lite/experimental/ruy/time.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/side_pair.h"
+#include "tensorflow/lite/experimental/ruy/ruy/time.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/trace.h

@@ -13,13 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRACE_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRACE_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRACE_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRACE_H_
 
 #include <cstdint>
 
-#include "tensorflow/lite/experimental/ruy/block_map.h"
-#include "tensorflow/lite/experimental/ruy/side_pair.h"
+#include "tensorflow/lite/experimental/ruy/ruy/block_map.h"
+#include "tensorflow/lite/experimental/ruy/ruy/side_pair.h"
 
 namespace ruy {
 
@@ -70,4 +70,4 @@ inline void TraceRecordEnd(Trace*) {}
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRACE_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRACE_H_

tensorflow/lite/experimental/ruy/ruy/trmul.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/trmul.h"
+#include "tensorflow/lite/experimental/ruy/ruy/trmul.h"
 
 #include <atomic>
 #include <cstdint>
@@ -21,20 +21,20 @@ limitations under the License.
 #include <memory>
 #include <vector>
 
-#include "tensorflow/lite/experimental/ruy/allocator.h"
-#include "tensorflow/lite/experimental/ruy/block_map.h"
-#include "tensorflow/lite/experimental/ruy/check_macros.h"
-#include "tensorflow/lite/experimental/ruy/common.h"
-#include "tensorflow/lite/experimental/ruy/internal_matrix.h"
-#include "tensorflow/lite/experimental/ruy/matrix.h"
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/profiler/instrumentation.h"
-#include "tensorflow/lite/experimental/ruy/side_pair.h"
-#include "tensorflow/lite/experimental/ruy/size_util.h"
-#include "tensorflow/lite/experimental/ruy/spec.h"
-#include "tensorflow/lite/experimental/ruy/thread_pool.h"
-#include "tensorflow/lite/experimental/ruy/trace.h"
-#include "tensorflow/lite/experimental/ruy/tune.h"
+#include "tensorflow/lite/experimental/ruy/ruy/allocator.h"
+#include "tensorflow/lite/experimental/ruy/ruy/block_map.h"
+#include "tensorflow/lite/experimental/ruy/ruy/check_macros.h"
+#include "tensorflow/lite/experimental/ruy/ruy/common.h"
+#include "tensorflow/lite/experimental/ruy/ruy/internal_matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/profiler/instrumentation.h"
+#include "tensorflow/lite/experimental/ruy/ruy/side_pair.h"
+#include "tensorflow/lite/experimental/ruy/ruy/size_util.h"
+#include "tensorflow/lite/experimental/ruy/ruy/spec.h"
+#include "tensorflow/lite/experimental/ruy/ruy/thread_pool.h"
+#include "tensorflow/lite/experimental/ruy/ruy/trace.h"
+#include "tensorflow/lite/experimental/ruy/ruy/tune.h"
 
 namespace ruy {
 

tensorflow/lite/experimental/ruy/ruy/trmul.h

@@ -23,11 +23,11 @@ limitations under the License.
 // That is why TrMul is nicer to implement, allowing for a more symmetric
 // treatment of LHS and RHS.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRMUL_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRMUL_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRMUL_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRMUL_H_
 
-#include "tensorflow/lite/experimental/ruy/context.h"
-#include "tensorflow/lite/experimental/ruy/trmul_params.h"
+#include "tensorflow/lite/experimental/ruy/ruy/context.h"
+#include "tensorflow/lite/experimental/ruy/ruy/trmul_params.h"
 
 namespace ruy {
 
@@ -35,4 +35,4 @@ void TrMul(TrMulParams* params, Context* context);
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRMUL_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRMUL_H_

tensorflow/lite/experimental/ruy/ruy/trmul_params.h

@@ -13,12 +13,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRMUL_PARAMS_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRMUL_PARAMS_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRMUL_PARAMS_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRMUL_PARAMS_H_
 
-#include "tensorflow/lite/experimental/ruy/internal_matrix.h"
-#include "tensorflow/lite/experimental/ruy/side_pair.h"
-#include "tensorflow/lite/experimental/ruy/tune.h"
+#include "tensorflow/lite/experimental/ruy/ruy/internal_matrix.h"
+#include "tensorflow/lite/experimental/ruy/ruy/side_pair.h"
+#include "tensorflow/lite/experimental/ruy/ruy/tune.h"
 
 namespace ruy {
 
@@ -64,4 +64,4 @@ struct TrMulParams {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRMUL_PARAMS_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRMUL_PARAMS_H_

tensorflow/lite/experimental/ruy/ruy/tune.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/tune.h"
+#include "tensorflow/lite/experimental/ruy/ruy/tune.h"
 
 #include <algorithm>
 #include <cstdint>

tensorflow/lite/experimental/ruy/ruy/tune.h

@@ -69,12 +69,12 @@ limitations under the License.
 //    nano-benchmark.
 //  * Maybe using getcpu in conjunction with the nano-benchmark to cache
 //    per-CPU-id nano-benchmark results.
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_TUNE_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_TUNE_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TUNE_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TUNE_H_
 
-#include "tensorflow/lite/experimental/ruy/opt_set.h"
-#include "tensorflow/lite/experimental/ruy/platform.h"
-#include "tensorflow/lite/experimental/ruy/time.h"
+#include "tensorflow/lite/experimental/ruy/ruy/opt_set.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/time.h"
 
 // Tuning only implemented on NEON_64 at the moment (see assembly code
 // in the nano-benchmark) and not on Apple (some Apple CPUs produce incorrect
@@ -160,4 +160,4 @@ class TuningResolver {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_TUNE_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TUNE_H_

tensorflow/lite/experimental/ruy/ruy/tune_test.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/tune.h"
+#include "tensorflow/lite/experimental/ruy/ruy/tune.h"
 
 #include <chrono>  // NOLINT(build/c++11)
 #include <thread>  // NOLINT(build/c++11)

tensorflow/lite/experimental/ruy/ruy/tune_tool.cc

@@ -20,7 +20,7 @@ limitations under the License.
 #include <cstdio>
 #include <thread>  // NOLINT(build/c++11)
 
-#include "tensorflow/lite/experimental/ruy/tune.h"
+#include "tensorflow/lite/experimental/ruy/ruy/tune.h"
 
 #ifdef _WIN32
 #define getpid() 0

tensorflow/lite/experimental/ruy/ruy/wait.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/wait.h"
+#include "tensorflow/lite/experimental/ruy/ruy/wait.h"
 
 #include <chrono>  // NOLINT(build/c++11)
 

tensorflow/lite/experimental/ruy/ruy/wait.h

@@ -13,14 +13,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_WAIT_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_WAIT_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_WAIT_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_WAIT_H_
 
 #include <condition_variable>  // NOLINT(build/c++11)
 #include <functional>
 #include <mutex>  //  NOLINT(build/c++11)
 
-#include "tensorflow/lite/experimental/ruy/time.h"
+#include "tensorflow/lite/experimental/ruy/ruy/time.h"
 
 namespace ruy {
 
@@ -70,4 +70,4 @@ void Wait(const std::function<bool()>& condition,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_WAIT_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_WAIT_H_

tensorflow/lite/experimental/ruy/ruy/wait_test.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/ruy/wait.h"
+#include "tensorflow/lite/experimental/ruy/ruy/wait.h"
 
 #include <atomic>
 #include <condition_variable>  // NOLINT(build/c++11)
@@ -21,7 +21,7 @@ limitations under the License.
 #include <thread>              // NOLINT(build/c++11)
 
 #include <gtest/gtest.h>
-#include "tensorflow/lite/experimental/ruy/platform.h"
+#include "tensorflow/lite/experimental/ruy/ruy/platform.h"
 
 namespace ruy {
 namespace {

tensorflow/lite/kernels/BUILD

@@ -274,7 +274,7 @@ cc_library(
         # For now this unconditionally depends on both ruy and gemmlowp.
         # See the comment inside class CpuBackendContext on the
         # gemmlowp_context_ and ruy_context_ members.
-        "//tensorflow/lite/experimental/ruy:context",
+        "//tensorflow/lite/experimental/ruy/ruy:context",
         "@gemmlowp",
         "//tensorflow/lite:external_cpu_backend_context",
     ],
@@ -295,8 +295,8 @@ cc_library(
         # We only need to depend on gemmlowp when tflite_with_ruy
         # is false, but putting these dependencies in a select() seems to
         # defeat copybara's rewriting rules.
-        "//tensorflow/lite/experimental/ruy:context",
-        "//tensorflow/lite/experimental/ruy:thread_pool",
+        "//tensorflow/lite/experimental/ruy/ruy:context",
+        "//tensorflow/lite/experimental/ruy/ruy:thread_pool",
         "@gemmlowp",
     ],
 )
@@ -334,9 +334,9 @@ cc_library(
         ":cpu_backend_threadpool",
         # Depend on ruy regardless of `tflite_with_ruy`. See the comment in
         # cpu_backend_gemm.h about why ruy is the generic path.
-        "//tensorflow/lite/experimental/ruy",
-        "//tensorflow/lite/experimental/ruy:path",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy",
+        "//tensorflow/lite/experimental/ruy/ruy:path",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
         # We only need to depend on gemmlowp and Eigen when tflite_with_ruy
         # is false, but putting these dependencies in a select() seems to
         # defeat copybara's rewriting rules.
@@ -355,7 +355,7 @@ cc_test(
         "@com_google_googletest//:gtest",
         # ruy's reference path provides the reference implementation
         # that this test compares against.
-        "//tensorflow/lite/experimental/ruy",
+        "//tensorflow/lite/experimental/ruy/ruy",
     ],
 )
 
@@ -596,7 +596,7 @@ cc_library(
         "//tensorflow/lite:context",
         "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/kernels:hashtable_op_kernels",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
         "//tensorflow/lite/kernels/internal:kernel_utils",
         "//tensorflow/lite/kernels/internal:tensor",
         "//third_party/fft2d:fft2d_headers",
@@ -613,7 +613,7 @@ cc_library(
         ":cpu_backend_context",
         ":op_macros",
         "//tensorflow/lite/c:common",
-        "//tensorflow/lite/experimental/ruy/profiler:instrumentation",
+        "//tensorflow/lite/experimental/ruy/ruy/profiler:instrumentation",
         "//tensorflow/lite/kernels/internal:common",
         "//tensorflow/lite/kernels/internal:compatibility",
         "//tensorflow/lite/kernels/internal:kernel_utils",