commit 9f8b9cf19d5887b889a14f3768eb3fb5800bf804
author Scott Todd <scotttodd@google.com> Mon Nov 29 12:52:54 2021 -0800
committer GitHub <noreply@github.com> Mon Nov 29 12:52:54 2021 -0800
tree 04d01e4aff002ec8ddf34d8a931cb606ea739e0b
parent 8d8eb0a4d5b051eefe6ae67e133a27821dbf4c1a

Fix rank 0 buffer view usage in variables and state sample. (#7762)

This should fix the failure at https://buildkite.com/iree/iree-samples/builds/161#a9112912-550a-4e09-847a-afb3c4d56c5b

`[2021-11-25T00:25:28Z] ../iree/modules/hal/module.c:688: INVALID_ARGUMENT; tensor shape rank mismatch; expected 0 but have 1; expected shape , actual shape 1; while invoking native function hal.buffer_view.assert; while calling import;`

iree/hal/buffer_view.c

diff --git a/iree/hal/buffer_view.c b/iree/hal/buffer_view.c
index bdc55bc..4de4a38 100644
--- a/iree/hal/buffer_view.c
+++ b/iree/hal/buffer_view.c
@@ -363,7 +363,7 @@
     iree_hal_element_type_t element_type,
     iree_hal_encoding_type_t encoding_type,
     iree_device_size_t* out_allocation_size) {
-  IREE_ASSERT_ARGUMENT(shape);
+  IREE_ASSERT_ARGUMENT(!shape_rank || shape);
   IREE_ASSERT_ARGUMENT(out_allocation_size);
   *out_allocation_size = 0;
 

iree/samples/variables_and_state/main.c

diff --git a/iree/samples/variables_and_state/main.c b/iree/samples/variables_and_state/main.c
index 5abb8a0..302ff4e 100644
--- a/iree/samples/variables_and_state/main.c
+++ b/iree/samples/variables_and_state/main.c
@@ -46,7 +46,6 @@
       session, iree_make_cstring_view("module.set_value"), &call));
 
   iree_hal_buffer_view_t* arg0 = NULL;
-  static const iree_hal_dim_t arg0_shape[1] = {1};
   int arg0_data[1] = {new_value};
 
   // TODO(scotttodd): use iree_hal_buffer_view_wrap_or_clone_heap_buffer
@@ -54,8 +53,8 @@
   iree_status_t status = iree_ok_status();
   if (iree_status_is_ok(status)) {
     status = iree_hal_buffer_view_clone_heap_buffer(
-        iree_runtime_session_device_allocator(session), arg0_shape,
-        IREE_ARRAYSIZE(arg0_shape), IREE_HAL_ELEMENT_TYPE_SINT_32,
+        iree_runtime_session_device_allocator(session), /*shape=*/NULL,
+        /*shape_rank=*/0, IREE_HAL_ELEMENT_TYPE_SINT_32,
         IREE_HAL_ENCODING_TYPE_DENSE_ROW_MAJOR,
         IREE_HAL_MEMORY_TYPE_HOST_LOCAL | IREE_HAL_MEMORY_TYPE_DEVICE_VISIBLE,
         IREE_HAL_BUFFER_USAGE_ALL,
@@ -79,7 +78,6 @@
       session, iree_make_cstring_view("module.add_to_value"), &call));
 
   iree_hal_buffer_view_t* arg0 = NULL;
-  static const iree_hal_dim_t arg0_shape[1] = {1};
   int arg0_data[1] = {x};
 
   // TODO(scotttodd): use iree_hal_buffer_view_wrap_or_clone_heap_buffer
@@ -87,8 +85,8 @@
   iree_status_t status = iree_ok_status();
   if (iree_status_is_ok(status)) {
     status = iree_hal_buffer_view_clone_heap_buffer(
-        iree_runtime_session_device_allocator(session), arg0_shape,
-        IREE_ARRAYSIZE(arg0_shape), IREE_HAL_ELEMENT_TYPE_SINT_32,
+        iree_runtime_session_device_allocator(session), /*shape=*/NULL,
+        /*shape_rank=*/0, IREE_HAL_ELEMENT_TYPE_SINT_32,
         IREE_HAL_ENCODING_TYPE_DENSE_ROW_MAJOR,
         IREE_HAL_MEMORY_TYPE_HOST_LOCAL | IREE_HAL_MEMORY_TYPE_DEVICE_VISIBLE,
         IREE_HAL_BUFFER_USAGE_ALL,