Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate IREE at iree-org/iree@b8370b8 #337

Merged
merged 1 commit into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build_tools/cmake/static_module.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
4 changes: 2 additions & 2 deletions build_tools/cmake/vmvx_module.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
Expand Down
6 changes: 3 additions & 3 deletions build_tools/install_iree_host_tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 ..

Expand Down
4 changes: 2 additions & 2 deletions docs/getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..
```
Expand Down
2 changes: 1 addition & 1 deletion iree-release-link.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion requirements-compiler.txt
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions requirements-tools.txt
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions samples/simple_embedding/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
Expand Down Expand Up @@ -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 "")
Expand Down
4 changes: 2 additions & 2 deletions samples/static_library/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions samples/vision_inference/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
Expand Down
2 changes: 1 addition & 1 deletion third_party/iree
Submodule iree updated 886 files