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 2017/05/27 02:23:03 UTC
[2/2] incubator-singa git commit: SINGA-319 Replace Singa to SINGA in
all files in the code and documentation
SINGA-319 Replace Singa to SINGA in all files in the code and documentation
The project (short) name is inconsistent over files.
This commit replace 'Singa' with 'SINGA' to make the name consistent.
Considering that all incubating projects are named as 'incubating-xxx' where
xxx are lower case letters, we still use incubator-singa for the full name.
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/336ef550
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/336ef550
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/336ef550
Branch: refs/heads/master
Commit: 336ef55007924f7fcc449f1a1e0444e83e6e8bc9
Parents: b6dba21
Author: Meihui Zhang <ch...@gmail.com>
Authored: Sat May 27 09:11:27 2017 +0800
Committer: Meihui Zhang <ch...@gmail.com>
Committed: Sat May 27 09:11:27 2017 +0800
----------------------------------------------------------------------
CMakeLists.txt | 4 ++--
RELEASE_NOTES | 6 +++---
doc/README.md | 4 ++--
doc/conf.py | 6 +++---
doc/en/develop/how-contribute.md | 2 +-
doc/en/index.rst | 14 +++++++-------
doc/en/releases/RELEASE_NOTES_1.0.0.md | 2 +-
examples/imagenet/resnet/convert.py | 2 +-
8 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/336ef550/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9e47a3..f71ce69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -200,8 +200,8 @@ IF(PACKAGE)
SET(CPACK_DEBIAN_PACKAGE_SECTION "devel")
SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://singa.apache.org")
- SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Singa is an Apache Incubating project for developing an open source deep learning library.
- The Singa project was initiated by the DB System Group at National University of Singapore in 2014. It focused on distributed deep learning by partitioning the model and data onto nodes in a cluster and parallelize the training. The prototype was accepted by Apache Incubator in March 2015.")
+ SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "SINGA is an Apache Incubating project for developing an open source deep learning library.
+ The SINGA project was initiated by the DB System Group at National University of Singapore in 2014. It focused on distributed deep learning by partitioning the model and data onto nodes in a cluster and parallelize the training. The prototype was accepted by Apache Incubator in March 2015.")
IF (USE_PYTHON)
SET(CPACK_DEBIAN_PACKAGE_DEPENDS ${PYTHON_DEPENDENCIES})
SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_SOURCE_DIR}/tool/debian/postinst" )
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/336ef550/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 9cafffe..43d4004 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -90,7 +90,7 @@ This release includes following features:
* [SINGA-199] Implement Python classes for SGD optimizers
* [SINGA-198] Change Layer::Setup API to include input Tensor shapes
* [SINGA-193] Add Python layers
- * [SINGA-192] Implement optimization algorithms for Singa v1 (nesterove, adagrad, rmsprop)
+ * [SINGA-192] Implement optimization algorithms for SINGA v1 (nesterove, adagrad, rmsprop)
* [SINGA-191] Add "autotune" for CudnnConvolution Layer
* [SINGA-190] Add prelu layer and flatten layer
* [SINGA-189] Generate python outputs of proto files
@@ -142,7 +142,7 @@ This release includes following features:
* [SINGA-131] Implement and optimize hybrid training using both CPU and GPU
* [SINGA-136] Support cuDNN v4
* [SINGA-134] Extend SINGA to run over a GPU cluster
- * [Singa-157] Change the priority of cudnn library and install libsingagpu.so
+ * [SINGA-157] Change the priority of cudnn library and install libsingagpu.so
* Remove Dependencies
* [SINGA-156] Remove the dependency on ZMQ for single process training
@@ -161,7 +161,7 @@ This release includes following features:
* [SINGA-150] Mesos Docker container failed
* [SIGNA-141] Undesired Hash collision when locating process id to worker…
* [SINGA-149] Docker build fail
- * [Singa-143] The compilation cannot detect libsingagpu.so file
+ * [SINGA-143] The compilation cannot detect libsingagpu.so file
-----------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/336ef550/doc/README.md
----------------------------------------------------------------------
diff --git a/doc/README.md b/doc/README.md
index dac708a..3652fa2 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -2,9 +2,9 @@
## Website
-This document gives step-by-step instructions for deploying [Singa website](http://singa.incubator.apache.org).
+This document gives step-by-step instructions for deploying [SINGA website](http://singa.incubator.apache.org).
-Singa website is built by [Sphinx](http://www.sphinx-doc.org) >=1.4.4 from a source tree stored in git: https://github.com/apache/incubator-singa/tree/master/doc.
+SINGA website is built by [Sphinx](http://www.sphinx-doc.org) >=1.4.4 from a source tree stored in git: https://github.com/apache/incubator-singa/tree/master/doc.
To install Sphinx:
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/336ef550/doc/conf.py
----------------------------------------------------------------------
diff --git a/doc/conf.py b/doc/conf.py
index 150084d..280fae6 100755
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -71,7 +71,7 @@ master_doc = 'index'
# General information about the project.
project = u'incubator-singa'
-copyright = u'2017 The Apache Software Foundation. All rights reserved. Apache Singa, Apache, the Apache feather logo, and the Apache Singa project logos are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.'
+copyright = u'2017 The Apache Software Foundation. All rights reserved. Apache SINGA, Apache, the Apache feather logo, and the Apache SINGA project logos are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.'
author = u'moaz'
# The version info for the project you're documenting, acts as replacement for
@@ -155,7 +155,7 @@ html_theme = 'sphinx_rtd_theme'
# The name for this set of Sphinx documents.
# "<project> v<release> documentation" by default.
#
-# html_title = u'Singa v1.0.0'
+# html_title = u'SINGA v1.0.0'
# A shorter title for the navigation bar. Default is the same as html_title.
#
@@ -255,7 +255,7 @@ html_show_sourcelink = False
# html_search_scorer = 'scorer.js'
# Output file base name for HTML help builder.
-htmlhelp_basename = 'Singadoc'
+htmlhelp_basename = 'singadoc'
# -- Options for LaTeX output ---------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/336ef550/doc/en/develop/how-contribute.md
----------------------------------------------------------------------
diff --git a/doc/en/develop/how-contribute.md b/doc/en/develop/how-contribute.md
index bfc4cec..639f14e 100644
--- a/doc/en/develop/how-contribute.md
+++ b/doc/en/develop/how-contribute.md
@@ -3,7 +3,7 @@
As with any open source project, there are several ways you can help:
* Join the [mailing list](http://singa.apache.org/en/community/mail-lists.html) and answer other user's questions.
-* [Build Singa](http://singa.apache.org/en/docs/installation.html) by yourself.
+* [Build SINGA](http://singa.apache.org/en/docs/installation.html) by yourself.
* Report bugs, feature requests and other issues in the [issue tracking](http://singa.apache.org/en/community/issue-tracking.html) application.
* Check SINGA's [development schedule](http://singa.apache.org/en/develop/schedule.html) and [contribute code](http://singa.apache.org/en/develop/contribute-code.html) by providing patches.
* [Help with the documentation](http://singa.apache.org/en/develop/contribute-docs.html) by updating webpages that are lacking or unclear.
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/336ef550/doc/en/index.rst
----------------------------------------------------------------------
diff --git a/doc/en/index.rst b/doc/en/index.rst
index 6958a7c..56c7be9 100755
--- a/doc/en/index.rst
+++ b/doc/en/index.rst
@@ -16,35 +16,35 @@
under the License.
-.. Singa documentation master file, created by
+.. SINGA documentation master file, created by
sphinx-quickstart on Sat Jul 9 20:36:57 2016.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
-Welcome to Apache Singa
+Welcome to Apache SINGA
=======================
Recent News
-----------
-* **Version 1.1** is now available, 12 Feb, 2017. `Download SINGA v1.1.0 <downloads.html>`_
+* **Version 1.1.0** is now available, 12 Feb, 2017. `Download SINGA v1.1.0 <downloads.html>`_
* A tutorial on SINGA V1 will be given at `SGInnovate <https://www.eventbrite.sg/e/ai-eveningssginnovate-apache-singa-tickets-31505061487>`_, on 23 March, 2017
-* **Version 1** is now available, 9 Sep, 2016. `Download SINGA v1.0.0 <downloads.html>`_
+* **Version 1.0.0** is now available, 9 Sep, 2016. `Download SINGA v1.0.0 <downloads.html>`_
* SINGA will be presented at `REWORK <https://www.re-work.co/events/deep-learning-singapore/schedule>`_, 21 Oct, 2016.
* SINGA was presented at `PyDataSG <http://www.meetup.com/PyData-SG/events/229691286/>`_, 16 Aug, 2016.
-* The **third release** is now available, 20 April, 2016. `Download SINGA v0.3.0 <downloads.html>`_
+* **Version 0.3.0** is now available, 20 April, 2016. `Download SINGA v0.3.0 <downloads.html>`_
-* The **second release** is now available, 14 Jan, 2016. `Download SINGA v0.2.0 <downloads.html>`_.
+* **Version 0.2.0** is now available, 14 Jan, 2016. `Download SINGA v0.2.0 <downloads.html>`_.
* SINGA will be presented at `Strata+Hadoop <http://strataconf.com/big-data-conference-sg-2015/public/schedule/detail/45123>`_ on 2 Dec, 2015
* SINGA was presented at `ACM Multimedia <http://www.acmmm.org/2015/at-a-glance/>`_ Best Paper session and Open Source Software Competition session, 26-30 Oct, 2015 (`Slides <http://www.comp.nus.edu.sg/~dbsystem/singa//assets/file/mm2015.ppt>`_)
-* The **first release** is now available, 8 Oct, 2015. `Download SINGA v0.1.0 <downloads.html>`_.
+* **Version 0.1.0** is now available, 8 Oct, 2015. `Download SINGA v0.1.0 <downloads.html>`_.
* SINGA was presented at `workshop on deep learning <http://www.comp.nus.edu.sg/~dbsystem/singa/workshop>`_ held on 16 Sep, 2015
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/336ef550/doc/en/releases/RELEASE_NOTES_1.0.0.md
----------------------------------------------------------------------
diff --git a/doc/en/releases/RELEASE_NOTES_1.0.0.md b/doc/en/releases/RELEASE_NOTES_1.0.0.md
index 724f47c..dde2c63 100644
--- a/doc/en/releases/RELEASE_NOTES_1.0.0.md
+++ b/doc/en/releases/RELEASE_NOTES_1.0.0.md
@@ -49,7 +49,7 @@ This release includes following features:
* [SINGA-199] Implement Python classes for SGD optimizers
* [SINGA-198] Change Layer::Setup API to include input Tensor shapes
* [SINGA-193] Add Python layers
- * [SINGA-192] Implement optimization algorithms for Singa v1 (nesterove, adagrad, rmsprop)
+ * [SINGA-192] Implement optimization algorithms for SINGA v1 (nesterove, adagrad, rmsprop)
* [SINGA-191] Add "autotune" for CudnnConvolution Layer
* [SINGA-190] Add prelu layer and flatten layer
* [SINGA-189] Generate python outputs of proto files
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/336ef550/examples/imagenet/resnet/convert.py
----------------------------------------------------------------------
diff --git a/examples/imagenet/resnet/convert.py b/examples/imagenet/resnet/convert.py
index 6bf4101..042d2ec 100644
--- a/examples/imagenet/resnet/convert.py
+++ b/examples/imagenet/resnet/convert.py
@@ -69,7 +69,7 @@ def traverse(m, idx, params, param_names):
idx, index for the current cursor of param_names
params, an empty dictionary (name->numpy) to dump the params via pickle;
or a list of tensor objects which should be in the same order as
- param_names, called to initialize net created in Singa directly
+ param_names, called to initialize net created in SINGA directly
using param values from torch checkpoint file.
Returns: