提交 94a6cd57 authored 作者: Gilles Louppe's avatar Gilles Louppe 提交者: Pascal Lamblin

FIX: strip accents

上级 8021da1e
...@@ -199,7 +199,7 @@ void col2im3d(const float* data_col, const int channels, ...@@ -199,7 +199,7 @@ void col2im3d(const float* data_col, const int channels,
// Theano op code // Theano op code
// Authors: Arjun Jain, Frédéric Bastien, Jan Schlüter, Nicolas Ballas // Authors: Arjun Jain, Frederic Bastien, Jan Schluter, Nicolas Ballas
// Reference code: https://github.com/BVLC/caffe/blob/master/src/caffe/layers/conv_layer.cu // Reference code: https://github.com/BVLC/caffe/blob/master/src/caffe/layers/conv_layer.cu
// and https://github.com/torch/cunn/blob/master/SpatialConvolutionMM.cu // and https://github.com/torch/cunn/blob/master/SpatialConvolutionMM.cu
// Adaptation for 3d // Adaptation for 3d
......
...@@ -6,13 +6,13 @@ Copyright (c) 2014, The Regents of the University of California (Regents) ...@@ -6,13 +6,13 @@ Copyright (c) 2014, The Regents of the University of California (Regents)
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met: modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this 1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer. list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice, 2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution. and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
...@@ -158,7 +158,7 @@ void col2im(const float* data_col, const int channels, ...@@ -158,7 +158,7 @@ void col2im(const float* data_col, const int channels,
// Theano op code // Theano op code
// Authors: Arjun Jain, Frédéric Bastien, Jan Schlüter // Authors: Arjun Jain, Frederic Bastien, Jan Schluter
// Reference code: https://github.com/BVLC/caffe/blob/master/src/caffe/layers/conv_layer.cu // Reference code: https://github.com/BVLC/caffe/blob/master/src/caffe/layers/conv_layer.cu
// and https://github.com/torch/cunn/blob/master/SpatialConvolutionMM.cu // and https://github.com/torch/cunn/blob/master/SpatialConvolutionMM.cu
CudaNdarray* corrMM(CudaNdarray *const bottom, CudaNdarray* corrMM(CudaNdarray *const bottom,
...@@ -186,7 +186,7 @@ CudaNdarray* corrMM(CudaNdarray *const bottom, ...@@ -186,7 +186,7 @@ CudaNdarray* corrMM(CudaNdarray *const bottom,
CudaNdarray_HOST_STRIDES(bottom)[3]); CudaNdarray_HOST_STRIDES(bottom)[3]);
return NULL; return NULL;
} }
if (weight->nd != 4) if (weight->nd != 4)
{ {
PyErr_SetString(PyExc_ValueError, "GpuCorrMM requires weight of 4D"); PyErr_SetString(PyExc_ValueError, "GpuCorrMM requires weight of 4D");
...@@ -485,4 +485,3 @@ CudaNdarray* corrMM(CudaNdarray *const bottom, ...@@ -485,4 +485,3 @@ CudaNdarray* corrMM(CudaNdarray *const bottom,
// in here output is just aliased to one of bottom, weights, or top. // in here output is just aliased to one of bottom, weights, or top.
return output; return output;
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论