Address review comments

apache · Apr 13, 2020 · ebba40d · ebba40d
1 parent 4942219
commit ebba40d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/include/tvm/ir/attrs.h b/include/tvm/ir/attrs.h
@@ -86,7 +86,7 @@ namespace tvm {
 template<typename TObjectRef>
 inline TObjectRef NullValue() {
   static_assert(TObjectRef::_type_is_nullable,
-                "Can only value for nullable types");
+                "Can only get NullValue for nullable types");
   return TObjectRef(ObjectPtr<Object>(nullptr));
 }
 

diff --git a/include/tvm/runtime/container.h b/include/tvm/runtime/container.h
@@ -670,6 +670,13 @@ class Optional : public ObjectRef {
     CHECK(data_ != nullptr);
     return T(data_);
   }
+  /*!
+   * \return The contained value if the Optional is not null
+   *         otherwise return the default_value.
+   */
+  T value_or(T default_value) const {
+    return data_ != nullptr ? T(data_) : default_value;
+  }
   /*! \return Whether the container is not nullptr.*/
   explicit operator bool() const {
     return *this != nullptr;

diff --git a/tests/cpp/container_test.cc b/tests/cpp/container_test.cc
@@ -415,6 +415,8 @@ TEST(Optional, Composition) {
   CHECK(opt1 == "xyz");
   CHECK(opt1 != nullptr);
   CHECK(opt0 == nullptr);
+  CHECK(opt0.value_or("abc") == "abc");
+  CHECK(opt1.value_or("abc") == "xyz");
   CHECK(opt0 != opt1);
   CHECK(opt1 == Optional<String>(String("xyz")));
   CHECK(opt0 == Optional<String>(nullptr));
@@ -449,8 +451,8 @@ TEST(Optional, PackedCall) {
     return s;
   };
   auto func = TypedPackedFunc<Optional<String>(Optional<String>, bool)>(tf);
-  func(String("xyz"), false);
-  func(Optional<String>(nullptr), true);
+  CHECK(func(String("xyz"), false) == "xyz");
+  CHECK(func(Optional<String>(nullptr), true) == nullptr);
 
   auto pf = [](TVMArgs args, TVMRetValue* rv) {
     Optional<String> s = args[0];