Update resnet example

Author: nhynes

rust/common/src/packed_func.rs

@@ -59,7 +59,7 @@ macro_rules! ensure_type {
 macro_rules! impl_prim_tvm_arg {
     ($type_code:ident, $field:ident, $field_type:ty, [ $( $type:ty ),+ ] ) => {
         $(
-            impl<'a> From<$type> for TVMArgValue<'a> {
+            impl From<$type> for TVMArgValue<'static> {
                 fn from(val: $type) -> Self {
                     TVMArgValue {
                         value: TVMValue { $field: val as $field_type },
@@ -112,11 +112,25 @@ impl_prim_tvm_arg!(
     [u8, u16, u32, u64, usize]
 );
 
+#[cfg(feature = "bindings")]
+// only allow this in bindings because pure-rust can't take ownership of leaked CString
+impl<'a> From<&String> for TVMArgValue<'a> {
+    fn from(string: &String) -> Self {
+        TVMArgValue {
+            value: TVMValue {
+                v_str: std::ffi::CString::new(string.clone()).unwrap().into_raw(),
+            },
+            type_code: TVMTypeCode_kStr as i64,
+            _lifetime: PhantomData,
+        }
+    }
+}
+
 impl<'a> From<&std::ffi::CString> for TVMArgValue<'a> {
     fn from(string: &std::ffi::CString) -> Self {
         TVMArgValue {
             value: TVMValue {
-                v_handle: string.as_ptr() as *const _ as *mut c_void,
+                v_str: string.as_ptr(),
             },
             type_code: TVMTypeCode_kStr as i64,
             _lifetime: PhantomData,

rust/common/src/value.rs

@@ -45,7 +45,7 @@ impl FromStr for TVMType {
             _ => return Err(format_err!("Unknown type {}", type_name)),
         };
 
-        Ok(dbg!(TVMType::new(type_code, bits, lanes)))
+        Ok(TVMType::new(type_code, bits, lanes))
     }
 }
 

rust/frontend/examples/resnet/src/main.rs

@@ -1,5 +1,3 @@
-#![feature(try_from)]
-
 extern crate csv;
 extern crate image;
 extern crate ndarray;
@@ -55,10 +53,8 @@ fn main() {
         "input size is {:?}",
         input.shape().expect("cannot get the input shape")
     );
-    let graph = std::ffi::CString::new(
-        fs::read_to_string(concat!(env!("CARGO_MANIFEST_DIR"), "/deploy_graph.json")).unwrap(),
-    )
-    .unwrap();
+    let graph =
+        fs::read_to_string(concat!(env!("CARGO_MANIFEST_DIR"), "/deploy_graph.json")).unwrap();
     // load the built module
     let lib = Module::load(&Path::new(concat!(
         env!("CARGO_MANIFEST_DIR"),

rust/frontend/src/context.rs

@@ -158,15 +158,15 @@ pub struct TVMContext {
     /// Supported device types
     pub device_type: TVMDeviceType,
     /// Device id
-    pub device_id: usize,
+    pub device_id: i32,
 }
 
 impl TVMContext {
     /// Creates context from device type and id.
-    pub fn new(device_type: TVMDeviceType, device_id: usize) -> Self {
+    pub fn new(device_type: TVMDeviceType, device_id: i32) -> Self {
         TVMContext {
-            device_type: device_type,
-            device_id: device_id,
+            device_type,
+            device_id,
         }
     }
 }
@@ -175,7 +175,7 @@ macro_rules! impl_ctxs {
     ($(($ctx:ident, $dldevt:expr));+) => {
         $(
             impl TVMContext {
-                pub fn $ctx(device_id: usize) -> Self {
+                pub fn $ctx(device_id: i32) -> Self {
                     Self::new(TVMDeviceType($dldevt), device_id)
                 }
             }
@@ -238,7 +238,7 @@ macro_rules! impl_device_attrs {
                     // `unwrap` is ok here because if there is any error,
                     // if would occur in function call.
                     function::Builder::from(func)
-                        .args(&[dt, self.device_id, $attr_kind])
+                        .args(&[dt, self.device_id as usize, $attr_kind])
                         .invoke()
                         .unwrap()
                         .try_into()
@@ -262,7 +262,7 @@ impl From<ffi::DLContext> for TVMContext {
     fn from(ctx: ffi::DLContext) -> Self {
         TVMContext {
             device_type: TVMDeviceType::from(ctx.device_type),
-            device_id: ctx.device_id as usize,
+            device_id: ctx.device_id,
         }
     }
 }

rust/frontend/src/ndarray.rs

@@ -188,7 +188,7 @@ impl NDArray {
 
     /// Copies the NDArray to another target NDArray.
     pub fn copy_to_ndarray(&self, target: NDArray) -> Result<NDArray, Error> {
-        if dbg!(self.dtype()) != dbg!(target.dtype()) {
+        if self.dtype() != target.dtype() {
             bail!(
                 "{}",
                 errors::TypeMismatchError {