You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@singa.apache.org by bu...@apache.org on 2015/07/23 08:29:52 UTC
svn commit: r959260 - in /websites/staging/singa/trunk/content: ./
docs/cnn.html docs/mlp.html docs/programmer-guide.html quick-start.html
Author: buildbot
Date: Thu Jul 23 06:29:52 2015
New Revision: 959260
Log:
Staging update by buildbot for singa
Modified:
websites/staging/singa/trunk/content/ (props changed)
websites/staging/singa/trunk/content/docs/cnn.html
websites/staging/singa/trunk/content/docs/mlp.html
websites/staging/singa/trunk/content/docs/programmer-guide.html
websites/staging/singa/trunk/content/quick-start.html
Propchange: websites/staging/singa/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul 23 06:29:52 2015
@@ -1 +1 @@
-1692350
+1692352
Modified: websites/staging/singa/trunk/content/docs/cnn.html
==============================================================================
--- websites/staging/singa/trunk/content/docs/cnn.html (original)
+++ websites/staging/singa/trunk/content/docs/cnn.html Thu Jul 23 06:29:52 2015
@@ -467,7 +467,7 @@
<ul>
-<li>Run the command <tt>./bin/singa-run.sh -model=examples/cifar10/model.conf -cluster=examples/cifar10/cluster.conf</tt> in the root folder of SINGA</li>
+<li>Run the command <tt>./bin/singa-run.sh -workspace=examples/cifar10</tt> in the root folder of SINGA</li>
</ul></div>
<div class="section">
<h3><a name="Build_your_own_model"></a>Build your own model</h3>
Modified: websites/staging/singa/trunk/content/docs/mlp.html
==============================================================================
--- websites/staging/singa/trunk/content/docs/mlp.html (original)
+++ websites/staging/singa/trunk/content/docs/mlp.html Thu Jul 23 06:29:52 2015
@@ -467,7 +467,7 @@
<ul>
-<li>Run the command <tt>./bin/singa-run.sh -model=examples/mnist/model.conf -cluster=examples/mnist/cluster.conf</tt> in the root folder of SINGA</li>
+<li>Run the command <tt>./bin/singa-run.sh -workspace=examples/mnist</tt> in the root folder of SINGA</li>
</ul></div>
<div class="section">
<h3><a name="Build_your_own_model"></a>Build your own model</h3>
Modified: websites/staging/singa/trunk/content/docs/programmer-guide.html
==============================================================================
--- websites/staging/singa/trunk/content/docs/programmer-guide.html (original)
+++ websites/staging/singa/trunk/content/docs/programmer-guide.html Thu Jul 23 06:29:52 2015
@@ -478,7 +478,7 @@
<p>registers the layers implemented by the user and,</p></li>
<li>
-<p>starts the <a class="externalLink" href="https://github.com/apache/incubator-singa/blob/master/include/trainer/trainer.h">Trainer</a> by providing the job configuration.</p></li>
+<p>submit the job by providing the job configuration.</p></li>
</ul>
<p>An example driver program is like</p>
@@ -501,8 +501,7 @@ int main(int argc, char** argv) {
JobProto jobConf;
// read job configuration from text conf file
ReadProtoFromTextFile(&jobConf, FLAGS_workspace + "/job.conf");
- Trainer trainer;
- trainer.Start(FLAGS_job, jobConf, FLAGS_resume);
+ singa::SubmitJob(FLAGS_job, FLAGS_resume, jobConf);
}
</pre></div></div>
<p>Users can also configure the job in the driver program instead of writing the configuration file</p>
@@ -511,15 +510,15 @@ int main(int argc, char** argv) {
<div class="source"><pre class="prettyprint"> JobProto jobConf;
jobConf.set_job_name("my singa job");
... // configure cluster and model
- Trainer trainer;
- trainer.Start(FLAGS_job, jobConf, FLAGS_resume);
+ singa::SubmitJob(FLAGS_job, FLAGS_resume, jobConf);
</pre></div></div>
<p>We will provide helper functions to make the configuration easier in the future, like <a class="externalLink" href="https://github.com/fchollet/keras">keras</a>.</p>
-<p>Compile and link the driver program with singa library to generate an executable, e.g., with name <tt>mysinga</tt>. To submit the job, just pass the path of the executable and the workspace to the singa job submission script</p>
+<p>Compile and link the driver program with singa library to generate an executable file, e.g., with name <tt>mysinga</tt>. To submit the job, just pass the path of the executable and the workspace to the singa job submission script</p>
<div class="source">
<div class="source"><pre class="prettyprint">./bin/singa-run.sh <path to mysinga> -workspace=<my job workspace>
-</pre></div></div></div></div>
+</pre></div></div>
+<p>The default driver (i.e., main.cc) will be complied and linked to generate <tt>singa</tt>, which is used as the default executable file (no need to put it in the command line)</p></div></div>
</div>
</div>
</div>
Modified: websites/staging/singa/trunk/content/quick-start.html
==============================================================================
--- websites/staging/singa/trunk/content/quick-start.html (original)
+++ websites/staging/singa/trunk/content/quick-start.html Thu Jul 23 06:29:52 2015
@@ -489,7 +489,9 @@ make create
<!-- After creating the data shards, you to update the paths in the
model configuration file (*model.conf*) for the
training data shard, test data shard and the mean file. -->
-<p>Since all modules used for training this CNN model are provided by SINGA as built-in modules, there is no need to write any code. You just execute the script (<i>../../bin/singa-run.sh</i>) by providing the workspace which includes the job configuration file (<i>job.conf</i>). If you want to implement your own modules, then you have to register your modules in the <a href="user-guide.html">driver program</a>.</p>
+<p>Since all modules used for training this CNN model are provided by SINGA as built-in modules, there is no need to write any code. You just execute the script (<i>../../bin/singa-run.sh</i>) by providing the workspace which includes the job configuration file (<i>job.conf</i>). If you want to implement your own modules, then you have to register your modules in the <a href="user-guide.html">driver program</a>.</p></div>
+<div class="section">
+<h4><a name="Start_Training"></a>Start Training</h4>
<p>Start the training by running:</p>
<div class="source">