Repository: incubator-singa Updated Branches: refs/heads/master 2a1b988c6 -> 3a3563568
preparing v1.1-rc1: updating version No. from v1.0.1 to v1.1.0 Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/3a356356 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/3a356356 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/3a356356 Branch: refs/heads/master Commit: 3a3563568cebd5c0fcfe07d85b32dd553deedc15 Parents: 2a1b988 Author: Wei Wang <[email protected]> Authored: Tue Jan 24 18:03:05 2017 +0800 Committer: Wei Wang <[email protected]> Committed: Tue Jan 24 18:03:05 2017 +0800 ---------------------------------------------------------------------- CMakeLists.txt | 4 ++-- doc/conf.py | 4 ++-- java/pom.xml | 2 +- tool/docker/runtime/Dockerfile | 2 +- tool/docker/runtime/cuda/Dockerfile | 2 +- tool/jenkins/jenkins_doc.sh | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/3a356356/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f44fd1..23545b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,8 +21,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) PROJECT(singa) SET(PACKAGE_VERSION "1.0.1") SET(SINGA_MAJOR_VERSION 1) # 0 - -SET(SINGA_MINOR_VERSION 0) # 0 - 9 -SET(SINGA_PATCH_VERSION 1) # 0 - 99 +SET(SINGA_MINOR_VERSION 1) # 0 - 9 +SET(SINGA_PATCH_VERSION 0) # 0 - 99 MATH(EXPR SINGA_VERSION "${SINGA_MAJOR_VERSION} * 1000 + ${SINGA_MINOR_VERSION} * 100 + ${SINGA_PATCH_VERSION}") LIST(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Thirdparty) http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/3a356356/doc/conf.py ---------------------------------------------------------------------- diff --git a/doc/conf.py b/doc/conf.py index b87dd51..17f1949 100755 --- a/doc/conf.py +++ b/doc/conf.py @@ -79,9 +79,9 @@ author = u'moaz' # built documents. # # The short X.Y version. -version = u'1.0' +version = u'1.1' # The full version, including alpha/beta/rc tags. -release = u'1.0.1' +release = u'1.1.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/3a356356/java/pom.xml ---------------------------------------------------------------------- diff --git a/java/pom.xml b/java/pom.xml index f2820ed..b91d65c 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -23,7 +23,7 @@ <groupId>org.apache.singa</groupId> <artifactId>junit-tests</artifactId> <packaging>jar</packaging> - <version>1.0-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> <name>junit-tests</name> <build> <plugins> http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/3a356356/tool/docker/runtime/Dockerfile ---------------------------------------------------------------------- diff --git a/tool/docker/runtime/Dockerfile b/tool/docker/runtime/Dockerfile index e3a667c..40c78b5 100644 --- a/tool/docker/runtime/Dockerfile +++ b/tool/docker/runtime/Dockerfile @@ -28,4 +28,4 @@ RUN apt-get update \ # install pysinga TODO(wangwei) install debian package -RUN pip install --upgrade http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/wheel/linux/latest/ubuntu16.04-cpp/singa-1.0.1-py2-none-any.whl +RUN pip install --upgrade http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/wheel/linux/latest/ubuntu16.04-cpp/singa-1.1.0-py2-none-any.whl http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/3a356356/tool/docker/runtime/cuda/Dockerfile ---------------------------------------------------------------------- diff --git a/tool/docker/runtime/cuda/Dockerfile b/tool/docker/runtime/cuda/Dockerfile index 26ed5b4..baf9bfd 100644 --- a/tool/docker/runtime/cuda/Dockerfile +++ b/tool/docker/runtime/cuda/Dockerfile @@ -28,4 +28,4 @@ RUN apt-get update \ # install pysinga TODO(wangwei) install debian package -RUN pip install --upgrade http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/wheel/linux/latest/ubuntu16.04-cuda8.0-cudnn5/singa-1.0.1-py2-none-any.whl +RUN pip install --upgrade http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/wheel/linux/latest/ubuntu16.04-cuda8.0-cudnn5/singa-1.1.0-py2-none-any.whl http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/3a356356/tool/jenkins/jenkins_doc.sh ---------------------------------------------------------------------- diff --git a/tool/jenkins/jenkins_doc.sh b/tool/jenkins/jenkins_doc.sh index 2bb2333..0498081 100644 --- a/tool/jenkins/jenkins_doc.sh +++ b/tool/jenkins/jenkins_doc.sh @@ -21,7 +21,7 @@ # This script is used by Jenkins to update SINGA website echo Install PySINGA, generate HTML files and update SINGA website -pip install --upgrade http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/whl/latest/ubuntu16.04-cpp/singa-1.0.1-py2-none-any.whl +pip install --upgrade http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/wheel/linux/latest/ubuntu16.04-cpp/singa-1.1.0-py2-none-any.whl COMMIT=`git rev-parse --short HEAD` cd doc # generate the html files
