[Rust] Improve NDArray, GraphRt, and Relay bindings

include/tvm/relay/adt.h

@@ -190,6 +190,7 @@ class PatternTuple;
 /*! \brief PatternVar container node */
 class PatternTupleNode : public PatternNode {
  public:
+  /* TODO(@jroesch): rename to field_pats */
   /*! Sub-patterns to match against each value of the tuple. */
   tvm::Array<Pattern> patterns;
 

include/tvm/relay/attrs/nn.h

@@ -29,6 +29,8 @@
 
 #include <string>
 
+#include "tvm/runtime/container.h"
+
 namespace tvm {
 namespace relay {
 
@@ -115,9 +117,9 @@ struct Conv2DAttrs : public tvm::AttrsNode<Conv2DAttrs> {
   int groups;
   IndexExpr channels;
   Array<IndexExpr> kernel_size;
-  std::string data_layout;
-  std::string kernel_layout;
-  std::string out_layout;
+  tvm::String data_layout;
+  tvm::String kernel_layout;
+  tvm::String out_layout;
   DataType out_dtype;
 
   TVM_DECLARE_ATTRS(Conv2DAttrs, "relay.attrs.Conv2DAttrs") {
@@ -681,7 +683,7 @@ struct MaxPool2DAttrs : public tvm::AttrsNode<MaxPool2DAttrs> {
   Array<IndexExpr> pool_size;
   Array<IndexExpr> strides;
   Array<IndexExpr> padding;
-  std::string layout;
+  tvm::String layout;
   bool ceil_mode;
 
   TVM_DECLARE_ATTRS(MaxPool2DAttrs, "relay.attrs.MaxPool2DAttrs") {
@@ -744,7 +746,7 @@ struct AvgPool2DAttrs : public tvm::AttrsNode<AvgPool2DAttrs> {
 
 /*! \brief Attributes for global pool operator */
 struct GlobalPool2DAttrs : public tvm::AttrsNode<GlobalPool2DAttrs> {
-  std::string layout;
+  tvm::String layout;
 
   TVM_DECLARE_ATTRS(GlobalPool2DAttrs, "relay.attrs.GlobalPool2DAttrs") {
     TVM_ATTR_FIELD(layout).set_default("NCHW").describe(

include/tvm/runtime/ndarray.h

@@ -373,8 +373,9 @@ inline ObjectPtr<Object> NDArray::FFIDataFromHandle(TVMArrayHandle handle) {
 inline TVMArrayHandle NDArray::FFIGetHandle(const ObjectRef& nd) {
   // NOTE: it is necessary to cast to container then to base
   //       so that the FFI handle uses the ContainerBase address.
-  return reinterpret_cast<TVMArrayHandle>(static_cast<NDArray::ContainerBase*>(
+  auto ptr = reinterpret_cast<TVMArrayHandle>(static_cast<NDArray::ContainerBase*>(
       static_cast<NDArray::Container*>(const_cast<Object*>(nd.get()))));
+  return ptr;
 }
 
 inline void NDArray::FFIDecRef(TVMArrayHandle handle) {

include/tvm/tir/data_layout.h

@@ -124,6 +124,9 @@ class Layout : public ObjectRef {
  public:
   explicit Layout(const Array<tir::IterVar>& axes);
 
+  /*! \brief construct from a string */
+  Layout(const tvm::String& name) : Layout(name.operator std::string()) {}  // NOLINT(*)
+
   /*! \brief construct from a string */
   Layout(const char* name) : Layout(std::string(name)) {}  // NOLINT(*)
 

rust/tvm-graph-rt/src/graph.rs

@@ -46,8 +46,10 @@ const _NDARRAY_LIST_MAGIC: u64 = 0xF7E5_8D4F_0504_9CB7;
 ///
 /// # Examples
 ///
-/// ```norun
-/// let graph_json = fs::read_to_string("graph.json").unwrap();
+/// ```no_run
+/// use tvm_graph_rt::Graph;
+/// use std::convert::TryFrom;
+/// let graph_json = std::fs::read_to_string("graph.json").unwrap();
 /// let graph = Graph::try_from(&graph_json).unwrap();
 /// ```
 #[derive(Serialize, Deserialize, Debug)]
@@ -147,7 +149,7 @@ impl<'a> TryFrom<&'a str> for Graph {
 ///
 /// # Examples
 ///
-/// ```norun
+/// ```no_compile
 /// use ndarray::Array;
 ///
 /// let syslib = SystemLibModule::default(); // a provider of TVM functions

rust/tvm-graph-rt/src/threading.rs

@@ -215,7 +215,7 @@ pub unsafe extern "C" fn TVMBackendParallelBarrier(
 
 #[cfg(test)]
 mod tests {
-    use std::{ptr, thread, time::Duration};
+    use std::{thread, time::Duration};
 
     use super::*;
 
@@ -228,7 +228,7 @@ mod tests {
         assert_eq!(max_concurrency(), 24);
     }
 
-    extern "C" fn flambda(
+    extern "C" fn _flambda(
         task_id: usize,
         penv: *const TVMParallelGroupEnv,
         cdata: *const c_void,

rust/tvm-macros/Cargo.toml

@@ -34,3 +34,4 @@ goblin = "^0.2"
 proc-macro2 = "^1.0"
 quote = "^1.0"
 syn = { version = "1.0.17", features = ["full", "extra-traits"] }
+proc-macro-error = "^1.0"

rust/tvm-rt/Cargo.toml

@@ -37,6 +37,7 @@ tvm-macros = { version = "0.1", path = "../tvm-macros" }
 paste = "0.1"
 mashup = "0.1"
 once_cell = "^1.3.1"
+memoffset = "0.5.6"
 
 [dev-dependencies]
 anyhow = "^1.0"

rust/tvm-rt/src/array.rs

@@ -117,3 +117,20 @@ impl<'a, T: IsObjectRef> TryFrom<RetValue> for Array<T> {
         })
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::Array;
+    use crate::function::Result;
+    use crate::string::String;
+
+    #[test]
+    fn create_array_and_get() -> Result<()> {
+        let vec: Vec<String> = vec!["foo".into(), "bar".into(), "baz".into()];
+        let array = Array::from_vec(vec)?;
+        assert_eq!(array.get(0)?.to_string(), "foo");
+        assert_eq!(array.get(1)?.to_string(), "bar");
+        assert_eq!(array.get(2)?.to_string(), "baz");
+        Ok(())
+    }
+}

rust/tvm-rt/src/errors.rs

@@ -33,8 +33,6 @@ pub struct TypeMismatchError {
 
 #[derive(Debug, Error)]
 pub enum NDArrayError {
-    #[error("Missing NDArray shape.")]
-    MissingShape,
     #[error("Cannot convert from an empty array.")]
     EmptyArray,
     #[error("Invalid datatype when attempting to convert ndarray.")]