Merge commit 'eccc759c36a4023357c87fde79732e4c916676d2'

Author: soumith

torch/lib/TH/generic/THTensor.c

@@ -315,65 +315,6 @@ void THTensor_(expand)(THTensor *r, THTensor *tensor, THLongStorage *sizes) {
   THFree(expandedStrides);
 }
 
-void THTensor_(expand2)(THTensor *ra, THTensor *rb, THTensor *opa, THTensor *opb) {
-  THArgCheck(THTensor_(nDimension)(opa) > 0, 0, "can't expand empty tensor opa");
-  THArgCheck(THTensor_(nDimension)(opb) > 0, 0, "can't expand empty tensor opb");
-
-  THLongStorage *sizes = THLongStorage_new();
-  char error_buffer[1024];
-  int ret =THLongStorage_inferSize2(sizes,
-                                    opa->size, THTensor_(nDimension)(opa),
-                                    opb->size, THTensor_(nDimension)(opb),
-                                    error_buffer, 1024);
-  if (ret != 0) {
-    THLongStorage_free(sizes);
-    THError(error_buffer);
-    return;
-  }
-
-  THTensor_(expand)(ra, opa, sizes);
-  THTensor_(expand)(rb, opb, sizes);
-
-  THLongStorage_free(sizes);
-}
-
-void THTensor_(expand3)(THTensor *ra, THTensor *rb, THTensor *rc, THTensor *opa, THTensor *opb, THTensor *opc) {
-  THArgCheck(THTensor_(nDimension)(opa) > 0, 0, "can't expand empty tensor opa");
-  THArgCheck(THTensor_(nDimension)(opb) > 0, 0, "can't expand empty tensor opb");
-  THArgCheck(THTensor_(nDimension)(opc) > 0, 0, "can't expand empty tensor opc");
-
-  long *op_sizes[3];
-  long op_dims[3];
-
-  op_sizes[ 0 ] = opa->size;
-  op_sizes[ 1 ] = opb->size;
-  op_sizes[ 2 ] = opc->size;
-  op_dims[ 0 ] = opa->nDimension;
-  op_dims[ 1 ] = opb->nDimension;
-  op_dims[ 2 ] = opc->nDimension;
-
-  THLongStorage *sizes = THLongStorage_new();
-  char error_buffer[1024];
-  int ret = THLongStorage_inferSizeN(sizes,
-                                     3,
-                                     op_sizes,
-                                     op_dims,
-                                     error_buffer,
-                                     1024);
-
-  if(ret != 0) {
-    THLongStorage_free(sizes);
-    THError(error_buffer);
-    return;
-  }
-
-  THTensor_(expand)(ra, opa, sizes);
-  THTensor_(expand)(rb, opb, sizes);
-  THTensor_(expand)(rc, opc, sizes);
-
-  THLongStorage_free(sizes);
-}
-
 void THTensor_(set)(THTensor *self, THTensor *src)
 {
   if(self != src)

torch/lib/TH/generic/THTensor.h

@@ -74,8 +74,6 @@ TH_API THTensor *THTensor_(newView)(THTensor *tensor, THLongStorage *size);
 TH_API THTensor *THTensor_(newExpand)(THTensor *tensor, THLongStorage *size);
 
 TH_API void THTensor_(expand)(THTensor *r, THTensor *tensor, THLongStorage *size);
-TH_API void THTensor_(expand2)(THTensor *ra, THTensor *rb, THTensor *opa, THTensor *opb);
-TH_API void THTensor_(expand3)(THTensor *ra, THTensor *rb, THTensor *rc, THTensor *opa, THTensor *opb, THTensor *opc);
 
 TH_API void THTensor_(resize)(THTensor *tensor, THLongStorage *size, THLongStorage *stride);
 TH_API void THTensor_(resizeAs)(THTensor *tensor, THTensor *src);