some compilation fixes

Author: kali

tflite/Cargo.toml

@@ -7,12 +7,6 @@ description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference"
 repository = "https://github.com/snipsco/tract"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 flatbuffers = {version="23.1.21"}
 tract-hir = { version = "=0.20.5-pre", path = "../hir" }
-
-[lib]
-name="tflite"
-path="src/lib.rs"

tflite/src/lib.rs

@@ -1,8 +1,13 @@
 mod ops;
 mod tensors;
+
+#[allow(unused_imports)]
 mod tflite_generated;
-use crate::tflite_generated::tflite::Model as ModelBuffer;
+pub use tflite_generated::tflite;
 
+
+/*
+use crate::tflite_generated::tflite::Model as ModelBuffer;
 impl ModelBuffer {
     pub fn from_file(path: P) -> Result<ModelBuffer, Error> {
         let model_file = &*fs::read(model_file_path)?;
@@ -20,3 +25,4 @@ pub struct TFLiteModel<'model> {
 }
 
 impl TFLite<'_> {}
+*/

tflite/src/tensors.rs

@@ -1,4 +1,4 @@
-use crate::tflite_generated::{tflite::TensorType, TensorType as BufferTensorType};
+use crate::tflite_generated::tflite::{TensorType, TensorType as BufferTensorType};
 #[cfg(feature = "complex")]
 use num_complex::Complex;
 use tract_hir::internal::*;
@@ -8,15 +8,15 @@ impl TryFrom<BufferTensorType> for DatumType {
     fn try_from(t: BufferTensorType) -> TractResult<DatumType> {
         Ok(match t {
             BufferTensorType::FLOAT32 => DatumType::F32,
-            BUfferTensorType::FLOAT16 => DatumType::F16,
+            BufferTensorType::FLOAT16 => DatumType::F16,
             BufferTensorType::INT32 => DatumType::I32,
             BufferTensorType::UINT8 => DatumType::U8,
             BufferTensorType::INT64 => DatumType::I64,
             BufferTensorType::STRING => DatumType::String,
             BufferTensorType::BOOL => DatumType::Bool,
             BufferTensorType::INT16 => DatumType::I16,
             #[cfg(feature = "complex")]
-            BufferTensorType::COMPLEX64 => DatumType::ComplexF64,
+            BufferTensorType::COMPLEX64 => DatumType::ComplexF64, // TODO check this
             TensorType::INT8 => DatumType::I8,
             TensorType::FLOAT64 => DatumType::F64,
             //TensorType::COMPLEX128 => DatumType::ComplexF64,
@@ -32,7 +32,7 @@ impl TryFrom<BufferTensorType> for DatumType {
     }
 }
 
-fn create_tensor(shape: Vec<usize>, dt: DatumType, data: &[u8]) -> TractResult<Tensor> {
+fn create_tensor(dt: DatumType, shape: &[usize], data: &[u8]) -> TractResult<Tensor> {
     unsafe {
         match dt {
             DatumType::U8 => Tensor::from_raw::<u8>(&shape, data),
@@ -47,7 +47,7 @@ fn create_tensor(shape: Vec<usize>, dt: DatumType, data: &[u8]) -> TractResult<T
             DatumType::F32 => Tensor::from_raw::<f32>(&shape, data),
             DatumType::F64 => Tensor::from_raw::<f64>(&shape, data),
             #[cfg(feature = "complex")]
-            DatumType::ComplexF64 => Tensor::from_raw::<Complex<f64>>(&shape, data),
+            DatumType::ComplexF64 => Tensor::from_raw::<Complex<f64>>(&shape, data), // TODO check this
             DatumType::Bool => Ok(Tensor::from_raw::<u8>(&shape, data)?
                 .into_array::<u8>()?
                 .mapv(|x| x != 0)