Merge commit '4bef5f5ff97c0b02b9125caf3e68008573c25dd7'

Author: soumith

torch/lib/TH/THStorage.c

@@ -132,6 +132,16 @@ int THLongStorage_inferExpandGeometry(long *tensorSizes, long *tensorStrides, lo
  long stride = (dim >= 0) ?
  tensorStrides[dim] : expandedSizesCalc[i + 1] * expandedStridesCalc[i+1];
  long targetSize = THLongStorage_data(sizes)[i];
+ if (targetSize == -1) {
+ if (dim < 0) {
+ THFree(expandedSizesCalc);
+ THFree(expandedStridesCalc);
+ snprintf(error_buffer, buffer_len, "The expanded size of the tensor (%ld) isn't allowed in a leading, non-existing dimension %ld.", targetSize, i);
+ return -1;
+ } else {
+ targetSize = size;
+ }
+ }
  if (size != targetSize) {
  if (size == 1) {
  size = targetSize;