Skip to content

Commit

Permalink
Bump version to 1.1.0 (apache#9707)
Browse files Browse the repository at this point in the history
* Bump 1.1 (apache#192)

* bump

* also update base.h

* revert website changes

* Update index.html

* revert mxnet-theme/index.html changes

* remove empty line
  • Loading branch information
eric-haibin-lin authored and zheng-da committed Jun 28, 2018
1 parent 023a814 commit fca1cf3
Show file tree
Hide file tree
Showing 21 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion R-package/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: mxnet
Type: Package
Title: MXNet: A Flexible and Efficient Machine Learning Library for Heterogeneous Distributed Systems
Version: 1.0.1
Version: 1.1.0
Date: 2017-06-27
Author: Tianqi Chen, Qiang Kou, Tong He
Maintainer: Qiang Kou <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions include/mxnet/base.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@
/*! \brief major version */
#define MXNET_MAJOR 1
/*! \brief minor version */
#define MXNET_MINOR 0
#define MXNET_MINOR 1
/*! \brief patch version */
#define MXNET_PATCH 1
#define MXNET_PATCH 0
/*! \brief mxnet version */
#define MXNET_VERSION (MXNET_MAJOR*10000 + MXNET_MINOR*100 + MXNET_PATCH)
/*! \brief helper for making version number */
Expand Down
2 changes: 1 addition & 1 deletion python/mxnet/libinfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ def find_lib_path():


# current version
__version__ = "1.0.1"
__version__ = "1.1.0"
6 changes: 3 additions & 3 deletions scala-package/assembly/linux-x86_64-cpu/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-full-parent_2.11</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -18,12 +18,12 @@
<dependency>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>libmxnet-scala-linux-x86_64-cpu</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<type>so</type>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions scala-package/assembly/linux-x86_64-gpu/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-full-parent_2.11</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -18,12 +18,12 @@
<dependency>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>libmxnet-scala-linux-x86_64-gpu</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<type>so</type>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions scala-package/assembly/osx-x86_64-cpu/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-full-parent_2.11</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -18,12 +18,12 @@
<dependency>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>libmxnet-scala-osx-x86_64-cpu</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<type>jnilib</type>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion scala-package/assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions scala-package/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -71,13 +71,13 @@
<dependency>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-init_${scala.binary.version}</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-macros_${scala.binary.version}</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions scala-package/examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -118,7 +118,7 @@
<dependency>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions scala-package/init-native/linux-x86_64/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-scala-init-native-parent</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-init_${scala.binary.version}</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions scala-package/init-native/osx-x86_64/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-scala-init-native-parent</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-init_${scala.binary.version}</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion scala-package/init-native/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion scala-package/init/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<!-- <relativePath>../pom.xml</relativePath>-->
</parent>

Expand Down
6 changes: 3 additions & 3 deletions scala-package/macros/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -41,13 +41,13 @@
<dependency>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-init_${scala.binary.version}</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>libmxnet-init-scala-${platform}</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<scope>provided</scope>
<type>${libtype}</type>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions scala-package/native/linux-x86_64-cpu/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-scala-native-parent</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions scala-package/native/linux-x86_64-gpu/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-scala-native-parent</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions scala-package/native/osx-x86_64-cpu/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-scala-native-parent</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion scala-package/native/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion scala-package/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<name>MXNet Scala Package - Parent</name>
<url>https://github.com/dmlc/mxnet/tree/master/scala-package</url>
<description>MXNet Scala Package</description>
Expand Down
4 changes: 2 additions & 2 deletions scala-package/spark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -21,7 +21,7 @@
<dependency>
<groupId>ml.dmlc.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: mxnet
version: '1.0.1'
version: '1.1.0'
summary: MXNet is a deep learning framework designed for efficiency and flexibility.
description: |
MXNet is a deep learning framework designed for both efficiency and
Expand Down

0 comments on commit fca1cf3

Please sign in to comment.