replace lmdb with DataShard as data provider for cifar10 example
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/da3b5dd9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/da3b5dd9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/da3b5dd9 Branch: refs/heads/master Commit: da3b5dd9c50e6acfdbebfa1d99caa32e9d5cdeb7 Parents: e900cd4 Author: wang wei <[email protected]> Authored: Thu May 7 19:08:11 2015 +0800 Committer: wang wei <[email protected]> Committed: Thu May 7 19:08:11 2015 +0800 ---------------------------------------------------------------------- .gitignore | 16 +- README.md | 11 +- config.h.in | 5 +- configure | 11294 ++++++++++++++------------------ examples/cifar10/Makefile | 20 + examples/cifar10/cluster.conf | 4 +- examples/cifar10/create_shard.cc | 112 + examples/cifar10/model-lmdb.conf | 218 + examples/cifar10/model.conf | 11 +- src/neuralnet/layer.cc | 20 +- 10 files changed, 5449 insertions(+), 6262 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/da3b5dd9/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 2d070a5..8743732 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.orig *.swp *.o +*.lo *.bin *.a *.so @@ -13,9 +14,6 @@ *.cproject *.log *.nfs* -script/* -!script/*.sh -!script/*.awk src/test/data/* tmp log* @@ -23,6 +21,18 @@ build/ tmp/ include/proto/*.h src/proto/*.cc +src/proto/*.h .sync *lmdb *.binaryproto +singa +.libs +*.la +*.deps +*.dirstamp +libtool +stamp-h1 +*.cache +*.status +config.h +Makefile http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/da3b5dd9/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 0fa7fc4..855b8b0 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,9 @@ For libraries like openblas, opencv, older versions may also work, because we do -BUILDING SINGA SOFTWARE FROM SOURCES +Building SINGA From Sources ===== + Build steps ----- The build system of SINGA is based on GNU autotools. @@ -51,7 +52,7 @@ On Unix-like systems with GNU Make as build tool, these build steps can be summa $ make $ make install -After executing above commands, SINGA library will be installed in the default directory. +After executing above commands, SINGA library will be installed in the system default directory. If you want to specify your own installation directory, use the following command instead. $ ./configure --prefix=/YOUR/OWN/FOLDER @@ -67,9 +68,9 @@ After downloading, to install the thirdparty dependencies: $ cd thirdparty $ ./install-dependencies.sh MISSING_LIBRARY_NAME1 YOUR_INSTALL_PATH1 MISSING_LIBRARY_NAME2 YOUR_INSTALL_PATH2 -If you do not specify the installation path, the lirary will be installed in default folder. +If you do not specify the installation path, the library will be installed in default folder. For example, if you want to build zeromq library in system folder and gflags in /usr/local, just run: - + $ ./install-dependencies.sh zeromq gflags /usr/local Another example can be to install all dependencies in /usr/local directory: @@ -77,7 +78,7 @@ Another example can be to install all dependencies in /usr/local directory: $ ./install-dependencies.sh all /usr/local Here is a table showing the first arguments: - + MISSING_LIBRARY_NAME LIBRARIES cmake cmake tools czmq* czmq lib http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/da3b5dd9/config.h.in ---------------------------------------------------------------------- diff --git a/config.h.in b/config.h.in index 800fa92..b1330db 100644 --- a/config.h.in +++ b/config.h.in @@ -102,6 +102,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -123,7 +126,7 @@ /* Define to rpl_malloc if the replacement function should be used. */ #undef malloc -/* Define to `unsigned' if <sys/types.h> does not define. */ +/* Define to `unsigned int' if <sys/types.h> does not define. */ #undef size_t /* Define to empty if the keyword `volatile' does not work. Warning: valid
