diff options
| author | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2016-02-26 22:20:50 -0800 |
|---|---|---|
| committer | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2016-02-26 22:37:50 -0800 |
| commit | f88073aad81d8119dc9d62f882b8cb6d20c3b7ee (patch) | |
| tree | 117932b2287048e51f93bf93f5139efa93080aad /include | |
| parent | 2cc3844cb2a4a72de10d321781dc8f994bef95c7 (diff) | |
| download | caffeonacl-f88073aad81d8119dc9d62f882b8cb6d20c3b7ee.tar.gz caffeonacl-f88073aad81d8119dc9d62f882b8cb6d20c3b7ee.tar.bz2 caffeonacl-f88073aad81d8119dc9d62f882b8cb6d20c3b7ee.zip | |
Deprecate ForwardPrefilled(), Forward(bottom, loss) in lieu of dropping
Relax removal of `Forward()` variations by deprecating instead.
Diffstat (limited to 'include')
| -rw-r--r-- | include/caffe/net.hpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/caffe/net.hpp b/include/caffe/net.hpp index 1c2a1912..0addb3c2 100644 --- a/include/caffe/net.hpp +++ b/include/caffe/net.hpp @@ -36,6 +36,12 @@ class Net { * */ const vector<Blob<Dtype>*>& Forward(Dtype* loss = NULL); + /// @brief DEPRECATED; use Forward() instead. + const vector<Blob<Dtype>*>& ForwardPrefilled(Dtype* loss = NULL) { + LOG_EVERY_N(WARNING, 1000) << "DEPRECATED: ForwardPrefilled() " + << "will be removed in a future version. Use Forward()."; + return Forward(loss); + } /** * The From and To variants of Forward and Backward operate on the @@ -48,6 +54,9 @@ class Net { Dtype ForwardFromTo(int start, int end); Dtype ForwardFrom(int start); Dtype ForwardTo(int end); + /// @brief DEPRECATED; set input blobs then use Forward() instead. + const vector<Blob<Dtype>*>& Forward(const vector<Blob<Dtype>* > & bottom, + Dtype* loss = NULL); /** * @brief Zeroes out the diffs of all net parameters. |