summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Garvey <darren.garvey@gmail.com>2015-09-02 00:54:06 +0100
committerDarren Garvey <darren.garvey@gmail.com>2015-09-02 01:02:00 +0100
commit6f5812c4547dd912dd0569330ebdd44a5afd278e (patch)
tree1e81794945e942b6afffc665b5219a64d8dce98d
parent6567ce1012351d5a739d683828bc0fce2bfc90e5 (diff)
downloadcaffeonacl-6f5812c4547dd912dd0569330ebdd44a5afd278e.tar.gz
caffeonacl-6f5812c4547dd912dd0569330ebdd44a5afd278e.tar.bz2
caffeonacl-6f5812c4547dd912dd0569330ebdd44a5afd278e.zip
Fix up documentation errors.
Fix some doxygen warnings about an undocumented argument in Blob and incorrect documentation for SoftmaxWithLossLayer::Forward_cpu().
-rw-r--r--include/caffe/blob.hpp2
-rw-r--r--include/caffe/loss_layers.hpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/include/caffe/blob.hpp b/include/caffe/blob.hpp
index 9b813e73..dda7b1f8 100644
--- a/include/caffe/blob.hpp
+++ b/include/caffe/blob.hpp
@@ -109,7 +109,7 @@ class Blob {
* @brief Returns the 'canonical' version of a (usually) user-specified axis,
* allowing for negative indexing (e.g., -1 for the last axis).
*
- * @param index the axis index.
+ * @param axis_index the axis index.
* If 0 <= index < num_axes(), return index.
* If -num_axes <= index <= -1, return (num_axes() - (-index)),
* e.g., the last axis index (num_axes() - 1) if index == -1,
diff --git a/include/caffe/loss_layers.hpp b/include/caffe/loss_layers.hpp
index 02687a94..8d41af34 100644
--- a/include/caffe/loss_layers.hpp
+++ b/include/caffe/loss_layers.hpp
@@ -712,7 +712,6 @@ class SoftmaxWithLossLayer : public LossLayer<Dtype> {
virtual inline int MaxTopBlobs() const { return 2; }
protected:
- /// @copydoc SoftmaxWithLossLayer
virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,
const vector<Blob<Dtype>*>& top);
virtual void Forward_gpu(const vector<Blob<Dtype>*>& bottom,