diff options
| author | Yangqing Jia <jiayq84@gmail.com> | 2018-08-10 11:04:12 -0700 |
|---|---|---|
| committer | Facebook Github Bot <facebook-github-bot@users.noreply.github.com> | 2018-08-10 11:10:26 -0700 |
| commit | 40109b16d0df8248bc01ad08c7ab615310c52d67 (patch) | |
| tree | f3849c5d9c149503027e2526089c8ca3ebc70925 /caffe2/image | |
| parent | 018790cd4ba61b7410fa0b4dd71af01b4810c550 (diff) | |
| download | pytorch-40109b16d0df8248bc01ad08c7ab615310c52d67.tar.gz pytorch-40109b16d0df8248bc01ad08c7ab615310c52d67.tar.bz2 pytorch-40109b16d0df8248bc01ad08c7ab615310c52d67.zip | |
Remove caffe1 specific proto (#10380)
Summary:
This was used as a convenient way for us to convert c1 models. Now that conversion is more or less done, we should probably require any users who need to convert c1 models to explicitly install c1. This PR removes the explicit c1 proto (which was copied from c1) in favor of explicit installation.
Note that caffe_translator would still work properly, only difference is that now users need to install c1 separately.
Pull Request resolved: https://github.com/pytorch/pytorch/pull/10380
Differential Revision: D9267981
Pulled By: Yangqing
fbshipit-source-id: a6ce5d9463e6567976da83f2d08b2c3d94d14390
Diffstat (limited to 'caffe2/image')
| -rw-r--r-- | caffe2/image/image_input_op.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/caffe2/image/image_input_op.h b/caffe2/image/image_input_op.h index 97b942d924..fcdd086137 100644 --- a/caffe2/image/image_input_op.h +++ b/caffe2/image/image_input_op.h @@ -8,8 +8,8 @@ #include <algorithm> #include "caffe2/core/common.h" -#include "caffe/proto/caffe.pb.h" #include "caffe2/core/db.h" +#include "caffe2/proto/caffe2_legacy.pb.h" #include "caffe2/utils/cast.h" #include "caffe2/utils/math.h" #include "caffe2/utils/thread_pool.h" @@ -451,7 +451,7 @@ bool ImageInputOp<Context>::GetImageAndLabelAndInfoFromDBValue( info = default_arg_; if (use_caffe_datum_) { // The input is a caffe datum format. - caffe::Datum datum; + CaffeDatum datum; CAFFE_ENFORCE(datum.ParseFromString(value)); prefetched_label_.mutable_data<int>()[item_id] = datum.label(); |