diff --git a/cmake/modules/contrib/TFLite.cmake b/cmake/modules/contrib/TFLite.cmake index b8d6a0daff..255dc5fde7 100644 --- a/cmake/modules/contrib/TFLite.cmake +++ b/cmake/modules/contrib/TFLite.cmake @@ -39,6 +39,10 @@ if(NOT USE_TFLITE STREQUAL "OFF") endif() find_library(TFLITE_CONTRIB_LIB libtensorflow-lite.a ${USE_TFLITE}) 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") list(APPEND TVM_RUNTIME_LINKER_LIBS ${TFLITE_CONTRIB_LIB}) list(APPEND TVM_RUNTIME_LINKER_LIBS ${TFLITE_DEPS}) diff --git a/python/tvm/relax/frontend/onnx_frontend.py b/python/tvm/relax/frontend/onnx_frontend.py index 1e1d4f421b..6bbdd88d85 100644 --- a/python/tvm/relax/frontend/onnx_frontend.py +++ b/python/tvm/relax/frontend/onnx_frontend.py @@ -34,7 +34,7 @@ Not all TVM kernels currently support dynamic shapes, please file an issue on github.com/apache/tvm/issues if you hit an error with dynamic kernels. """ -import math +# import math import warnings from typing import Union, List, Dict, Tuple, Any import onnx.onnx_ml_pb2 diff --git a/src/topi/einsum.cc b/src/topi/einsum.cc index dabf38c9a2..a4baeefc5b 100644 --- a/src/topi/einsum.cc +++ b/src/topi/einsum.cc @@ -264,14 +264,15 @@ class EinsumBuilder { // Ellipsis auto ellipsis_shape = ellipsis_shape_.value(); for (int i = 0; i < static_cast(ellipsis_shape.size()); ++i) { - reduction_axes->push_back( - IterVar(Range(0, ellipsis_shape[i]), Var("k", DataType::Int(64)), IterVarType::kCommReduce)); + reduction_axes->push_back(IterVar(Range(0, ellipsis_shape[i]), + Var("k", DataType::Int(64)), IterVarType::kCommReduce)); ellipsis_indices->push_back(reduction_axes->back()->var); } } else { // Normal label reduction_axes->push_back(IterVar(Range(0, label_to_extent_[label]), - Var(std::string(1, label), DataType::Int(64)), IterVarType::kCommReduce)); + Var(std::string(1, label), DataType::Int(64)), + IterVarType::kCommReduce)); label_to_index->emplace(label, reduction_axes->back()->var); } }