Brutex
/
cavis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add thousand-separator commas to TotalParams (#7915) 

* Add thousand-separator commas to TotalParams

The number of parameters can be quite large, and it would help the reading of the summary printout to have the TotalParams column & values at the bottom have thousand-separator-commas in them.

* Add thousand-separator commas to MultiLayerNetwork

Corresponding change to MultiLayerNetwork

Signed-off-by: Jxtps Jxtps <jxtps435@gmail.com>
master
jxtps 2019-06-18 20:22:07 -07:00 committed by Alex Black
parent 68ea5f3688
commit 2a1ea24781
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/ComputationGraph.java
View File

@ -4265,7 +4265,7 @@ public class ComputationGraph implements Serializable, Model, NeuralNetwork {
Layer currentLayer = ((LayerVertex) currentVertex).getLayer(); Layer currentLayer = ((LayerVertex) currentVertex).getLayer();
classNameArr = currentLayer.getClass().getName().split("\\."); classNameArr = currentLayer.getClass().getName().split("\\.");
className = classNameArr[classNameArr.length - 1]; className = classNameArr[classNameArr.length - 1];
paramCount = String.valueOf(currentLayer.numParams()); paramCount = String.format("%,d", currentLayer.numParams());
//layer with params //layer with params
if (currentLayer.numParams() > 0) { if (currentLayer.numParams() > 0) {
paramShape = ""; paramShape = "";
@ -4372,9 +4372,9 @@ public class ComputationGraph implements Serializable, Model, NeuralNetwork {
} }
ret.append(StringUtils.repeat("-", totalLength)) ret.append(StringUtils.repeat("-", totalLength))
.append(String.format("\n%30s %d", "Total Parameters: ", params().length())) .append(String.format("\n%30s %,d", "Total Parameters: ", params().length()))
.append(String.format("\n%30s %d", "Trainable Parameters: ", params().length() - frozenParams)) .append(String.format("\n%30s %,d", "Trainable Parameters: ", params().length() - frozenParams))
.append(String.format("\n%30s %d", "Frozen Parameters: ", frozenParams)) .append(String.format("\n%30s %,d", "Frozen Parameters: ", frozenParams))
.append("\n") .append("\n")
.append(StringUtils.repeat("=", totalLength)) .append(StringUtils.repeat("=", totalLength))
.append("\n"); .append("\n");

8
deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/multilayer/MultiLayerNetwork.java
View File

@ -3553,7 +3553,7 @@ public class MultiLayerNetwork implements Serializable, Classifier, Layer, Neura
String out = "-"; String out = "-";
String[] classNameArr = currentLayer.getClass().getName().split("\\."); String[] classNameArr = currentLayer.getClass().getName().split("\\.");
String className = classNameArr[classNameArr.length - 1]; String className = classNameArr[classNameArr.length - 1];
String paramCount = String.valueOf(currentLayer.numParams()); String paramCount = String.format("%,d", currentLayer.numParams());
String inShape = ""; String inShape = "";
String outShape = ""; String outShape = "";
InputPreProcessor preProcessor; InputPreProcessor preProcessor;
@ -3640,9 +3640,9 @@ public class MultiLayerNetwork implements Serializable, Classifier, Layer, Neura
} }
ret.append(StringUtils.repeat("-", totalLength)); ret.append(StringUtils.repeat("-", totalLength));
ret.append(String.format("\n%30s %d", "Total Parameters: ", params().length())); ret.append(String.format("\n%30s %,d", "Total Parameters: ", params().length()));
ret.append(String.format("\n%30s %d", "Trainable Parameters: ", params().length() - frozenParams)); ret.append(String.format("\n%30s %,d", "Trainable Parameters: ", params().length() - frozenParams));
ret.append(String.format("\n%30s %d", "Frozen Parameters: ", frozenParams)); ret.append(String.format("\n%30s %,d", "Frozen Parameters: ", frozenParams));
ret.append("\n"); ret.append("\n");
ret.append(StringUtils.repeat("=", totalLength)); ret.append(StringUtils.repeat("=", totalLength));
ret.append("\n"); ret.append("\n");