Update Java Bindings To Build In Experimental (#5226)
Fixes flags import error and iree_hal_buffer_view_create() signature change.
diff --git a/experimental/bindings/java/com/google/iree/native/CMakeLists.txt b/experimental/bindings/java/com/google/iree/native/CMakeLists.txt
index 11d1607..bcaff1c 100644
--- a/experimental/bindings/java/com/google/iree/native/CMakeLists.txt
+++ b/experimental/bindings/java/com/google/iree/native/CMakeLists.txt
@@ -27,7 +27,7 @@
"module_wrapper.h"
DEPS
iree::base::api
- iree::base::flags
+ iree::base::internal::flags
iree::base::logging
iree::base::status
iree::hal::api
diff --git a/experimental/bindings/java/com/google/iree/native/context_wrapper.cc b/experimental/bindings/java/com/google/iree/native/context_wrapper.cc
index a0c4700..04960d6 100644
--- a/experimental/bindings/java/com/google/iree/native/context_wrapper.cc
+++ b/experimental/bindings/java/com/google/iree/native/context_wrapper.cc
@@ -104,9 +104,9 @@
// Wrap the input buffers in buffer views.
iree_hal_buffer_view_t* input_buffer_view = nullptr;
IREE_RETURN_IF_ERROR(iree_hal_buffer_view_create(
- input_buffer, /*shape=*/&input_element_count,
- /*shape_rank=*/1, IREE_HAL_ELEMENT_TYPE_FLOAT_32,
- &input_buffer_view));
+ input_buffer, IREE_HAL_ELEMENT_TYPE_FLOAT_32,
+ /*shape=*/&input_element_count,
+ /*shape_rank=*/1, , &input_buffer_view));
iree_hal_buffer_release(input_buffer);
// Marshal the input buffer views through the input VM variant list.
@@ -134,7 +134,7 @@
auto* output_buffer = iree_hal_buffer_view_buffer(output_buffer_view);
// TODO(jennik): this is unsafe - we don't know the size of output ptr here!
IREE_RETURN_IF_ERROR(iree_hal_buffer_read_data(
- output_buffer, 0, output, iree_hal_buffer_byte_length(output_buffer)));
+ output_buffer, 0, output, iree_hal_buffer_byte_length(output_buffer)));
return OkStatus();
}
@@ -150,8 +150,8 @@
// TODO(jennik): Also create default string and tensorlist modules.
Status ContextWrapper::CreateDefaultModules() {
IREE_RETURN_IF_ERROR(iree_hal_driver_registry_try_create_by_name(
- iree_hal_driver_registry_default(),
- iree_make_cstring_view("vmla"), iree_allocator_system(), &driver_));
+ iree_hal_driver_registry_default(), iree_make_cstring_view("vmla"),
+ iree_allocator_system(), &driver_));
IREE_RETURN_IF_ERROR(iree_hal_driver_create_default_device(
driver_, iree_allocator_system(), &device_));
IREE_RETURN_IF_ERROR(
diff --git a/experimental/bindings/java/com/google/iree/native/instance_wrapper.cc b/experimental/bindings/java/com/google/iree/native/instance_wrapper.cc
index fcd11b1..bcc64ca 100644
--- a/experimental/bindings/java/com/google/iree/native/instance_wrapper.cc
+++ b/experimental/bindings/java/com/google/iree/native/instance_wrapper.cc
@@ -16,7 +16,7 @@
#include <mutex>
-#include "iree/base/flags.h"
+#include "iree/base/internal/flags.h"
#include "iree/hal/vmla/registration/driver_module.h"
#include "iree/modules/hal/hal_module.h"
#include "iree/modules/strings/strings_module.h"
diff --git a/experimental/bindings/java/com/google/iree/tests/integration_test.cc b/experimental/bindings/java/com/google/iree/tests/integration_test.cc
index cb4171b..e745076 100644
--- a/experimental/bindings/java/com/google/iree/tests/integration_test.cc
+++ b/experimental/bindings/java/com/google/iree/tests/integration_test.cc
@@ -19,7 +19,7 @@
#include "experimental/bindings/java/com/google/iree/native/instance_wrapper.h"
#include "experimental/bindings/java/com/google/iree/native/module_wrapper.h"
#include "experimental/bindings/java/com/google/iree/tests/simple_mul_bytecode_module.h"
-#include "iree/base/flags.h"
+#include "iree/base/internal/flags.h"
namespace iree {
namespace java {
