yzhliu closed pull request #9840: Bump version to 1.2.0 URL: https://github.com/apache/incubator-mxnet/pull/9840
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/R-package/DESCRIPTION b/R-package/DESCRIPTION index 0ec7f3667c..b22751a8db 100644 --- a/R-package/DESCRIPTION +++ b/R-package/DESCRIPTION @@ -1,7 +1,7 @@ Package: mxnet Type: Package Title: MXNet: A Flexible and Efficient Machine Learning Library for Heterogeneous Distributed Systems -Version: 1.1.0 +Version: 1.2.0 Date: 2017-06-27 Author: Tianqi Chen, Qiang Kou, Tong He Maintainer: Qiang Kou <[email protected]> diff --git a/include/mxnet/base.h b/include/mxnet/base.h index d5a861852f..0e58765aaf 100644 --- a/include/mxnet/base.h +++ b/include/mxnet/base.h @@ -111,7 +111,7 @@ /*! \brief major version */ #define MXNET_MAJOR 1 /*! \brief minor version */ -#define MXNET_MINOR 1 +#define MXNET_MINOR 2 /*! \brief patch version */ #define MXNET_PATCH 0 /*! \brief mxnet version */ diff --git a/python/mxnet/libinfo.py b/python/mxnet/libinfo.py index 8ccac29d5f..9a82b797a9 100644 --- a/python/mxnet/libinfo.py +++ b/python/mxnet/libinfo.py @@ -61,4 +61,4 @@ def find_lib_path(): # current version -__version__ = "1.1.0" +__version__ = "1.2.0" diff --git a/scala-package/assembly/linux-x86_64-cpu/pom.xml b/scala-package/assembly/linux-x86_64-cpu/pom.xml index cbcd7acdaf..70a0b67ad3 100644 --- a/scala-package/assembly/linux-x86_64-cpu/pom.xml +++ b/scala-package/assembly/linux-x86_64-cpu/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-full-parent_2.11</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -18,12 +18,12 @@ <dependency> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-core_${scala.binary.version}</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>ml.dmlc.mxnet</groupId> <artifactId>libmxnet-scala-linux-x86_64-cpu</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <type>so</type> </dependency> </dependencies> diff --git a/scala-package/assembly/linux-x86_64-gpu/pom.xml b/scala-package/assembly/linux-x86_64-gpu/pom.xml index cfe22e7eea..73c410103f 100644 --- a/scala-package/assembly/linux-x86_64-gpu/pom.xml +++ b/scala-package/assembly/linux-x86_64-gpu/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-full-parent_2.11</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -18,12 +18,12 @@ <dependency> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-core_${scala.binary.version}</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>ml.dmlc.mxnet</groupId> <artifactId>libmxnet-scala-linux-x86_64-gpu</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <type>so</type> </dependency> </dependencies> diff --git a/scala-package/assembly/osx-x86_64-cpu/pom.xml b/scala-package/assembly/osx-x86_64-cpu/pom.xml index 7f7f1ab75c..9360a27627 100644 --- a/scala-package/assembly/osx-x86_64-cpu/pom.xml +++ b/scala-package/assembly/osx-x86_64-cpu/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-full-parent_2.11</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -18,12 +18,12 @@ <dependency> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-core_${scala.binary.version}</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>ml.dmlc.mxnet</groupId> <artifactId>libmxnet-scala-osx-x86_64-cpu</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <type>jnilib</type> </dependency> </dependencies> diff --git a/scala-package/assembly/pom.xml b/scala-package/assembly/pom.xml index a755d7cb84..bfd53c1f9e 100644 --- a/scala-package/assembly/pom.xml +++ b/scala-package/assembly/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-parent_2.11</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/scala-package/core/pom.xml b/scala-package/core/pom.xml index 0df7047505..62c646852e 100644 --- a/scala-package/core/pom.xml +++ b/scala-package/core/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-parent_2.11</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -71,13 +71,13 @@ <dependency> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-init_${scala.binary.version}</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-macros_${scala.binary.version}</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/scala-package/examples/pom.xml b/scala-package/examples/pom.xml index a23b7b91f6..351f71fa85 100644 --- a/scala-package/examples/pom.xml +++ b/scala-package/examples/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-parent_2.11</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -118,7 +118,7 @@ <dependency> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-core_${scala.binary.version}</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> diff --git a/scala-package/init-native/linux-x86_64/pom.xml b/scala-package/init-native/linux-x86_64/pom.xml index 848d1e14ca..b1f3308d30 100644 --- a/scala-package/init-native/linux-x86_64/pom.xml +++ b/scala-package/init-native/linux-x86_64/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-scala-init-native-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -20,7 +20,7 @@ <dependency> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-init_${scala.binary.version}</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <type>jar</type> <scope>compile</scope> </dependency> diff --git a/scala-package/init-native/osx-x86_64/pom.xml b/scala-package/init-native/osx-x86_64/pom.xml index f6b865f145..e5766623e5 100644 --- a/scala-package/init-native/osx-x86_64/pom.xml +++ b/scala-package/init-native/osx-x86_64/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-scala-init-native-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -20,7 +20,7 @@ <dependency> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-init_${scala.binary.version}</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <type>jar</type> <scope>compile</scope> </dependency> diff --git a/scala-package/init-native/pom.xml b/scala-package/init-native/pom.xml index 672409981b..c414977359 100644 --- a/scala-package/init-native/pom.xml +++ b/scala-package/init-native/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-parent_2.11</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/scala-package/init/pom.xml b/scala-package/init/pom.xml index 26130a4373..1dc07e472b 100644 --- a/scala-package/init/pom.xml +++ b/scala-package/init/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-parent_2.11</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <!-- <relativePath>../pom.xml</relativePath>--> </parent> diff --git a/scala-package/macros/pom.xml b/scala-package/macros/pom.xml index 65dcbbc8f7..eec1de88b3 100644 --- a/scala-package/macros/pom.xml +++ b/scala-package/macros/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-parent_2.11</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -41,13 +41,13 @@ <dependency> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-init_${scala.binary.version}</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>ml.dmlc.mxnet</groupId> <artifactId>libmxnet-init-scala-${platform}</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <scope>provided</scope> <type>${libtype}</type> </dependency> diff --git a/scala-package/native/linux-x86_64-cpu/pom.xml b/scala-package/native/linux-x86_64-cpu/pom.xml index efaeedd895..d24ae1a97f 100644 --- a/scala-package/native/linux-x86_64-cpu/pom.xml +++ b/scala-package/native/linux-x86_64-cpu/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-scala-native-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -20,7 +20,7 @@ <dependency> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-core_${scala.binary.version}</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <type>jar</type> <scope>compile</scope> </dependency> diff --git a/scala-package/native/linux-x86_64-gpu/pom.xml b/scala-package/native/linux-x86_64-gpu/pom.xml index 0befa0c730..e84afd2ba7 100644 --- a/scala-package/native/linux-x86_64-gpu/pom.xml +++ b/scala-package/native/linux-x86_64-gpu/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-scala-native-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -20,7 +20,7 @@ <dependency> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-core_${scala.binary.version}</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <type>jar</type> <scope>compile</scope> </dependency> diff --git a/scala-package/native/osx-x86_64-cpu/pom.xml b/scala-package/native/osx-x86_64-cpu/pom.xml index 49812246b3..fa0f5b6c49 100644 --- a/scala-package/native/osx-x86_64-cpu/pom.xml +++ b/scala-package/native/osx-x86_64-cpu/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-scala-native-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -20,7 +20,7 @@ <dependency> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-core_${scala.binary.version}</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <type>jar</type> <scope>compile</scope> </dependency> diff --git a/scala-package/native/pom.xml b/scala-package/native/pom.xml index b772245ceb..288fb7cd1d 100644 --- a/scala-package/native/pom.xml +++ b/scala-package/native/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-parent_2.11</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/scala-package/pom.xml b/scala-package/pom.xml index 8599f7da8c..02bcd86f69 100644 --- a/scala-package/pom.xml +++ b/scala-package/pom.xml @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-parent_2.11</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.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> diff --git a/scala-package/spark/pom.xml b/scala-package/spark/pom.xml index da5c6e2e54..4afa622dfb 100644 --- a/scala-package/spark/pom.xml +++ b/scala-package/spark/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-parent_2.11</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -21,7 +21,7 @@ <dependency> <groupId>ml.dmlc.mxnet</groupId> <artifactId>mxnet-core_${scala.binary.version}</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> diff --git a/snapcraft.yaml b/snapcraft.yaml index b17c73bd6a..6aca20a4eb 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,5 @@ name: mxnet -version: '1.1.0' +version: '1.2.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 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
