Merge commit '368cbe615d0a7bdaadddcb3bd390abcd4cc17b91'

Author: colesbury

torch/lib/TH/CMakeLists.txt

@@ -6,6 +6,7 @@ IF(POLICY CMP0026)
 ENDIF()
 
 SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+SET(CMAKE_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ ${CMAKE_LIBRARY_PATH})
 
 # Can be compiled standalone
 IF(NOT TH_INSTALL_BIN_SUBDIR

torch/lib/TH/generic/THTensorMath.c

@@ -2074,10 +2074,6 @@ void THTensor_(catArray)(THTensor *result, THTensor **inputs, int numInputs, int
         // accumulate the size over the dimension we want to cat on.
         // Empty tensors are allowed
         dimSize += i < inputs[j]->nDimension ? inputs[j]->size[i] : THMin(inputs[j]->nDimension, 1);
-        if(inputs[j]->nDimension)
-        {
-          allContiguous = allContiguous && THTensor_(isContiguous)(inputs[j]);
-        }
       }
     }
     else
@@ -2108,6 +2104,12 @@ void THTensor_(catArray)(THTensor *result, THTensor **inputs, int numInputs, int
   {
     THTensor_(resize)(result, size, NULL);
 
+    // Check contiguity of all inputs and result
+    for (i = 0; i < numInputs; i++) {
+      if(inputs[i]->nDimension) {
+        allContiguous = allContiguous && THTensor_(isContiguous)(inputs[i]);
+      }
+    }
     allContiguous = allContiguous && THTensor_(isContiguous)(result);
 
     // First path is for contiguous inputs along dim 1