Merge pull request #118 from iotamudelta/master

Merge from upstream

Author: iotamudelta

.jenkins/caffe2/build.sh

@@ -217,7 +217,7 @@ if [[ -z "$INTEGRATED" ]]; then
 
 else
 
-  sudo FULL_CAFFE2=1 python setup.py install
+  FULL_CAFFE2=1 python setup.py install --user
   # TODO: I'm not sure why this is necessary
   cp -r torch/lib/tmp_install $INSTALL_PREFIX
 

CMakeLists.txt

@@ -288,11 +288,6 @@ include_directories(BEFORE ${PROJECT_BINARY_DIR})
 
 include_directories(BEFORE ${PROJECT_SOURCE_DIR}/aten/src/)
 
-# ---[ Old caffe protobuf
-if(BUILD_CAFFE2)
-  add_subdirectory(caffe/proto)
-endif()
-
 # ---[ Main build
 add_subdirectory(caffe2)
 

aten/src/ATen/CMakeLists.txt

@@ -251,6 +251,7 @@ IF(USE_CUDA AND NOT USE_ROCM)
   ENDIF(USE_MAGMA)
   IF ($ENV{ATEN_STATIC_CUDA})
     list(APPEND ATen_CUDA_DEPENDENCY_LIBS "${CUDA_TOOLKIT_ROOT_DIR}/lib64/libculibos.a")
+    list(APPEND ATen_CUDA_DEPENDENCY_LIBS "${CUDA_TOOLKIT_ROOT_DIR}/lib64/libcudart_static.a")
   ENDIF($ENV{ATEN_STATIC_CUDA})
 ENDIF()
 

aten/src/ATen/CPUApplyUtils.h

@@ -57,7 +57,7 @@ inline void _setup_arrays(Tensor& tensor, Arg* iter) {
   for (int64_t i = 0; i < max_dim; i++) {
     int64_t size = tensor.size(i);
     int64_t stride = tensor.stride(i);
-    while (i + 1 < max_dim &&
+    while (tensor.stride(i) > 0 && i + 1 < max_dim &&
            (tensor.size(i + 1) == 1 ||
             tensor.stride(i) == tensor.size(i + 1) * tensor.stride(i + 1))) {
       size = size * tensor.size(i + 1);

aten/src/ATen/Declarations.cwrap

@@ -58,7 +58,7 @@
         - THStorage* source
         - long storage_offset
         - IntListSize size
-        - arg: IntListStride stride
+        - arg: IntList stride
           default: {}
 ]]
 [[
@@ -3408,13 +3408,13 @@
     - cname: newWithSize
       arguments:
         - IntListSize size
-        - arg: IntListStride stride
+        - IntList stride
     - cname: newWithStorage
       arguments:
         - THStorage* storage
         - int64_t storageOffset
         - IntListSize size
-        - arg: IntListStride stride
+        - arg: IntList stride
           default: {}
 ]]
 

aten/src/ATen/Device.cpp

@@ -75,12 +75,12 @@ Device::Device(const std::string& device_string) : Device(Type::CPU) {
   }
 }
 
-} // namespace at
-
 std::ostream& operator<<(std::ostream& stream, const at::Device& device) {
   stream << device.type();
   if (device.has_index()) {
     stream << ":" << device.index();
   }
   return stream;
 }
+
+} // namespace at

aten/src/ATen/Device.h

@@ -111,10 +111,12 @@ struct Device {
   DeviceType type_;
   int32_t index_ = -1;
 };
-} // namespace at
 
 AT_API std::ostream& operator<<(std::ostream& stream, const at::Device& device);
 
+} // namespace at
+
+
 namespace std {
   template<> struct hash<at::Device>
   {

aten/src/ATen/Layout.h

@@ -20,7 +20,6 @@ inline Layout layout_from_backend(Backend backend) {
       return Layout::Strided;
   }
 }
-} // namespace at
 
 inline std::ostream& operator<<(std::ostream& stream, at::Layout layout) {
   switch (layout) {
@@ -32,3 +31,5 @@ inline std::ostream& operator<<(std::ostream& stream, at::Layout layout) {
       AT_ERROR("Unknown layout");
   }
 }
+
+} // namespace at

aten/src/ATen/THSizeStrideCompat.h

@@ -5,6 +5,9 @@
 namespace at {
 
 bool TensorGeometry::is_contiguous() const {
+  if (numel_ == 0) {
+    return true;
+  }
   int64_t dim = sizes_.size();
   int64_t expected_stride = 1;
   for (int64_t i = dim - 1; i >= 0; i--) {