diff --git a/build_tools/cmake/static_module.cmake b/build_tools/cmake/static_module.cmake index 189ac48..9a146f9 100644 --- a/build_tools/cmake/static_module.cmake +++ b/build_tools/cmake/static_module.cmake @@ -91,8 +91,8 @@ function(static_module) OUTPUT ${_GEN_H_FILE_NAME} ${_GEN_C_FILE_NAME} - COMMAND generate_embed_data ${_GEN_EMBED_ARGS} - DEPENDS generate_embed_data ${_MODULE_NAME} + COMMAND iree-c-embed-data ${_GEN_EMBED_ARGS} + DEPENDS iree-c-embed-data ${_MODULE_NAME} ) list(APPEND _SRC_FILES "${_GEN_H_FILE_NAME}" "${_GEN_C_FILE_NAME}") diff --git a/build_tools/cmake/vmvx_module.cmake b/build_tools/cmake/vmvx_module.cmake index 4d41e19..146b443 100644 --- a/build_tools/cmake/vmvx_module.cmake +++ b/build_tools/cmake/vmvx_module.cmake @@ -46,8 +46,8 @@ add_custom_command( OUTPUT ${_RULE_NAME}.h ${_RULE_NAME}.c - COMMAND generate_embed_data ${_GEN_EMBED_ARGS} - DEPENDS generate_embed_data ${_RULE_NAME}.vmfb + COMMAND iree-c-embed-data ${_GEN_EMBED_ARGS} + DEPENDS iree-c-embed-data ${_RULE_NAME}.vmfb ) add_library(${_RULE_NAME} STATIC "") diff --git a/build_tools/install_iree_host_tools.sh b/build_tools/install_iree_host_tools.sh index b1be778..3f52ebd 100755 --- a/build_tools/install_iree_host_tools.sh +++ b/build_tools/install_iree_host_tools.sh @@ -79,7 +79,7 @@ if [[ $# -eq 0 ]] ; then fi -# Use pip + install `generate_embed_data` and `iree-flatcc-cli` from source +# Use pip + install `iree-c-embed-data` and `iree-flatcc-cli` from source pip3 install -r ${PATH_TO_REPO}/requirements-compiler.txt @@ -99,9 +99,9 @@ cmake -GNinja \ -DIREE_BUILD_TESTS=OFF \ -DCMAKE_INSTALL_PREFIX=../build-iree-host-install \ ${PATH_TO_REPO}/third_party/iree/ -cmake --build . --target generate_embed_data iree-flatcc-cli +cmake --build . --target iree-c-embed-data iree-flatcc-cli -cp build_tools/embed_data/generate_embed_data ../build-iree-host-install/bin +cp build_tools/embed_data/iree-c-embed-data ../build-iree-host-install/bin cp build_tools/third_party/flatcc/iree-flatcc-cli ../build-iree-host-install/bin/ cd .. diff --git a/docs/getting_started.md b/docs/getting_started.md index bae18d7..86f1ecc 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -86,9 +86,9 @@ cmake -GNinja \ -DIREE_BUILD_TESTS=OFF \ -DCMAKE_INSTALL_PREFIX=../build-iree-host-install \ ../third_party/iree/ -cmake --build . --target generate_embed_data iree-flatcc-cli +cmake --build . --target iree-c-embed-data iree-flatcc-cli -cp build_tools/embed_data/generate_embed_data ../build-iree-host-install/bin +cp build_tools/embed_data/iree-c-embed-data ../build-iree-host-install/bin cp build_tools/third_party/flatcc/iree-flatcc-cli ../build-iree-host-install/bin/ cd .. ``` diff --git a/iree-release-link.txt b/iree-release-link.txt index 601ad38..e264946 100644 --- a/iree-release-link.txt +++ b/iree-release-link.txt @@ -1 +1 @@ -https://github.com/iree-org/iree/releases/download/candidate-20240610.920/iree-dist-20240610.920-linux-x86_64.tar.xz +https://github.com/iree-org/iree/releases/download/candidate-20240728.968/iree-dist-20240728.968-linux-x86_64.tar.xz diff --git a/requirements-compiler.txt b/requirements-compiler.txt index 26f4bb4..95cfe00 100644 --- a/requirements-compiler.txt +++ b/requirements-compiler.txt @@ -1,4 +1,4 @@ # SPDX-FileCopyrightText: 2023 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. # SPDX-License-Identifier: CC0-1.0 -f https://iree.dev/pip-release-links.html -iree-compiler==20240610.920 +iree-compiler==20240728.968 diff --git a/requirements-tools.txt b/requirements-tools.txt index 545eee6..97325a9 100644 --- a/requirements-tools.txt +++ b/requirements-tools.txt @@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2022 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. # SPDX-License-Identifier: CC0-1.0 -f https://iree.dev/pip-release-links.html -iree-tools-tf==20240610.920 -iree-tools-tflite==20240610.920 +iree-tools-tf==20240728.968 +iree-tools-tflite==20240728.968 diff --git a/samples/simple_embedding/CMakeLists.txt b/samples/simple_embedding/CMakeLists.txt index 772441b..9fa06ab 100644 --- a/samples/simple_embedding/CMakeLists.txt +++ b/samples/simple_embedding/CMakeLists.txt @@ -42,8 +42,8 @@ if(IREE_HAL_EXECUTABLE_LOADER_VMVX_MODULE) OUTPUT "simple_embedding_test_bytecode_module_vmvx_c.h" "simple_embedding_test_bytecode_module_vmvx_c.c" - COMMAND generate_embed_data ${_GEN_EMBED_ARGS} - DEPENDS generate_embed_data simple_embedding_test_bytecode_module_vmvx.vmfb + COMMAND iree-c-embed-data ${_GEN_EMBED_ARGS} + DEPENDS iree-c-embed-data simple_embedding_test_bytecode_module_vmvx.vmfb ) add_library(simple_embedding_test_bytecode_module_vmvx STATIC "") @@ -124,8 +124,8 @@ if(IREE_HAL_EXECUTABLE_LOADER_EMBEDDED_ELF) OUTPUT "simple_embedding_test_module_dylib_arm_32.h" "simple_embedding_test_module_dylib_arm_32.c" - COMMAND generate_embed_data ${_GEN_EMBED_ARGS} - DEPENDS generate_embed_data simple_embedding_test_module_dylib_arm_32.vmfb + COMMAND iree-c-embed-data ${_GEN_EMBED_ARGS} + DEPENDS iree-c-embed-data simple_embedding_test_module_dylib_arm_32.vmfb ) add_library(simple_embedding_test_bytecode_module_dylib STATIC "") diff --git a/samples/static_library/CMakeLists.txt b/samples/static_library/CMakeLists.txt index 5841a6e..df2af19 100644 --- a/samples/static_library/CMakeLists.txt +++ b/samples/static_library/CMakeLists.txt @@ -58,8 +58,8 @@ add_custom_command( OUTPUT "simple_mul_c.h" "simple_mul_c.c" - COMMAND generate_embed_data ${_GEN_EMBED_ARGS} - DEPENDS generate_embed_data simple_mul.vmfb + COMMAND iree-c-embed-data ${_GEN_EMBED_ARGS} + DEPENDS iree-c-embed-data simple_mul.vmfb ) target_sources(simple_mul_c diff --git a/samples/vision_inference/CMakeLists.txt b/samples/vision_inference/CMakeLists.txt index c8dc9c7..81129f5 100644 --- a/samples/vision_inference/CMakeLists.txt +++ b/samples/vision_inference/CMakeLists.txt @@ -78,8 +78,8 @@ add_custom_command( OUTPUT "mnist_c.h" "mnist_c.c" - COMMAND generate_embed_data ${_GEN_EMBED_ARGS} - DEPENDS generate_embed_data mnist.vmfb + COMMAND iree-c-embed-data ${_GEN_EMBED_ARGS} + DEPENDS iree-c-embed-data mnist.vmfb ) add_library(mnist_c STATIC "") diff --git a/third_party/iree b/third_party/iree index f062b19..b8370b8 160000 --- a/third_party/iree +++ b/third_party/iree @@ -1 +1 @@ -Subproject commit f062b19dfffeaf4e567b6f8793e0f40ff08cf525 +Subproject commit b8370b8c3a9edfdd95f2bbd2cc303751649e54c7