SINGA-72 Minor updates to be consisten with documentation Update configuration files (e.g., parameter name, file name) for RBM example to be consistent with online documentation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/8e7c6cc1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/8e7c6cc1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/8e7c6cc1 Branch: refs/heads/master Commit: 8e7c6cc18b21e3151fecba605c6e240a3f05aeff Parents: 4e15c34 Author: Wei Wang <[email protected]> Authored: Sun Sep 20 17:49:40 2015 +0800 Committer: Wei Wang <[email protected]> Committed: Sat Sep 26 23:23:33 2015 +0800 ---------------------------------------------------------------------- examples/rbm/autoencoder.conf | 80 ++++++++--------- examples/rbm/rbm0.conf | 107 ----------------------- examples/rbm/rbm1.conf | 49 +++-------- examples/rbm/rbm2.conf | 79 ++++++----------- examples/rbm/rbm3.conf | 79 +++++++---------- examples/rbm/rbm4.conf | 170 +++++++++++++++++++++++++++++++++++++ 6 files changed, 282 insertions(+), 282 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/8e7c6cc1/examples/rbm/autoencoder.conf ---------------------------------------------------------------------- diff --git a/examples/rbm/autoencoder.conf b/examples/rbm/autoencoder.conf index bc32cc7..29f7729 100644 --- a/examples/rbm/autoencoder.conf +++ b/examples/rbm/autoencoder.conf @@ -3,10 +3,10 @@ train_steps: 12200 test_steps:100 test_freq:1000 disp_freq:100 -checkpoint_path: "examples/rbm/rbm0/checkpoint/step6000-worker0.bin" checkpoint_path: "examples/rbm/rbm1/checkpoint/step6000-worker0.bin" checkpoint_path: "examples/rbm/rbm2/checkpoint/step6000-worker0.bin" checkpoint_path: "examples/rbm/rbm3/checkpoint/step6000-worker0.bin" +checkpoint_path: "examples/rbm/rbm4/checkpoint/step6000-worker0.bin" train_one_batch{ alg: kBP } @@ -56,7 +56,7 @@ neuralnet { } layer{ - name: "fc1" + name: "Inner1" type: kInnerProduct srclayers:"mnist" innerproduct_conf{ @@ -66,19 +66,19 @@ neuralnet { name: "w1" } param{ - name: "rb12" + name: "b12" } } layer{ - name: "sigmoid1" + name: "Sigmoid1" type: kSigmoid - srclayers:"fc1" + srclayers:"Inner1" } layer{ - name: "fc2" + name: "Inner2" type: kInnerProduct - srclayers:"sigmoid1" + srclayers:"Sigmoid1" innerproduct_conf{ num_output: 500 } @@ -86,20 +86,20 @@ neuralnet { name: "w2" } param{ - name: "rb22" + name: "b22" } } layer{ - name: "sigmoid2" + name: "Sigmoid2" type: kSigmoid - srclayers:"fc2" + srclayers:"Inner2" } layer{ - name: "fc3" + name: "Inner3" type: kInnerProduct - srclayers:"sigmoid2" + srclayers:"Sigmoid2" innerproduct_conf{ num_output: 250 } @@ -107,20 +107,20 @@ neuralnet { name: "w3" } param{ - name: "rb32" + name: "b32" } } layer{ - name: "sigmoid3" + name: "Sigmoid3" type: kSigmoid - srclayers:"fc3" + srclayers:"Inner3" } layer{ - name: "fc4" + name: "Inner4" type: kInnerProduct - srclayers:"sigmoid3" + srclayers:"Sigmoid3" innerproduct_conf{ num_output: 30 } @@ -128,16 +128,16 @@ neuralnet { name: "w4" } param{ - name: "rb42" + name: "b42" } } layer{ - name: "fc5" + name: "Inner5" type: kInnerProduct - #srclayers:"sigmoid4" - srclayers:"fc4" + #srclayers:"Sigmoid4" + srclayers:"Inner4" innerproduct_conf{ num_output: 250 transpose: true @@ -147,19 +147,19 @@ neuralnet { share_from: "w4" } param{ - name: "rb41" + name: "b41" } } layer{ - name: "sigmoid5" + name: "Sigmoid5" type: kSigmoid - srclayers:"fc5" + srclayers:"Inner5" } layer{ - name: "fc6" + name: "Inner6" type: kInnerProduct - srclayers:"sigmoid5" + srclayers:"Sigmoid5" innerproduct_conf{ num_output: 500 transpose: true @@ -169,19 +169,19 @@ neuralnet { share_from: "w3" } param{ - name: "rb31" + name: "b31" } } layer{ - name: "sigmoid6" + name: "Sigmoid6" type: kSigmoid - srclayers:"fc6" + srclayers:"Inner6" } layer{ - name: "fc7" + name: "Inner7" type: kInnerProduct - srclayers:"sigmoid6" + srclayers:"Sigmoid6" innerproduct_conf{ num_output: 1000 transpose: true @@ -191,20 +191,20 @@ neuralnet { share_from: "w2" } param{ - name: "rb21" + name: "b21" } } layer{ - name: "sigmoid7" + name: "Sigmoid7" type: kSigmoid - srclayers:"fc7" + srclayers:"Inner7" } layer{ - name: "fc8" + name: "Inner8" type: kInnerProduct - srclayers:"sigmoid7" + srclayers:"Sigmoid7" innerproduct_conf{ num_output: 784 transpose: true @@ -214,20 +214,20 @@ neuralnet { share_from: "w1" } param{ - name: "rb11" + name: "b11" } } layer{ - name: "sigmoid8" + name: "Sigmoid8" type: kSigmoid - srclayers:"fc8" + srclayers:"Inner8" } layer{ name: "loss" type:kEuclideanLoss - srclayers:"sigmoid8" + srclayers:"Sigmoid8" srclayers:"mnist" } } http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/8e7c6cc1/examples/rbm/rbm0.conf ---------------------------------------------------------------------- diff --git a/examples/rbm/rbm0.conf b/examples/rbm/rbm0.conf deleted file mode 100644 index dba4f37..0000000 --- a/examples/rbm/rbm0.conf +++ /dev/null @@ -1,107 +0,0 @@ -name: "rbm0" -train_steps: 6000 -test_steps:100 -test_freq:500 -disp_freq: 100 -train_one_batch{ - alg: kCD -} -updater{ - type: kSGD - momentum: 0.8 - weight_decay: 0.0002 - learning_rate{ - base_lr: 0.1 - type: kFixed - } -} - -neuralnet { -layer { - name: "data" - type: kShardData - sharddata_conf { - path: "examples/mnist/mnist_train_shard" - batchsize: 100 - } - exclude: kTest -} - - -layer { - name: "data" - type: kShardData - sharddata_conf { - path: "examples/mnist/mnist_test_shard" - batchsize: 100 - } - exclude: kTrain -} - - -layer{ - name:"mnist" - type: kMnist - srclayers: "data" - mnist_conf { - norm_a: 255 - norm_b: 0 - } -} - -layer{ - name: "RBMVis" - type: kRBMVis - srclayers:"mnist" - srclayers:"RBMHid" - rbm_conf{ - hdim: 1000 - } - param{ - name: "w1" - init{ - type: kGaussian - mean: 0.0 - std: 0.1 - } - } - - param{ - name: "rb11" - wd_scale: 0 - init{ - type: kConstant - value: 0.0 - } - } -} - -layer{ - name: "RBMHid" - type: kRBMHid - srclayers:"RBMVis" - rbm_conf{ - hdim: 1000 - } - param{ - name: "w1_" - share_from: "w1" - } - - param{ - name: "rb12" - wd_scale: 0 - init{ - type: kConstant - value: 0.0 - } - } -} -} -cluster { - nworker_groups: 1 - nserver_groups: 1 - nservers_per_group: 1 - nworkers_per_group: 1 - workspace: "examples/rbm/rbm0/" -} http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/8e7c6cc1/examples/rbm/rbm1.conf ---------------------------------------------------------------------- diff --git a/examples/rbm/rbm1.conf b/examples/rbm/rbm1.conf index ac6c059..d185766 100644 --- a/examples/rbm/rbm1.conf +++ b/examples/rbm/rbm1.conf @@ -6,14 +6,13 @@ disp_freq: 100 train_one_batch{ alg: kCD } -checkpoint_path: "examples/rbm/rbm0/checkpoint/step6000-worker0.bin" updater{ type: kSGD momentum: 0.8 weight_decay: 0.0002 learning_rate{ - base_lr: 0.1 - type: kFixed + base_lr: 0.1 + type: kFixed } } @@ -51,36 +50,15 @@ layer{ } layer{ - name: "fc1" - type: kInnerProduct - srclayers:"mnist" - innerproduct_conf{ - num_output: 1000 - } - param{ - name: "w1" - } - param{ - name: "rb12" - } -} - -layer{ - name: "sigmoid1" - type: kSigmoid - srclayers:"fc1" -} - -layer{ name: "RBMVis" type: kRBMVis - srclayers:"sigmoid1" + srclayers:"mnist" srclayers:"RBMHid" rbm_conf{ - hdim: 500 + hdim: 1000 } param{ - name: "w2" + name: "w1" init{ type: kGaussian mean: 0.0 @@ -89,11 +67,11 @@ layer{ } param{ - name: "rb21" + name: "b11" wd_scale: 0 init{ - type: kConstant - value: 0.0 + type: kConstant + value: 0.0 } } } @@ -103,14 +81,15 @@ layer{ type: kRBMHid srclayers:"RBMVis" rbm_conf{ - hdim: 500 + hdim: 1000 } param{ - name: "w2_" - share_from: "w2" + name: "w1_" + share_from: "w1" } - param{ - name: "rb22" + + param{ + name: "b12" wd_scale: 0 init{ type: kConstant http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/8e7c6cc1/examples/rbm/rbm2.conf ---------------------------------------------------------------------- diff --git a/examples/rbm/rbm2.conf b/examples/rbm/rbm2.conf index 96841ff..8a16e0f 100644 --- a/examples/rbm/rbm2.conf +++ b/examples/rbm/rbm2.conf @@ -7,18 +7,16 @@ train_one_batch{ alg: kCD } checkpoint_path: "examples/rbm/rbm1/checkpoint/step6000-worker0.bin" - updater{ type: kSGD momentum: 0.8 weight_decay: 0.0002 learning_rate{ - base_lr: 0.1 - type: kFixed + base_lr: 0.1 + type: kFixed } } - neuralnet { layer { name: "data" @@ -53,56 +51,36 @@ layer{ } layer{ - name: "fc1" - type: kInnerProduct - srclayers:"mnist" - innerproduct_conf{ - num_output: 1000 - } - param{ - name: "w1" - } - param{ - name: "rb12" - } + name: "Inner1" + type: kInnerProduct + srclayers:"mnist" + innerproduct_conf{ + num_output: 1000 } - - layer{ - name: "sigmoid1" - type: kSigmoid - srclayers:"fc1" + param{ + name: "w1" } + param{ + name: "b12" + } +} layer{ - name: "fc2" - type: kInnerProduct - srclayers:"sigmoid1" - innerproduct_conf{ - num_output: 500 - } - param{ - name: "w2" - } - param{ - name: "rb22" - } - } + name: "Sigmoid1" + type: kSigmoid + srclayers:"Inner1" +} - layer{ - name: "sigmoid2" - type: kSigmoid - srclayers:"fc2" - } layer{ name: "RBMVis" type: kRBMVis - srclayers:"sigmoid2" + srclayers:"Sigmoid1" srclayers:"RBMHid" rbm_conf{ - hdim: 250 + hdim: 500 } param{ - name: "w3" + name: "w2" init{ type: kGaussian mean: 0.0 @@ -111,7 +89,7 @@ layer{ } param{ - name: "rb31" + name: "b21" wd_scale: 0 init{ type: kConstant @@ -125,19 +103,18 @@ layer{ type: kRBMHid srclayers:"RBMVis" rbm_conf{ - hdim: 250 + hdim: 500 } param{ - name: "w3_" - share_from: "w3" + name: "w2_" + share_from: "w2" } - - param{ - name: "rb32" + param{ + name: "b22" wd_scale: 0 init{ - type: kConstant - value: 0.0 + type: kConstant + value: 0.0 } } } http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/8e7c6cc1/examples/rbm/rbm3.conf ---------------------------------------------------------------------- diff --git a/examples/rbm/rbm3.conf b/examples/rbm/rbm3.conf index fa60114..75848d6 100644 --- a/examples/rbm/rbm3.conf +++ b/examples/rbm/rbm3.conf @@ -1,22 +1,24 @@ name: "rbm3" train_steps: 6000 -test_steps: 100 -test_freq: 500 +test_steps:100 +test_freq:500 disp_freq: 100 train_one_batch{ alg: kCD } checkpoint_path: "examples/rbm/rbm2/checkpoint/step6000-worker0.bin" + updater{ - type: kSGD - momentum: 0.8 - weight_decay: 0.0002 - learning_rate{ - base_lr: 0.001 - type: kFixed - } + type: kSGD + momentum: 0.8 + weight_decay: 0.0002 + learning_rate{ + base_lr: 0.1 + type: kFixed + } } + neuralnet { layer { name: "data" @@ -51,7 +53,7 @@ layer{ } layer{ - name: "fc1" + name: "Inner1" type: kInnerProduct srclayers:"mnist" innerproduct_conf{ @@ -61,20 +63,20 @@ layer{ name: "w1" } param{ - name: "rb12" + name: "b12" } } layer{ - name: "sigmoid1" + name: "Sigmoid1" type: kSigmoid - srclayers:"fc1" + srclayers:"Inner1" } layer{ - name: "fc2" + name: "Inner2" type: kInnerProduct - srclayers:"sigmoid1" + srclayers:"Sigmoid1" innerproduct_conf{ num_output: 500 } @@ -82,55 +84,34 @@ layer{ name: "w2" } param{ - name: "rb22" + name: "b22" } } layer{ - name: "sigmoid2" + name: "Sigmoid2" type: kSigmoid - srclayers:"fc2" + srclayers:"Inner2" } - -layer{ - name: "fc3" - type: kInnerProduct - srclayers:"sigmoid2" - innerproduct_conf{ - num_output: 250 - } - param{ - name: "w3" - } - param{ - name: "rb32" - } - } - - layer{ - name: "sigmoid3" - type: kSigmoid - srclayers:"fc3" - } - layer{ name: "RBMVis" type: kRBMVis - srclayers:"sigmoid3" + srclayers:"Sigmoid2" srclayers:"RBMHid" rbm_conf{ - hdim: 30 + hdim: 250 } param{ - name: "w4" + name: "w3" init{ type: kGaussian mean: 0.0 std: 0.1 } } + param{ - name: "rb41" + name: "b31" wd_scale: 0 init{ type: kConstant @@ -144,15 +125,15 @@ layer{ type: kRBMHid srclayers:"RBMVis" rbm_conf{ - hdim: 30 - gaussian: true + hdim: 250 } param{ - name: "w4_" - share_from: "w4" + name: "w3_" + share_from: "w3" } + param{ - name: "rb42" + name: "b32" wd_scale: 0 init{ type: kConstant http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/8e7c6cc1/examples/rbm/rbm4.conf ---------------------------------------------------------------------- diff --git a/examples/rbm/rbm4.conf b/examples/rbm/rbm4.conf new file mode 100644 index 0000000..2b83afb --- /dev/null +++ b/examples/rbm/rbm4.conf @@ -0,0 +1,170 @@ +name: "rbm4" +train_steps: 6000 +test_steps: 100 +test_freq: 500 +disp_freq: 100 +train_one_batch{ + alg: kCD +} +checkpoint_path: "examples/rbm/rbm3/checkpoint/step6000-worker0.bin" +updater{ + type: kSGD + momentum: 0.8 + weight_decay: 0.0002 + learning_rate{ + base_lr: 0.001 + type: kFixed + } +} + +neuralnet { +layer { + name: "data" + type: kShardData + sharddata_conf { + path: "examples/mnist/mnist_train_shard" + batchsize: 100 + } + exclude: kTest +} + + +layer { + name: "data" + type: kShardData + sharddata_conf { + path: "examples/mnist/mnist_test_shard" + batchsize: 100 + } + exclude: kTrain +} + + +layer{ + name:"mnist" + type: kMnist + srclayers: "data" + mnist_conf { + norm_a: 255 + norm_b: 0 + } +} + +layer{ + name: "Inner1" + type: kInnerProduct + srclayers:"mnist" + innerproduct_conf{ + num_output: 1000 + } + param{ + name: "w1" + } + param{ + name: "b12" + } + } + + layer{ + name: "Sigmoid1" + type: kSigmoid + srclayers:"Inner1" + } + +layer{ + name: "Inner2" + type: kInnerProduct + srclayers:"Sigmoid1" + innerproduct_conf{ + num_output: 500 + } + param{ + name: "w2" + } + param{ + name: "b22" + } + } + + layer{ + name: "Sigmoid2" + type: kSigmoid + srclayers:"Inner2" + } + +layer{ + name: "Inner3" + type: kInnerProduct + srclayers:"Sigmoid2" + innerproduct_conf{ + num_output: 250 + } + param{ + name: "w3" + } + param{ + name: "b32" + } + } + + layer{ + name: "Sigmoid3" + type: kSigmoid + srclayers:"Inner3" + } + +layer{ + name: "RBMVis" + type: kRBMVis + srclayers:"Sigmoid3" + srclayers:"RBMHid" + rbm_conf{ + hdim: 30 + } + param{ + name: "w4" + init{ + type: kGaussian + mean: 0.0 + std: 0.1 + } + } + param{ + name: "b41" + wd_scale: 0 + init{ + type: kConstant + value: 0.0 + } + } +} + +layer{ + name: "RBMHid" + type: kRBMHid + srclayers:"RBMVis" + rbm_conf{ + hdim: 30 + gaussian: true + } + param{ + name: "w4_" + share_from: "w4" + } + param{ + name: "b42" + wd_scale: 0 + init{ + type: kConstant + value: 0.0 + } + } +} +} +cluster { + nworker_groups: 1 + nserver_groups: 1 + nservers_per_group: 1 + nworkers_per_group: 1 + workspace: "examples/rbm/rbm4/" +}
