Skip to content

Commit

Permalink
preparing v1.1-rc1: updating version No. from v1.0.1 to v1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nudles committed Jan 24, 2017
1 parent 2a1b988 commit 3a35635
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions doc/conf.py
Expand Up @@ -79,9 +79,9 @@
# 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.
Expand Down
2 changes: 1 addition & 1 deletion java/pom.xml
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion tool/docker/runtime/Dockerfile
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tool/docker/runtime/cuda/Dockerfile
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tool/jenkins/jenkins_doc.sh
Expand Up @@ -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
Expand Down

0 comments on commit 3a35635

Please sign in to comment.