diff --git a/cmake/modules/contrib/TFLite.cmake b/cmake/modules/contrib/TFLite.cmake index 255dc5fde780..f4f2055964cb 100644 --- a/cmake/modules/contrib/TFLite.cmake +++ b/cmake/modules/contrib/TFLite.cmake @@ -41,8 +41,13 @@ if(NOT USE_TFLITE STREQUAL "OFF") file(GLOB_RECURSE TFLITE_DEPS "${USE_TFLITE}/*.a") # the order of the next libs are important for correct build list(REMOVE_ITEM TFLITE_DEPS "${USE_TFLITE}/_deps/clog-build/libclog.a" "${USE_TFLITE}/_deps/cpuinfo-build/libcpuinfo.a") - list(APPEND TFLITE_DEPS "${USE_TFLITE}/_deps/cpuinfo-build/libcpuinfo.a") - list(APPEND TFLITE_DEPS "${USE_TFLITE}/_deps/clog-build/libclog.a") + if(EXISTS "${USE_TFLITE}/_deps/cpuinfo-build/libcpuinfo.a") + list(APPEND TFLITE_DEPS "${USE_TFLITE}/_deps/cpuinfo-build/libcpuinfo.a") + endif() + if(EXISTS "${USE_TFLITE}/_deps/clog-build/libclog.a") + list(APPEND TFLITE_DEPS "${USE_TFLITE}/_deps/clog-build/libclog.a") + endif() + list(REMOVE_ITEM TFLITE_DEPS "${USE_TFLITE}/_deps/fft2d-build/libfft2d_fft4f2d.a") list(APPEND TVM_RUNTIME_LINKER_LIBS ${TFLITE_CONTRIB_LIB}) list(APPEND TVM_RUNTIME_LINKER_LIBS ${TFLITE_DEPS}) diff --git a/docker/install/ubuntu_install_tflite.sh b/docker/install/ubuntu_install_tflite.sh index ada5c7d2c274..8bb7f87debcf 100755 --- a/docker/install/ubuntu_install_tflite.sh +++ b/docker/install/ubuntu_install_tflite.sh @@ -26,7 +26,7 @@ set -o pipefail TENSORFLOW_VERSION=$(python3 -c "import tensorflow; print(tensorflow.__version__)" 2> /dev/null) # Download, build and install flatbuffers -git clone --branch=v25.1.24 --depth=1 --recursive https://github.com/google/flatbuffers.git +git clone --branch=v24.3.25 --depth=1 --recursive https://github.com/google/flatbuffers.git cd flatbuffers cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-Wno-class-memaccess" make install -j8 diff --git a/tests/scripts/task_config_build_cpu.sh b/tests/scripts/task_config_build_cpu.sh index b657d0c74b34..6007b68f577e 100755 --- a/tests/scripts/task_config_build_cpu.sh +++ b/tests/scripts/task_config_build_cpu.sh @@ -29,7 +29,7 @@ echo set\(USE_DNNL ON\) >> config.cmake echo set\(USE_ARM_COMPUTE_LIB ON\) >> config.cmake echo set\(USE_LLVM \"/usr/bin/llvm-config-17 --link-static\"\) >> config.cmake echo set\(USE_ANTLR ON\) >> config.cmake -echo set\(CMAKE_CXX_FLAGS \"-Werror -Wno-error=range-loop-construct\"\) >> config.cmake +echo set\(CMAKE_CXX_FLAGS \"-Wno-error=range-loop-construct -Wno-error=comment\"\) >> config.cmake echo set\(HIDE_PRIVATE_SYMBOLS ON\) >> config.cmake # This conditional is just to support the transition to cope