explicit Ptr constructors, fast transposed copy.

Author: gchanan

tools/cwrap/plugins/Broadcast.py

@@ -47,16 +47,16 @@ class Broadcast(CWrapPlugin):
     def getPreArgStringTemplate(self, type=None):
         if type == None:
             ret = """THTensor *${arg_op_other}_save = ${arg_op_other};
-                     THTensorPtr ${arg_op_other}_guard = THTensor_(new)(LIBRARY_STATE_NOARGS);\n"""
+                     THTensorPtr ${arg_op_other}_guard(THTensor_(new)(LIBRARY_STATE_NOARGS));\n"""
         else:
             tensor_type = "TH" + type + "Tensor"
             cuda_tensor_type = "THCuda" + type + "Tensor"
             ret = ("#if !IS_CUDA\n" +
                   tensor_type + " *${arg_op_other}_save = ${arg_op_other};\n" +
-                  tensor_type + "Ptr ${arg_op_other}_guard = " + tensor_type + "_new(LIBRARY_STATE_NOARGS);\n" +
+                  tensor_type + "Ptr ${arg_op_other}_guard(" + tensor_type + "_new(LIBRARY_STATE_NOARGS));\n" +
                   "#else\n" +
                   cuda_tensor_type + " *${arg_op_other}_save = ${arg_op_other};\n" +
-                  "THPPointer<"  + cuda_tensor_type + "> ${arg_op_other}_guard = " + cuda_tensor_type + "_new(LIBRARY_STATE_NOARGS);\n" +
+                  "THPPointer<"  + cuda_tensor_type + "> ${arg_op_other}_guard (" + cuda_tensor_type + "_new(LIBRARY_STATE_NOARGS));\n" +
                   "#endif\n")
         return Template(ret)
 
@@ -85,13 +85,13 @@ def getPreArgStringTemplate(self, type=None):
            long ${arg_op_a}_dim${idx}_size = THTensor_(size)(LIBRARY_STATE ${arg_op_dim}, ${arg_op_dim_value});\n""")
 
     OUT_PLACE_PRE_EXPAND1_DIM_TEMPLATE = Template(
-        """THLongStoragePtr ${arg_op_a}_storage = THLongStorage_newWithSize1(${arg_op_a}_dim0_size);\n""")
+        """THLongStoragePtr ${arg_op_a}_storage(THLongStorage_newWithSize1(${arg_op_a}_dim0_size));\n""")
 
     OUT_PLACE_PRE_EXPAND2_DIM_TEMPLATE = Template(
-        """THLongStoragePtr ${arg_op_a}_storage = THLongStorage_newWithSize2(${arg_op_a}_dim0_size, ${arg_op_a}_dim1_size);\n""")
+        """THLongStoragePtr ${arg_op_a}_storage(THLongStorage_newWithSize2(${arg_op_a}_dim0_size, ${arg_op_a}_dim1_size));\n""")
 
     OUT_PLACE_PRE_EXPAND3_DIM_TEMPLATE = Template(
-        """THLongStoragePtr ${arg_op_a}_storage = THLongStorage_newWithSize3(${arg_op_a}_dim0_size, ${arg_op_a}_dim1_size, ${arg_op_a}_dim2_size);\n""")
+        """THLongStoragePtr ${arg_op_a}_storage(THLongStorage_newWithSize3(${arg_op_a}_dim0_size, ${arg_op_a}_dim1_size, ${arg_op_a}_dim2_size));\n""")
 
     OUT_PLACE_PRE_EXPAND_POST_DIM_TEMPLATE = Template(
         """if (!THTensor_(expand)(LIBRARY_STATE ${arg_op_a}_guard.get(), ${arg_op_a}, ${arg_op_a}_storage, ${raise_errors})) {

torch/csrc/Module.cpp

@@ -482,7 +482,7 @@ PyObject *THPModule_inferSize(PyObject *_unused, PyObject *args)
   THLongStorage *size1 = size1_guard.get();
   THLongStoragePtr size2_guard = THPUtils_unpackSize(arg2);
   THLongStorage *size2 = size2_guard.get();
-  THLongStoragePtr sizes_guard = THLongStorage_new();
+  THLongStoragePtr sizes_guard(THLongStorage_new());
   THLongStorage *sizes = sizes_guard.get();
 
   THLongStorage_inferSize2(sizes, size1->data, size1->size, size2->data, size2->size, 1);

torch/csrc/copy_utils.h

@@ -96,7 +96,7 @@ void THPInsertTensorCopyFunction(
     TensorSrc* src = THPTypeInfo<TensorSrc>::cdata(src_);
 
     TensorSrc *src_save = src;
-    THPPointer<TensorSrc> src_guard = newForExpand<TensorSrc>(LIBRARY_STATE_NOARGS);
+    THPPointer<TensorSrc> src_guard(newForExpand<TensorSrc>(LIBRARY_STATE_NOARGS));
 
     int ret = expand_inplace1<TensorSrc, TensorDst>(LIBRARY_STATE src_guard.get(), src, dst, "src", "dst", true);
     if (ret == 0) {

torch/csrc/expand_utils.h

@@ -59,7 +59,7 @@ int expand_inplace1(LIBRARY_STATE_TYPE ExpandType *r, ExpandType *to_expand, Ten
   ptrdiff_t to_expand_nElem = THSize_nElement(to_expand->nDimension, to_expand->size);
   ptrdiff_t tensor_nElem = THSize_nElement(tensor->nDimension, tensor->size);
   bool to_expand_raise = !fallback || (to_expand_nElem != tensor_nElem);
-  THLongStoragePtr tensor_size = THLongStorage_newWithSize(tensor->nDimension);
+  THLongStoragePtr tensor_size(THLongStorage_newWithSize(tensor->nDimension));
   THLongStorage_rawCopy(tensor_size.get(), tensor->size);
 
   int ret = expand_inplace(LIBRARY_STATE r, to_expand, tensor, to_expand_name, tensor_name, fallback,
@@ -80,7 +80,7 @@ int expand_inplace2(LIBRARY_STATE_TYPE TensorType *r1, TensorType *r2,
   ptrdiff_t to_expand2_nElem = THSize_nElement(to_expand2->nDimension, to_expand2->size);
   bool to_expand1_raise = !fallback || (tensor_nElem != to_expand1_nElem);
   bool to_expand2_raise = !fallback || (tensor_nElem != to_expand2_nElem);
-  THLongStoragePtr tensor_size = THLongStorage_newWithSize(tensor->nDimension);
+  THLongStoragePtr tensor_size(THLongStorage_newWithSize(tensor->nDimension));
   THLongStorage_rawCopy(tensor_size.get(), tensor->size);
 
   int ret = expand_inplace(LIBRARY_STATE r1, to_expand1, tensor, to_expand1_name, tensor_name, fallback,

torch/csrc/generic/Tensor.cpp

@@ -827,7 +827,7 @@ void THPTensor_(initCopyMethods)()
 {
   auto& h = THTensor_(copy_functions);
   // copy from same type
-  THPInsertCopyFunction(h, &THTensor_(copy));
+  THPInsertTensorCopyFunction(h, &THTensor_(copy));
   // copy from CPU types
   THPInsertTensorCopyFunction(h, &THTensor_(copyByte));
   THPInsertTensorCopyFunction(h, &THTensor_(copyChar));

torch/csrc/generic/methods/TensorApply.cwrap

@@ -59,7 +59,7 @@ static PyObject * THPTensor_(map)(THPTensor *self, PyObject *args)
   THTensor *src = src_object->cdata;
 
   THTensor *src_save = src;
-  THTensorPtr src_guard = THTensor_(new)(LIBRARY_STATE_NOARGS);
+  THTensorPtr src_guard(THTensor_(new)(LIBRARY_STATE_NOARGS));
 
   int ret = expand_inplace1<THTensor, THTensor>(src_guard.get(), src, tensor, "src", "tensor", true);
   if (ret == 0) {
@@ -108,9 +108,9 @@ static PyObject * THPTensor_(map2)(THPTensor *self, PyObject *args)
   THTensor *src2 = src2_object->cdata;
 
   THTensor *src1_save = src1;
-  THTensorPtr src1_guard = THTensor_(new)(LIBRARY_STATE_NOARGS);
+  THTensorPtr src1_guard(THTensor_(new)(LIBRARY_STATE_NOARGS));
   THTensor *src2_save = src2;
-  THTensorPtr src2_guard = THTensor_(new)(LIBRARY_STATE_NOARGS);
+  THTensorPtr src2_guard(THTensor_(new)(LIBRARY_STATE_NOARGS));
 
   int ret = expand_inplace2<THTensor>(src1_guard.get(), src2_guard.get(), src1, src2, tensor, "src1", "src2", "tensor", true);
   if (ret == 0) {