Responded to final comments

Chillee · Chillee · commit c3bccb953cf7 · 2019-06-25T16:08:58.000-07:00
diff --git a/aten/src/ATen/core/List.h b/aten/src/ATen/core/List.h
@@ -353,7 +353,7 @@ class List final {
    * Appends the given list to the end of the container. Uses at most one memory allocation.
    * May invalidate any references, pointers, or iterators referring to contained elements. Any past-the-end iterators may also be invalidated.
    */
-  void append(ListPtr<T> lst) const;
+  void append(List<T> lst) const;
 
   /**
    * Appends the given element value to the end of the container.
diff --git a/aten/src/ATen/core/List_inl.h b/aten/src/ATen/core/List_inl.h
@@ -182,7 +182,7 @@ void List<T>::push_back(T&& value) const {
 }
 
 template<class T>
-void ListPtr<T>::append(ListPtr<T> b) const {
+void List<T>::append(List<T> b) const {
   if (b.use_count() == 1) {
     impl_->list.insert(impl_->list.end(), make_move_iterator(b.impl_->list.begin()), make_move_iterator(b.impl_->list.end()));
   } else {
diff --git a/torch/csrc/jit/register_prim_ops.cpp b/torch/csrc/jit/register_prim_ops.cpp
@@ -1536,9 +1536,8 @@ int listAdd(Stack& stack) {
 }
 template <class T>
 int listInplaceAdd(Stack& stack) {
-  c10::ListPtr<T> a = c10::make_list<T>();
-  c10::ListPtr<T> b = c10::make_list<T>();
-  pop(stack, a, b);
+  c10::List<T> b = pop(stack).to<List<T>>();
+  c10::List<T> a = pop(stack).to<List<T>>();
   a.append(std::move(b));
   push(stack, std::move(a));
   return 0;
@@ -1925,9 +1924,9 @@ RegisterOperators reg2({
           "[]",                                                                     \
           listAdd<c_type::value_type>),                                             \
       Operator(                                                                     \
-          "aten::add_(" decl_type "[](a!) self, " decl_type "[] b) -> " decl_type           \
+          "aten::add_(" decl_type "[](a!) self, " decl_type "[] b) -> " decl_type   \
           "[]",                                                                     \
-          listInplaceAdd<c_type::value_type>),                                             \
+          listInplaceAdd<c_type::value_type>),                                      \
       Operator(                                                                     \
           "aten::slice(" decl_type                                                  \
           "[] l, int start, int end=9223372036854775807, int step=1) -> " decl_type \
@@ -2081,7 +2080,7 @@ RegisterOperators reg2({
         "prim::min(int[] x) -> int",
         [](Stack& stack) {
           c10::List<int64_t> int_list = pop(stack).toIntList();
-          int64_t min_element = std::numeric_limits<int64_t>::max(); 
+          int64_t min_element = std::numeric_limits<int64_t>::max();
 
           for(int64_t ele: int_list) {
             if(ele < min_element) {

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ void List<T>::push_back(T&& value) const {`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`template<class T>`
`185`		`-void ListPtr<T>::append(ListPtr<T> b) const {`
	`185`	`+void List<T>::append(List<T> b) const {`
`186`	`186`	`if (b.use_count() == 1) {`
`187`	`187`	`impl_->list.insert(impl_->list.end(), make_move_iterator(b.impl_->list.begin()), make_move_iterator(b.impl_->list.end()));`
`188`	`188`	`} else {`