Moving iree/base/file_io.h to iree/base/internal/. There's some goo here for internal support that I forget if is still used.
diff --git a/iree/base/BUILD b/iree/base/BUILD index d9381d6..bcfdac4 100644 --- a/iree/base/BUILD +++ b/iree/base/BUILD
@@ -107,42 +107,6 @@ ) cc_library( - name = "file_io", - hdrs = ["file_io.h"], - deps = [ - ":core_headers", - ":status", - "//iree/base/internal:file_io_internal", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:span", - ], -) - -cc_library( - name = "file_io_hdrs", - hdrs = ["file_io.h"], - deps = [ - ":status", - "@com_google_absl//absl/strings", - ], -) - -cc_test( - name = "file_io_test", - srcs = ["file_io_test.cc"], - deps = [ - ":file_io", - ":file_path", - ":logging", - ":status", - "//iree/testing:gtest", - "//iree/testing:gtest_main", - "@com_google_absl//absl/strings", - ], -) - -cc_library( name = "file_path", srcs = ["file_path.cc"], hdrs = ["file_path.h"],
diff --git a/iree/base/CMakeLists.txt b/iree/base/CMakeLists.txt index 10bb99a..afd8554 100644 --- a/iree/base/CMakeLists.txt +++ b/iree/base/CMakeLists.txt
@@ -85,47 +85,6 @@ iree_cc_library( NAME - file_io - HDRS - "file_io.h" - DEPS - ::core_headers - ::status - absl::memory - absl::span - absl::strings - iree::base::internal::file_io_internal - PUBLIC -) - -iree_cc_library( - NAME - file_io_hdrs - HDRS - "file_io.h" - DEPS - ::status - absl::strings - PUBLIC -) - -iree_cc_test( - NAME - file_io_test - SRCS - "file_io_test.cc" - DEPS - ::file_io - ::file_path - ::logging - ::status - absl::strings - iree::testing::gtest - iree::testing::gtest_main -) - -iree_cc_library( - NAME file_path HDRS "file_path.h"
diff --git a/iree/base/internal/BUILD b/iree/base/internal/BUILD index 648c192..060d25a 100644 --- a/iree/base/internal/BUILD +++ b/iree/base/internal/BUILD
@@ -65,6 +65,42 @@ ) cc_library( + name = "file_io", + hdrs = ["file_io.h"], + deps = [ + "//iree/base:core_headers", + "//iree/base:status", + "//iree/base/internal:file_io_internal", + "@com_google_absl//absl/memory", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/types:span", + ], +) + +cc_library( + name = "file_io_hdrs", + hdrs = ["file_io.h"], + deps = [ + "//iree/base:status", + "@com_google_absl//absl/strings", + ], +) + +cc_test( + name = "file_io_test", + srcs = ["file_io_test.cc"], + deps = [ + ":file_io", + "/iree/base:file_path", + "/iree/base:logging", + "/iree/base:status", + "//iree/testing:gtest", + "//iree/testing:gtest_main", + "@com_google_absl//absl/strings", + ], +) + +cc_library( name = "file_io_internal", srcs = [ "file_io_posix.cc", @@ -72,8 +108,8 @@ ], deps = [ ":file_handle_win32", + ":file_io_hdrs", "//iree/base:core_headers", - "//iree/base:file_io_hdrs", "//iree/base:file_path", "//iree/base:status", "//iree/base:tracing",
diff --git a/iree/base/internal/CMakeLists.txt b/iree/base/internal/CMakeLists.txt index 2739683..baaea72 100644 --- a/iree/base/internal/CMakeLists.txt +++ b/iree/base/internal/CMakeLists.txt
@@ -67,16 +67,57 @@ iree_cc_library( NAME + file_io + HDRS + "file_io.h" + DEPS + absl::memory + absl::span + absl::strings + iree::base::core_headers + iree::base::internal::file_io_internal + iree::base::status + PUBLIC +) + +iree_cc_library( + NAME + file_io_hdrs + HDRS + "file_io.h" + DEPS + absl::strings + iree::base::status + PUBLIC +) + +iree_cc_test( + NAME + file_io_test + SRCS + "file_io_test.cc" + DEPS + ::file_io + absl::strings + iree::base::file_path + iree::base::logging + iree::base::status + iree::testing::gtest + iree::testing::gtest_main +) + +iree_cc_library( + NAME file_io_internal SRCS "file_io_posix.cc" "file_io_win32.cc" DEPS ::file_handle_win32 + ::file_io_hdrs absl::memory absl::strings iree::base::core_headers - iree::base::file_io_hdrs iree::base::file_path iree::base::status iree::base::tracing
diff --git a/iree/base/file_io.h b/iree/base/internal/file_io.h similarity index 94% rename from iree/base/file_io.h rename to iree/base/internal/file_io.h index fd32b4e..0a62e2e 100644 --- a/iree/base/file_io.h +++ b/iree/base/internal/file_io.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef IREE_BASE_FILE_IO_H_ -#define IREE_BASE_FILE_IO_H_ +#ifndef IREE_BASE_INTERNAL_FILE_IO_H_ +#define IREE_BASE_INTERNAL_FILE_IO_H_ #include <string> @@ -58,4 +58,4 @@ } // namespace file_io } // namespace iree -#endif // IREE_BASE_FILE_IO_H_ +#endif // IREE_BASE_INTERNAL_FILE_IO_H_
diff --git a/iree/base/internal/file_io_posix.cc b/iree/base/internal/file_io_posix.cc index a95cddc..eecb11b 100644 --- a/iree/base/internal/file_io_posix.cc +++ b/iree/base/internal/file_io_posix.cc
@@ -25,8 +25,8 @@ #include <cstdlib> #include "absl/strings/str_cat.h" -#include "iree/base/file_io.h" #include "iree/base/file_path.h" +#include "iree/base/internal/file_io.h" #include "iree/base/status.h" #include "iree/base/tracing.h"
diff --git a/iree/base/file_io_test.cc b/iree/base/internal/file_io_test.cc similarity index 98% rename from iree/base/file_io_test.cc rename to iree/base/internal/file_io_test.cc index f40e2db..89d524a 100644 --- a/iree/base/file_io_test.cc +++ b/iree/base/internal/file_io_test.cc
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "iree/base/file_io.h" +#include "iree/base/internal/file_io.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h"
diff --git a/iree/base/internal/file_io_win32.cc b/iree/base/internal/file_io_win32.cc index 7b18c34..10ee58d 100644 --- a/iree/base/internal/file_io_win32.cc +++ b/iree/base/internal/file_io_win32.cc
@@ -22,9 +22,9 @@ #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" -#include "iree/base/file_io.h" #include "iree/base/file_path.h" #include "iree/base/internal/file_handle_win32.h" +#include "iree/base/internal/file_io.h" #include "iree/base/target_platform.h" #include "iree/base/tracing.h"
diff --git a/iree/base/testing/BUILD b/iree/base/testing/BUILD index 43b4afe..9a897f1 100644 --- a/iree/base/testing/BUILD +++ b/iree/base/testing/BUILD
@@ -44,8 +44,8 @@ ":dynamic_library_test_library", "//iree/base:core_headers", "//iree/base:dynamic_library", - "//iree/base:file_io", "//iree/base:status", + "//iree/base/internal:file_io", "//iree/testing:gtest", "//iree/testing:gtest_main", ],
diff --git a/iree/base/testing/CMakeLists.txt b/iree/base/testing/CMakeLists.txt index ba88fe8..8c5cab4 100644 --- a/iree/base/testing/CMakeLists.txt +++ b/iree/base/testing/CMakeLists.txt
@@ -53,7 +53,7 @@ ::dynamic_library_test_library iree::base::core_headers iree::base::dynamic_library - iree::base::file_io + iree::base::internal::file_io iree::base::status iree::testing::gtest iree::testing::gtest_main
diff --git a/iree/base/testing/dynamic_library_test.cc b/iree/base/testing/dynamic_library_test.cc index 406a3c5..de8fc7b 100644 --- a/iree/base/testing/dynamic_library_test.cc +++ b/iree/base/testing/dynamic_library_test.cc
@@ -16,7 +16,7 @@ #include <string> -#include "iree/base/file_io.h" +#include "iree/base/internal/file_io.h" #include "iree/base/status.h" #include "iree/base/target_platform.h" #include "iree/base/testing/dynamic_library_test_library_embed.h"
diff --git a/iree/hal/local/loaders/BUILD b/iree/hal/local/loaders/BUILD index efbd44d..bbd8095 100644 --- a/iree/hal/local/loaders/BUILD +++ b/iree/hal/local/loaders/BUILD
@@ -33,10 +33,11 @@ deps = [ "//iree/base:api", "//iree/base:dynamic_library", - "//iree/base:file_io", "//iree/base:file_path", "//iree/base:flatcc", "//iree/base:tracing", + "//iree/base/internal:file_io", + "//iree/base:tracing", "//iree/hal:api", "//iree/hal/local", "//iree/schemas:dylib_executable_def_c_fbs", @@ -52,9 +53,9 @@ ], deps = [ "//iree/base:api", - "//iree/base:file_io", "//iree/base:flatcc", "//iree/base:tracing", + "//iree/base/internal:file_io", "//iree/hal:api", "//iree/hal/local", ],
diff --git a/iree/hal/local/loaders/CMakeLists.txt b/iree/hal/local/loaders/CMakeLists.txt index 65bf612..1dde535 100644 --- a/iree/hal/local/loaders/CMakeLists.txt +++ b/iree/hal/local/loaders/CMakeLists.txt
@@ -24,9 +24,9 @@ DEPS iree::base::api iree::base::dynamic_library - iree::base::file_io iree::base::file_path iree::base::flatcc + iree::base::internal::file_io iree::base::tracing iree::hal::api iree::hal::local @@ -45,8 +45,8 @@ "system_library_loader.c" DEPS iree::base::api - iree::base::file_io iree::base::flatcc + iree::base::internal::file_io iree::base::tracing iree::hal::api iree::hal::local
diff --git a/iree/hal/local/loaders/legacy_library_loader.cc b/iree/hal/local/loaders/legacy_library_loader.cc index 1ff963b..cf5e4b6 100644 --- a/iree/hal/local/loaders/legacy_library_loader.cc +++ b/iree/hal/local/loaders/legacy_library_loader.cc
@@ -15,8 +15,8 @@ #include "iree/hal/local/loaders/legacy_library_loader.h" #include "iree/base/dynamic_library.h" -#include "iree/base/file_io.h" #include "iree/base/file_path.h" +#include "iree/base/internal/file_io.h" #include "iree/base/tracing.h" #include "iree/hal/local/local_executable.h"
diff --git a/iree/testing/vulkan/CMakeLists.txt b/iree/testing/vulkan/CMakeLists.txt index 9eb6712..9d4be3e 100644 --- a/iree/testing/vulkan/CMakeLists.txt +++ b/iree/testing/vulkan/CMakeLists.txt
@@ -64,8 +64,8 @@ DEPS ::vulkan_gui_util absl::flags - iree::base::file_io iree::base::flags + iree::base::internal::file_io iree::base::internal::main iree::base::status iree::base::tracing
diff --git a/iree/testing/vulkan/iree-run-module-vulkan-gui-main.cc b/iree/testing/vulkan/iree-run-module-vulkan-gui-main.cc index 09c6bc2..46d5e07 100644 --- a/iree/testing/vulkan/iree-run-module-vulkan-gui-main.cc +++ b/iree/testing/vulkan/iree-run-module-vulkan-gui-main.cc
@@ -19,8 +19,8 @@ // Other dependencies (helpers, etc.) #include "absl/flags/flag.h" -#include "iree/base/file_io.h" #include "iree/base/flags.h" +#include "iree/base/internal/file_io.h" #include "iree/base/internal/main.h" #include "iree/base/status.h" #include "iree/hal/vulkan/registration/driver_module.h"
diff --git a/iree/tools/BUILD b/iree/tools/BUILD index 2ada8c0..40fae17 100644 --- a/iree/tools/BUILD +++ b/iree/tools/BUILD
@@ -30,10 +30,10 @@ testonly = True, srcs = ["iree-benchmark-module-main.cc"], deps = [ - "//iree/base:file_io", "//iree/base:flags", "//iree/base:status", "//iree/base:tracing", + "//iree/base/internal:file_io", "//iree/hal/drivers", "//iree/modules/hal", "//iree/tools/utils:vm_util", @@ -54,10 +54,10 @@ deps = [ "//iree/base:api", "//iree/base:core_headers", - "//iree/base:file_io", "//iree/base:flags", "//iree/base:status", "//iree/base:tracing", + "//iree/base/internal:file_io", "//iree/hal/drivers", "//iree/modules/check:native_module", "//iree/modules/hal", @@ -73,7 +73,7 @@ name = "iree-dump-module", srcs = ["iree-dump-module-main.cc"], deps = [ - "//iree/base:file_io", + "//iree/base/internal:file_io", "//iree/schemas:bytecode_module_def_c_fbs", ], ) @@ -271,10 +271,10 @@ name = "iree-run-module", srcs = ["iree-run-module-main.cc"], deps = [ - "//iree/base:file_io", "//iree/base:flags", "//iree/base:status", "//iree/base:tracing", + "//iree/base/internal:file_io", "//iree/hal/drivers", "//iree/modules/hal", "//iree/tools/utils:vm_util",
diff --git a/iree/tools/CMakeLists.txt b/iree/tools/CMakeLists.txt index b2b9bcd..0cb699d 100644 --- a/iree/tools/CMakeLists.txt +++ b/iree/tools/CMakeLists.txt
@@ -65,7 +65,7 @@ absl::strings benchmark iree::base::flags - iree::base::file_io + iree::base::internal::file_io iree::base::status iree::base::tracing iree::hal::drivers @@ -89,8 +89,8 @@ absl::strings iree::base::api iree::base::core_headers - iree::base::file_io iree::base::flags + iree::base::internal::file_io iree::base::status iree::base::tracing iree::hal::drivers @@ -110,7 +110,7 @@ "iree-dump-module-main.cc" DEPS flatcc::runtime - iree::base::file_io + iree::base::internal::file_io iree::schemas::bytecode_module_def_c_fbs ) @@ -124,8 +124,8 @@ DEPS absl::flags absl::strings - iree::base::file_io iree::base::flags + iree::base::internal::file_io iree::base::status iree::base::tracing iree::hal::drivers
diff --git a/iree/tools/iree-benchmark-module-main.cc b/iree/tools/iree-benchmark-module-main.cc index d7488cf..7e01e6c 100644 --- a/iree/tools/iree-benchmark-module-main.cc +++ b/iree/tools/iree-benchmark-module-main.cc
@@ -17,8 +17,8 @@ #include "absl/flags/usage.h" #include "absl/strings/string_view.h" #include "benchmark/benchmark.h" -#include "iree/base/file_io.h" #include "iree/base/flags.h" +#include "iree/base/internal/file_io.h" #include "iree/base/status.h" #include "iree/base/tracing.h" #include "iree/hal/drivers/init.h"
diff --git a/iree/tools/iree-check-module-main.cc b/iree/tools/iree-check-module-main.cc index 7efd23e..0d069c6 100644 --- a/iree/tools/iree-check-module-main.cc +++ b/iree/tools/iree-check-module-main.cc
@@ -18,8 +18,8 @@ #include "absl/strings/match.h" #include "absl/strings/string_view.h" #include "iree/base/api.h" -#include "iree/base/file_io.h" #include "iree/base/flags.h" +#include "iree/base/internal/file_io.h" #include "iree/base/status.h" #include "iree/base/target_platform.h" #include "iree/base/tracing.h"
diff --git a/iree/tools/iree-dump-module-main.cc b/iree/tools/iree-dump-module-main.cc index 61e1c5a..eb64107 100644 --- a/iree/tools/iree-dump-module-main.cc +++ b/iree/tools/iree-dump-module-main.cc
@@ -16,7 +16,7 @@ #include <string> #include <utility> -#include "iree/base/file_io.h" +#include "iree/base/internal/file_io.h" #include "iree/schemas/bytecode_module_def_json_printer.h" // Today we just print to JSON. We could do something more useful (size
diff --git a/iree/tools/iree-run-module-main.cc b/iree/tools/iree-run-module-main.cc index 058fa7a..ef1c10b 100644 --- a/iree/tools/iree-run-module-main.cc +++ b/iree/tools/iree-run-module-main.cc
@@ -16,8 +16,8 @@ #include "absl/flags/flag.h" #include "absl/strings/string_view.h" -#include "iree/base/file_io.h" #include "iree/base/flags.h" +#include "iree/base/internal/file_io.h" #include "iree/base/status.h" #include "iree/base/tracing.h" #include "iree/hal/drivers/init.h"
diff --git a/iree/tools/utils/BUILD b/iree/tools/utils/BUILD index 6d630f7..00a0858 100644 --- a/iree/tools/utils/BUILD +++ b/iree/tools/utils/BUILD
@@ -24,9 +24,9 @@ srcs = ["vm_util.cc"], hdrs = ["vm_util.h"], deps = [ - "//iree/base:file_io", "//iree/base:signature_mangle", "//iree/base:status", + "//iree/base/internal:file_io", "//iree/hal:api", "//iree/modules/hal", "//iree/vm",
diff --git a/iree/tools/utils/CMakeLists.txt b/iree/tools/utils/CMakeLists.txt index c684006..36114b4 100644 --- a/iree/tools/utils/CMakeLists.txt +++ b/iree/tools/utils/CMakeLists.txt
@@ -24,7 +24,7 @@ DEPS absl::span absl::strings - iree::base::file_io + iree::base::internal::file_io iree::base::signature_mangle iree::base::status iree::hal::api
diff --git a/iree/tools/utils/vm_util.cc b/iree/tools/utils/vm_util.cc index 84374f1..1cfc563 100644 --- a/iree/tools/utils/vm_util.cc +++ b/iree/tools/utils/vm_util.cc
@@ -21,7 +21,7 @@ #include "absl/strings/string_view.h" #include "absl/strings/strip.h" #include "absl/types/span.h" -#include "iree/base/file_io.h" +#include "iree/base/internal/file_io.h" #include "iree/base/signature_mangle.h" #include "iree/base/status.h" #include "iree/hal/api.h"