Merge commit '906c550e1079e9762194db59440a202ffca90dca'

Author: soumith

torch/lib/THNN/generic/SparseLinear.c

@@ -234,7 +234,7 @@ void THNN_(SparseLinear_accGradParameters)(
 
  // gradBias += gradOutput
  THTensor* buf = THTensor_(new)();
- THTensor_(sum)(buf, gradOutput, 0);
+ THTensor_(sum)(buf, gradOutput, 0, 1);
  THTensor_(cadd)(gradBias, gradBias, scale, buf);
  THTensor_(free)(buf);
  THLongTensor_free(csc);

torch/lib/THNN/generic/TemporalSubSampling.c

@@ -70,7 +70,7 @@ void THNN_(TemporalSubSampling_updateOutput)(
  {
  THTensor_(narrow)(inputWindow, input, 0, k*dW, kW);
  THTensor_(select)(outputFrame, output, 0, k);
- THTensor_(sum)(outputFrame, inputWindow, 0);
+ THTensor_(sum)(outputFrame, inputWindow, 0, 1);
  THTensor_(cmul)(outputFrame, outputFrame, weight);
  THTensor_(cadd)(outputFrame, outputFrame, 1, bias);
  }
@@ -143,7 +143,7 @@ void THNN_(TemporalSubSampling_accGradParameters)(
  {
  THTensor_(narrow)(inputWindow, input, 0, k*dW, kW);
  THTensor_(select)(gradOutputFrame, gradOutput, 0, k);
- THTensor_(sum)(buffer, inputWindow, 0);
+ THTensor_(sum)(buffer, inputWindow, 0, 1);
  THTensor_(addcmul)(gradWeight, gradWeight, scale, buffer, gradOutputFrame);
  THTensor_(cadd)(gradBias, gradBias, scale, gradOutputFrame);
  }