Rename vulkan_headers repo to iree_vulkan_headers (conflicts with TF).
TensorFlow doesn't yet use `maybe()`:
https://docs.bazel.build/versions/master/repo/utils.html#maybe,
so their version of this local repository is taking precedence.
PiperOrigin-RevId: 302547728
diff --git a/WORKSPACE b/WORKSPACE
index b76784f..b3a9fa1 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -162,8 +162,10 @@
build_file = "build_tools/third_party/google_tracing_framework_cpp/BUILD.overlay",
)
+# TODO(scotttodd): TensorFlow is squatting on the vulkan_headers repo name, so
+# we use a temporary one until resolved. Theirs is set to an outdated version.
maybe(new_local_repository,
- name = "vulkan_headers",
+ name = "iree_vulkan_headers",
path = "third_party/vulkan_headers",
build_file = "build_tools/third_party/vulkan_headers/BUILD.overlay",
)
diff --git a/build_tools/bazel_to_cmake/bazel_to_cmake_targets.py b/build_tools/bazel_to_cmake/bazel_to_cmake_targets.py
index 1cf2284..73b7617 100644
--- a/build_tools/bazel_to_cmake/bazel_to_cmake_targets.py
+++ b/build_tools/bazel_to_cmake/bazel_to_cmake_targets.py
@@ -63,8 +63,8 @@
# Vulkan
# TODO(scotttodd): Set -DVK_NO_PROTOTYPES to COPTS for _no_prototypes.
# Maybe add a wrapper CMake lib within build_tools/third_party/?
- "@vulkan_headers//:vulkan_headers": ["Vulkan::Headers"],
- "@vulkan_headers//:vulkan_headers_no_prototypes": ["Vulkan::Headers"],
+ "@iree_vulkan_headers//:vulkan_headers": ["Vulkan::Headers"],
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes": ["Vulkan::Headers"],
# The Bazel target maps to the IMPORTED target defined by FindVulkan().
"@vulkan_sdk//:sdk": ["Vulkan::Vulkan"],
# Misc single targets
diff --git a/build_tools/third_party/dear_imgui/BUILD.overlay b/build_tools/third_party/dear_imgui/BUILD.overlay
index 07c85b3..0825f19 100644
--- a/build_tools/third_party/dear_imgui/BUILD.overlay
+++ b/build_tools/third_party/dear_imgui/BUILD.overlay
@@ -68,7 +68,7 @@
],
deps = [
":dear_imgui_srcs",
- "@vulkan_headers//:vulkan_headers",
+ "@iree_vulkan_headers//:vulkan_headers",
"@vulkan_sdk//:sdk",
"@sdl2//:SDL2",
],
diff --git a/iree/hal/vulkan/BUILD b/iree/hal/vulkan/BUILD
index 22ce117..e0d2298 100644
--- a/iree/hal/vulkan/BUILD
+++ b/iree/hal/vulkan/BUILD
@@ -51,7 +51,7 @@
"//iree/base:api_util",
"//iree/base:tracing",
"//iree/hal:api",
- "@vulkan_headers//:vulkan_headers_no_prototypes",
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes",
],
)
@@ -64,7 +64,7 @@
":status_util",
"//iree/base:status",
"//iree/base:tracing",
- "@vulkan_headers//:vulkan_headers_no_prototypes",
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes",
],
)
@@ -121,7 +121,7 @@
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/container:inlined_vector",
"@com_google_absl//absl/synchronization",
- "@vulkan_headers//:vulkan_headers_no_prototypes",
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes",
],
)
@@ -145,7 +145,7 @@
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/synchronization",
"@com_google_absl//absl/time",
- "@vulkan_headers//:vulkan_headers_no_prototypes",
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes",
],
)
@@ -168,7 +168,7 @@
"@com_google_absl//absl/memory",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/types:span",
- "@vulkan_headers//:vulkan_headers_no_prototypes",
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes",
],
)
@@ -198,7 +198,7 @@
"//iree/base:status",
"//iree/base:tracing",
"@com_google_absl//absl/types:span",
- "@vulkan_headers//:vulkan_headers_no_prototypes",
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes",
],
)
@@ -211,7 +211,7 @@
"//iree/base:ref_ptr",
"@com_google_absl//absl/synchronization",
"@com_google_absl//absl/utility",
- "@vulkan_headers//:vulkan_headers_no_prototypes",
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes",
],
)
@@ -232,7 +232,7 @@
"@com_google_absl//absl/container:inlined_vector",
"@com_google_absl//absl/synchronization",
"@com_google_absl//absl/time",
- "@vulkan_headers//:vulkan_headers_no_prototypes",
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes",
],
)
@@ -243,7 +243,7 @@
deps = [
":handle_util",
"//iree/hal:semaphore",
- "@vulkan_headers//:vulkan_headers_no_prototypes",
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes",
],
)
@@ -254,7 +254,7 @@
deps = [
":handle_util",
"//iree/hal:event",
- "@vulkan_headers//:vulkan_headers_no_prototypes",
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes",
],
)
@@ -277,7 +277,7 @@
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/container:inlined_vector",
"@com_google_absl//absl/synchronization",
- "@vulkan_headers//:vulkan_headers_no_prototypes",
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes",
],
)
@@ -297,7 +297,7 @@
"//iree/hal:executable_spec",
"//iree/schemas:spirv_executable_def_cc_fbs",
"@com_google_absl//absl/container:inlined_vector",
- "@vulkan_headers//:vulkan_headers_no_prototypes",
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes",
],
)
@@ -323,7 +323,7 @@
hdrs = ["status_util.h"],
deps = [
"//iree/base:status",
- "@vulkan_headers//:vulkan_headers_no_prototypes",
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes",
],
)
@@ -358,7 +358,7 @@
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/synchronization",
- "@vulkan_headers//:vulkan_headers_no_prototypes",
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes",
"@vulkan_memory_allocator//:impl_header_only",
],
)
@@ -396,7 +396,7 @@
"@com_google_absl//absl/strings",
"@com_google_absl//absl/synchronization",
"@com_google_absl//absl/types:span",
- "@vulkan_headers//:vulkan_headers_no_prototypes",
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes",
],
)
@@ -418,7 +418,7 @@
"//iree/hal:driver",
"@com_google_absl//absl/container:inlined_vector",
"@com_google_absl//absl/flags:flag",
- "@vulkan_headers//:vulkan_headers_no_prototypes",
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes",
],
)
diff --git a/iree/samples/vulkan/BUILD b/iree/samples/vulkan/BUILD
index af54f28..654757f 100644
--- a/iree/samples/vulkan/BUILD
+++ b/iree/samples/vulkan/BUILD
@@ -58,8 +58,8 @@
"@com_google_absl//absl/base:core_headers",
"@dear_imgui",
"@dear_imgui//:imgui_sdl_vulkan",
+ "@iree_vulkan_headers//:vulkan_headers_no_prototypes",
"@sdl2//:SDL2",
- "@vulkan_headers//:vulkan_headers_no_prototypes",
"@vulkan_sdk//:sdk",
],
)
