Replacing use of dylib/vmvx(-sync) with local-task/local-sync drivers.
diff --git a/samples/simple_embedding/BUILD b/samples/simple_embedding/BUILD index b58e2c2..a1b2dcd 100644 --- a/samples/simple_embedding/BUILD +++ b/samples/simple_embedding/BUILD
@@ -16,7 +16,7 @@ iree_cmake_extra_content( content = """ -if((IREE_HAL_DRIVER_VMVX OR IREE_HAL_DRIVER_VMVX_SYNC) AND +if(IREE_HAL_DRIVER_LOCAL_SYNC AND IREE_HAL_EXECUTABLE_LOADER_VMVX_MODULE AND (IREE_TARGET_BACKEND_VMVX OR DEFINED IREE_HOST_BINARY_ROOT)) """, inline = True, @@ -66,7 +66,7 @@ iree_cmake_extra_content( content = """ -if((IREE_HAL_DRIVER_DYLIB OR IREE_HAL_DRIVER_DYLIB_SYNC) AND +if(IREE_HAL_DRIVER_LOCAL_SYNC AND IREE_HAL_EXECUTABLE_LOADER_EMBEDDED_ELF AND (IREE_TARGET_BACKEND_DYLIB_LLVM_AOT OR DEFINED IREE_HOST_BINARY_ROOT)) """, inline = True, @@ -184,7 +184,7 @@ iree_cmake_extra_content( content = """ -if(IREE_HAL_DRIVER_DYLIB) +if(IREE_HAL_DRIVER_LOCAL_TASK AND IREE_HAL_EXECUTABLE_LOADER_EMBEDDED_ELF) """, inline = True, )
diff --git a/samples/simple_embedding/CMakeLists.txt b/samples/simple_embedding/CMakeLists.txt index 56899e0..fe501a4 100644 --- a/samples/simple_embedding/CMakeLists.txt +++ b/samples/simple_embedding/CMakeLists.txt
@@ -10,7 +10,7 @@ iree_add_all_subdirs() -if((IREE_HAL_DRIVER_VMVX OR IREE_HAL_DRIVER_VMVX_SYNC) AND +if(IREE_HAL_DRIVER_LOCAL_SYNC AND IREE_HAL_EXECUTABLE_LOADER_VMVX_MODULE AND (IREE_TARGET_BACKEND_VMVX OR DEFINED IREE_HOST_BINARY_ROOT)) iree_cc_binary( @@ -54,7 +54,7 @@ endif() -if((IREE_HAL_DRIVER_DYLIB OR IREE_HAL_DRIVER_DYLIB_SYNC) AND +if(IREE_HAL_DRIVER_LOCAL_SYNC AND IREE_HAL_EXECUTABLE_LOADER_EMBEDDED_ELF AND (IREE_TARGET_BACKEND_DYLIB_LLVM_AOT OR DEFINED IREE_HOST_BINARY_ROOT)) iree_cc_binary( @@ -183,7 +183,7 @@ ::simple_embedding_embedded_sync ) -if(IREE_HAL_DRIVER_DYLIB) +if(IREE_HAL_DRIVER_LOCAL_TASK AND IREE_HAL_EXECUTABLE_LOADER_EMBEDDED_ELF) iree_cc_binary( NAME
diff --git a/samples/simple_embedding/device_vmvx_sync.c b/samples/simple_embedding/device_vmvx_sync.c index d83a500..5aef183 100644 --- a/samples/simple_embedding/device_vmvx_sync.c +++ b/samples/simple_embedding/device_vmvx_sync.c
@@ -4,7 +4,7 @@ // See https://llvm.org/LICENSE.txt for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// A example of setting up the vmvx-sync driver. +// A example of setting up the local-sync driver using VMVX for execution. #include <stddef.h>
diff --git a/samples/static_library/CMakeLists.txt b/samples/static_library/CMakeLists.txt index e5416e6..ff8728e 100644 --- a/samples/static_library/CMakeLists.txt +++ b/samples/static_library/CMakeLists.txt
@@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception if(NOT IREE_TARGET_BACKEND_DYLIB_LLVM_AOT OR - NOT IREE_HAL_DRIVER_DYLIB OR + NOT IREE_HAL_DRIVER_LOCAL_SYNC OR NOT IREE_BUILD_COMPILER) return() endif()
diff --git a/samples/static_library/README.md b/samples/static_library/README.md index b22a3f3..75e9ea2 100644 --- a/samples/static_library/README.md +++ b/samples/static_library/README.md
@@ -44,7 +44,8 @@ -DIREE_TARGET_BACKEND_DEFAULTS=OFF \ -DIREE_TARGET_BACKEND_DYLIB_LLVM_AOT=ON \ -DIREE_HAL_DRIVER_DEFAULTS=OFF \ - -DIREE_HAL_DRIVER_DYLIB_SYNC=ON \ + -DIREE_HAL_DRIVER_LOCAL_SYNC=ON \ + -DIREE_HAL_EXECUTABLE_LOADER_DEFAULTS=OFF \ -DIREE_BUILD_COMPILER=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo . ```
diff --git a/samples/vision_inference/CMakeLists.txt b/samples/vision_inference/CMakeLists.txt index 2da2ffa..89b2ae0 100644 --- a/samples/vision_inference/CMakeLists.txt +++ b/samples/vision_inference/CMakeLists.txt
@@ -4,7 +4,8 @@ # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -if(NOT IREE_TARGET_BACKEND_DYLIB_LLVM_AOT OR NOT IREE_HAL_DRIVER_DYLIB) +if(NOT IREE_TARGET_BACKEND_DYLIB_LLVM_AOT OR + NOT IREE_HAL_EXECUTABLE_LOADER_EMBEDDED_ELF_DEFAULT) return() endif()
diff --git a/samples/vision_inference/iree-run-mnist-module.c b/samples/vision_inference/iree-run-mnist-module.c index 117666e..581ef09 100644 --- a/samples/vision_inference/iree-run-mnist-module.c +++ b/samples/vision_inference/iree-run-mnist-module.c
@@ -26,7 +26,7 @@ // TODO(#5724): move device selection into the compiled modules. iree_hal_device_t* device = NULL; IREE_RETURN_IF_ERROR(iree_runtime_instance_try_create_default_device( - instance, iree_make_cstring_view("dylib"), &device)); + instance, iree_make_cstring_view("local-task"), &device)); // Create one session per loaded module to hold the module state. iree_runtime_session_options_t session_options;