You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@singa.apache.org by wa...@apache.org on 2015/10/18 16:47:15 UTC
[2/2] incubator-singa git commit: SINGA-91 - Add SoftmaxLayer and
ArgSortLayer
SINGA-91 - Add SoftmaxLayer and ArgSortLayer
cpplint checked
make documentation in job.conf more clear
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/0a228c8c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/0a228c8c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/0a228c8c
Branch: refs/heads/master
Commit: 0a228c8ccd44a95c58ae0a661966f7acbed2c11d
Parents: ef9a111
Author: wang sheng <wa...@gmail.com>
Authored: Sun Oct 18 15:24:09 2015 +0800
Committer: wang sheng <wa...@gmail.com>
Committed: Sun Oct 18 16:28:20 2015 +0800
----------------------------------------------------------------------
examples/cifar10/job.conf | 3 ++-
include/singa/neuralnet/neuron_layer/argsort.h | 2 +-
include/singa/neuralnet/neuron_layer/softmax.h | 2 +-
src/neuralnet/neuron_layer/argsort.cc | 3 +--
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/0a228c8c/examples/cifar10/job.conf
----------------------------------------------------------------------
diff --git a/examples/cifar10/job.conf b/examples/cifar10/job.conf
index a1fefd8..31966fa 100644
--- a/examples/cifar10/job.conf
+++ b/examples/cifar10/job.conf
@@ -241,7 +241,8 @@ neuralnet {
srclayers:"ip1"
srclayers: "data"
}
-# uncomment "output" layer and comment "loss" layer to extract features from argsort
+# uncomment "softmax", "argsort", "output" layer and comment "loss" layer
+# to extract features from argsort
# layer {
# name : "output"
# type: kCSVOutput
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/0a228c8c/include/singa/neuralnet/neuron_layer/argsort.h
----------------------------------------------------------------------
diff --git a/include/singa/neuralnet/neuron_layer/argsort.h b/include/singa/neuralnet/neuron_layer/argsort.h
index 1135aa1..1ab1d4b 100644
--- a/include/singa/neuralnet/neuron_layer/argsort.h
+++ b/include/singa/neuralnet/neuron_layer/argsort.h
@@ -48,5 +48,5 @@ class ArgSortLayer : public NeuronLayer {
int batchsize_, dim_;
int topk_;
};
-} /* singa */
+} // namespace singa
#endif // SINGA_NEURALNET_NEURON_LAYER_ARGSORT_H_
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/0a228c8c/include/singa/neuralnet/neuron_layer/softmax.h
----------------------------------------------------------------------
diff --git a/include/singa/neuralnet/neuron_layer/softmax.h b/include/singa/neuralnet/neuron_layer/softmax.h
index 6132411..cffae21 100644
--- a/include/singa/neuralnet/neuron_layer/softmax.h
+++ b/include/singa/neuralnet/neuron_layer/softmax.h
@@ -36,5 +36,5 @@ class SoftmaxLayer : public NeuronLayer {
void ComputeFeature(int flag, const vector<Layer*>& srclayers) override;
void ComputeGradient(int flag, const vector<Layer*>& srclayers) override;
};
-} /* singa */
+} // namespace singa
#endif // SINGA_NEURALNET_NEURON_LAYER_SOFTMAX_H_
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/0a228c8c/src/neuralnet/neuron_layer/argsort.cc
----------------------------------------------------------------------
diff --git a/src/neuralnet/neuron_layer/argsort.cc b/src/neuralnet/neuron_layer/argsort.cc
index a515485..d0e7f36 100644
--- a/src/neuralnet/neuron_layer/argsort.cc
+++ b/src/neuralnet/neuron_layer/argsort.cc
@@ -19,7 +19,6 @@
*
*************************************************************/
-
#include "singa/neuralnet/neuron_layer/argsort.h"
#include <algorithm>
@@ -54,4 +53,4 @@ void ArgSortLayer::ComputeFeature(int flag,
}
}
-} /* singa */
+} // namespace singa