Merge branch 'relax' into bert_op_support

Author: Josh Fromm

ci/jenkins/unity_jenkinsfile.groovy

@@ -32,7 +32,7 @@ import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. -->
 ci_lint = 'tlcpack/ci-lint:20221025-182121-e41d0ed6e'
 ci_gpu = 'tlcpack/ci-gpu:20221128-070141-ae4fd7df7'
-ci_cpu = 'tlcpack/ci-cpu:20230110-070003-d00168ffb'
+ci_cpu = 'tlcpackstaging/ci_cpu:relax-20230217-001605-fcb3d9e71'
 ci_wasm = 'tlcpack/ci-wasm:v0.72'
 ci_i386 = 'tlcpack/ci-i386:v0.75'
 ci_qemu = 'tlcpack/ci-qemu:v0.11'

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})

src/topi/einsum.cc

@@ -264,14 +264,15 @@ class EinsumBuilder {
         // Ellipsis
         auto ellipsis_shape = ellipsis_shape_.value();
         for (int i = 0; i < static_cast<int>(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);
       }
     }