diff options
author | Sergio Guadarrama <sguada@gmail.com> | 2014-08-09 02:29:05 -0700 |
---|---|---|
committer | Sergio Guadarrama <sguada@gmail.com> | 2014-08-09 02:29:05 -0700 |
commit | c13fded3ac92a4e376e29b6c97332cd4518b4e37 (patch) | |
tree | f865458ed850aed099383415820aa84ae4284195 /matlab | |
parent | c5a1aa51a5737bfac41f521df2decb67ab71f6b4 (diff) | |
parent | c8b6457de5b9ba194c5539c81a05591bca6b3e1b (diff) | |
download | caffeonacl-c13fded3ac92a4e376e29b6c97332cd4518b4e37.tar.gz caffeonacl-c13fded3ac92a4e376e29b6c97332cd4518b4e37.tar.bz2 caffeonacl-c13fded3ac92a4e376e29b6c97332cd4518b4e37.zip |
Merge pull request #888 from ronghanghu/matcaffe-add-check
add necessary input checks for matcaffe
Diffstat (limited to 'matlab')
-rw-r--r-- | matlab/caffe/matcaffe.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/matlab/caffe/matcaffe.cpp b/matlab/caffe/matcaffe.cpp index 5888676c..83786cae 100644 --- a/matlab/caffe/matcaffe.cpp +++ b/matlab/caffe/matcaffe.cpp @@ -50,6 +50,10 @@ static mxArray* do_forward(const mxArray* const bottom) { input_blobs.size()); for (unsigned int i = 0; i < input_blobs.size(); ++i) { const mxArray* const elem = mxGetCell(bottom, i); + CHECK(mxIsSingle(elem)) + << "MatCaffe require single-precision float point data"; + CHECK_EQ(mxGetNumberOfElements(elem), input_blobs[i]->count()) + << "MatCaffe input size does not match the input size of the network"; const float* const data_ptr = reinterpret_cast<const float* const>(mxGetPr(elem)); switch (Caffe::mode()) { |