Merge commit 'dc5854477951765f5edbac34b0c228449de1b56b'

Author: soumith

torch/lib/THC/generic/THCTensorMathBlas.cu

@@ -492,13 +492,15 @@ THCTensor_(baddbmm)(THCState *state, THCTensor *result, real beta, THCTensor *t,
  ldc = result_->stride[2];
  }
 
- if (batch1->stride[transpose_result ? 2 : 1] == 1)
+ if (batch1->stride[transpose_result ? 2 : 1] == 1 && 
+ batch1->stride[transpose_result ? 1 : 2] != 0)
  {
  transpose_batch1 = 'n';
  batch1_ = batch1;
  lda = batch1_->stride[transpose_result ? 1 : 2];
  }
- else if (batch1->stride[transpose_result ? 1 : 2] == 1)
+ else if (batch1->stride[transpose_result ? 1 : 2] == 1 && 
+ batch1->stride[transpose_result ? 2 : 1] != 0)
  {
  transpose_batch1 = 't';
  batch1_ = batch1;
@@ -511,13 +513,15 @@ THCTensor_(baddbmm)(THCState *state, THCTensor *result, real beta, THCTensor *t,
  lda = batch1_->stride[1];
  }
 
- if (batch2->stride[transpose_result ? 2 : 1] == 1)
+ if (batch2->stride[transpose_result ? 2 : 1] == 1 && 
+ batch2->stride[transpose_result ? 1 : 2] != 0)
  {
  transpose_batch2 = 'n';
  batch2_ = batch2;
  ldb = batch2_->stride[transpose_result ? 1 : 2];
  }
- else if (batch2->stride[transpose_result ? 1 : 2] == 1)
+ else if (batch2->stride[transpose_result ? 1 : 2] == 1 &&
+ batch2->stride[transpose_result ? 2 : 1] != 0)
  {
  transpose_batch2 = 't';
  batch2_ = batch2;
@@ -529,7 +533,6 @@ THCTensor_(baddbmm)(THCState *state, THCTensor *result, real beta, THCTensor *t,
  batch2_ = THCTensor_(newContiguous)(state, batch2);
  ldb = batch2_->stride[1];
  }
-
  long num_batches = result_->size[0];
 
 #if defined(THC_REAL_IS_FLOAT) || defined(THC_REAL_IS_DOUBLE)