You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by ma...@apache.org on 2018/06/07 22:53:37 UTC
[incubator-mxnet] branch v1.2.0 updated: changes made to publish to
maven (#11147)
This is an automated email from the ASF dual-hosted git repository.
marcoabreu pushed a commit to branch v1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.2.0 by this push:
new 60dff17 changes made to publish to maven (#11147)
60dff17 is described below
commit 60dff17e6a4e7d9c8f05acba4502c42b65f21330
Author: Naveen Swamy <mn...@gmail.com>
AuthorDate: Thu Jun 7 15:53:23 2018 -0700
changes made to publish to maven (#11147)
* changes made to publish to maven
* update VERSION to 1.2.1-SNAPSHOT
* compile backend only when passed flag
* remove the compile.backend flag
---
Makefile | 14 ++--
scala-package/assembly/linux-x86_64-cpu/pom.xml | 39 +++++++--
scala-package/assembly/linux-x86_64-gpu/pom.xml | 36 +++++++-
scala-package/assembly/osx-x86_64-cpu/pom.xml | 36 +++++++-
scala-package/assembly/pom.xml | 2 +-
scala-package/core/pom.xml | 6 +-
scala-package/dev/compile-mxnet-backend.sh | 107 ++++++++++++++++++++++++
scala-package/examples/pom.xml | 6 +-
scala-package/infer/pom.xml | 4 +-
scala-package/init-native/linux-x86_64/pom.xml | 4 +-
scala-package/init-native/osx-x86_64/pom.xml | 4 +-
scala-package/init-native/pom.xml | 2 +-
scala-package/init/pom.xml | 50 +++++++----
scala-package/macros/pom.xml | 6 +-
scala-package/native/linux-x86_64-cpu/pom.xml | 4 +-
scala-package/native/linux-x86_64-gpu/pom.xml | 4 +-
scala-package/native/osx-x86_64-cpu/pom.xml | 4 +-
scala-package/native/pom.xml | 2 +-
scala-package/pom.xml | 13 ++-
scala-package/spark/pom.xml | 4 +-
20 files changed, 282 insertions(+), 65 deletions(-)
diff --git a/Makefile b/Makefile
index 3317fc5..4db7319 100644
--- a/Makefile
+++ b/Makefile
@@ -576,6 +576,7 @@ scalaclean:
scalapkg:
(cd $(ROOTDIR)/scala-package; \
mvn package -P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) -Dcxx="$(CXX)" \
+ -Dbuild.platform="$(SCALA_PKG_PROFILE)" \
-Dcflags="$(CFLAGS)" -Dldflags="$(LDFLAGS)" \
-Dcurrent_libdir="$(ROOTDIR)/lib" \
-Dlddeps="$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a")
@@ -583,12 +584,14 @@ scalapkg:
scalatest:
(cd $(ROOTDIR)/scala-package; \
mvn verify -P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) -Dcxx="$(CXX)" \
+ -Dbuild.platform="$(SCALA_PKG_PROFILE)" \
-Dcflags="$(CFLAGS)" -Dldflags="$(LDFLAGS)" \
-Dlddeps="$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a" $(SCALA_TEST_ARGS))
scalainstall:
(cd $(ROOTDIR)/scala-package; \
mvn install -P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) -DskipTests -Dcxx="$(CXX)" \
+ -Dbuild.platform="$(SCALA_PKG_PROFILE)" \
-Dcflags="$(CFLAGS)" -Dldflags="$(LDFLAGS)" \
-Dlddeps="$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a")
@@ -596,23 +599,24 @@ scalarelease-dryrun:
(cd $(ROOTDIR)/scala-package; \
mvn release:clean release:prepare -DdryRun=true -DautoVersionSubmodules=true \
-Papache-release,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) \
- -Darguments=""-DskipTests\ -Dcflags=\""$(CFLAGS)\""\ -Dcxx=\""$(CXX)\""\ -Dldflags=\""$(LDFLAGS)\""\ -Dlddeps=\""$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a\"""")
+ -Darguments=""-Dbuild\.platform=\""$(SCALA_PKG_PROFILE)\""\ -DskipTests\ -Dcflags=\""$(CFLAGS)\""\ -Dcxx=\""$(CXX)\""\ -Dldflags=\""$(LDFLAGS)\""\ -Dlddeps=\""$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a\"""")
-scalarelease:
+scalarelease-prepare:
(cd $(ROOTDIR)/scala-package; \
mvn release:clean release:prepare -DautoVersionSubmodules=true \
-Papache-release,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) \
- -Darguments=""-DskipTests\ -Dcflags=\""$(CFLAGS)\""\ -Dcxx=\""$(CXX)\""\ -Dldflags=\""$(LDFLAGS)\""\ -Dlddeps=\""$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a\"""")
+ -Darguments=""-Dbuild\.platform=\""$(SCALA_PKG_PROFILE)\""\ -DskipTests\ -Dcflags=\""$(CFLAGS)\""\ -Dcxx=\""$(CXX)\""\ -Dldflags=\""$(LDFLAGS)\""\ -Dlddeps=\""$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a\"""")
scalarelease-perform:
(cd $(ROOTDIR)/scala-package; \
- mvn release:clean release:prepare -DautoVersionSubmodules=true \
+ mvn release:perform -DautoVersionSubmodules=true \
-Papache-release,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) \
- -Darguments=""-DskipTests\ -Dcflags=\""$(CFLAGS)\""\ -Dcxx=\""$(CXX)\""\ -Dldflags=\""$(LDFLAGS)\""\ -Dlddeps=\""$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a\"""")
+ -Darguments=""-Dbuild\.platform=\""$(SCALA_PKG_PROFILE)\""\ -DskipTests\ -Dcflags=\""$(CFLAGS)\""\ -Dcxx=\""$(CXX)\""\ -Dldflags=\""$(LDFLAGS)\""\ -Dlddeps=\""$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a\"""")
scaladeploy:
(cd $(ROOTDIR)/scala-package; \
mvn deploy -Papache-release,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) \-DskipTests -Dcxx="$(CXX)" \
+ -Dbuild.platform="$(SCALA_PKG_PROFILE)" \
-Dcflags="$(CFLAGS)" -Dldflags="$(LDFLAGS)" \
-Dlddeps="$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a")
diff --git a/scala-package/assembly/linux-x86_64-cpu/pom.xml b/scala-package/assembly/linux-x86_64-cpu/pom.xml
index 869c14c..5a91566 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>org.apache.mxnet</groupId>
<artifactId>mxnet-full-parent_2.11</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -18,36 +18,57 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>libmxnet-scala-linux-x86_64-cpu</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<type>so</type>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-infer_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <inherited>false</inherited>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <!--<version>1.1.0-SNAPSHOT</version>-->
<configuration>
- <skip>false</skip>
+ <pomElements>
+ <dependencies>remove</dependencies>
+ </pomElements>
</configuration>
+ <executions>
+ <!-- enable flattening -->
+ <execution>
+ <id>flatten</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ </execution>
+ <!-- ensure proper cleanup -->
+ <execution>
+ <id>flatten.clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
+ <inherited>false</inherited>
<configuration>
- <skip>true</skip>
+ <skip>false</skip>
</configuration>
</plugin>
<plugin>
diff --git a/scala-package/assembly/linux-x86_64-gpu/pom.xml b/scala-package/assembly/linux-x86_64-gpu/pom.xml
index 386072a..bdad3fd 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>org.apache.mxnet</groupId>
<artifactId>mxnet-full-parent_2.11</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -18,24 +18,52 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>libmxnet-scala-linux-x86_64-gpu</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<type>so</type>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-infer_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <!--<version>1.1.0-SNAPSHOT</version>-->
+ <configuration>
+ <pomElements>
+ <dependencies>remove</dependencies>
+ </pomElements>
+ </configuration>
+ <executions>
+ <!-- enable flattening -->
+ <execution>
+ <id>flatten</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ </execution>
+ <!-- ensure proper cleanup -->
+ <execution>
+ <id>flatten.clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<inherited>false</inherited>
diff --git a/scala-package/assembly/osx-x86_64-cpu/pom.xml b/scala-package/assembly/osx-x86_64-cpu/pom.xml
index e0dd5fe..9c9cac3 100644
--- a/scala-package/assembly/osx-x86_64-cpu/pom.xml
+++ b/scala-package/assembly/osx-x86_64-cpu/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-full-parent_2.11</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -16,24 +16,52 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>libmxnet-scala-osx-x86_64-cpu</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<type>jnilib</type>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-infer_${scala.binary.version}</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <!--<version>1.1.0-SNAPSHOT</version>-->
+ <configuration>
+ <pomElements>
+ <dependencies>remove</dependencies>
+ </pomElements>
+ </configuration>
+ <executions>
+ <!-- enable flattening -->
+ <execution>
+ <id>flatten</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ </execution>
+ <!-- ensure proper cleanup -->
+ <execution>
+ <id>flatten.clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<inherited>false</inherited>
diff --git a/scala-package/assembly/pom.xml b/scala-package/assembly/pom.xml
index 8d2df25..456f453 100644
--- a/scala-package/assembly/pom.xml
+++ b/scala-package/assembly/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/scala-package/core/pom.xml b/scala-package/core/pom.xml
index 711a5fb..fb5ea2b 100644
--- a/scala-package/core/pom.xml
+++ b/scala-package/core/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -76,13 +76,13 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-init_${scala.binary.version}</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-macros_${scala.binary.version}</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/scala-package/dev/compile-mxnet-backend.sh b/scala-package/dev/compile-mxnet-backend.sh
new file mode 100755
index 0000000..43517fc
--- /dev/null
+++ b/scala-package/dev/compile-mxnet-backend.sh
@@ -0,0 +1,107 @@
+#!/bin/bash
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# (Yizhi) This is mainly inspired by the script in apache/spark.
+# I did some modificaiton to get it with our project.
+#
+
+set -e
+echo "Compiling MXNet Backend, Hang tight!....."
+
+if [[ ($# -ne 3) || ( $1 == "--help") || $1 == "-h" ]]; then
+ echo "Usage: [-h|--help] <osx-x86_64-cpu/linux-x86_64-cpu/linux-x86_64-gpu> <project.basedir>" 1>&2
+ exit 1
+fi
+PLATFORM=$1
+MXNETDIR=$2
+
+
+# below routine shamelessly copied from
+# https://github.com/apache/incubator-mxnet/blob/master/setup-utils/install-mxnet-osx-python.sh
+
+chkret() {
+ cmd=$*
+ echo "$cmd"
+ $cmd
+ ret=$?
+ if [[ ${ret} != 0 ]]; then
+ echo " "
+ echo "ERROR: Return value non-zero for: $cmd"
+ echo " "
+ exit 1
+ fi
+} # chkret()
+
+UNAME=`uname -s`
+chkret pushd $MXNETDIR
+chkret git submodule update --init --recursive
+
+# don't want to overwrite an existing config file
+cp make/config.mk ./config.mk
+
+if [[ $PLATFORM == "osx-x86_64-cpu" ]];
+then
+ echo "Building MXNet Backend on MAC OS"
+ echo "ADD_CFLAGS += -I/usr/local/opt/opencv@2/include" >> ./config.mk
+ echo "ADD_CFLAGS += -I/usr/local/opt/openblas/include" >> ./config.mk
+ echo "ADD_LDFLAGS += -L/usr/local/opt/opencv@2/lib" >> ./config.mk
+ echo "ADD_LDFLAGS += -L/usr/local/opt/openblas/lib" >> ./config.mk
+ echo "USE_OPENMP = 0" >> ./config.mk
+ echo "USE_LAPACK_PATH = /usr/local/opt/lapack/lib" >> ./config.mk
+ make -j$(sysctl -n hw.ncpu)
+elif [[ $PLATFORM == "linux-x86_64-cpu" ]];
+then
+ echo "Building MXNet Backend on Linux CPU"
+ echo "ADD_CFLAGS += -I/usr/local/include/opencv" >> ./config.mk
+ echo "ADD_LDFLAGS += -L/usr/local/lib" >> ./config.mk
+ echo "USE_OPENCV=1" >> ./config.mk
+ echo "USE_OPENMP=1" >> ./config.mk
+ echo "USE_BLAS=openblas" >> ./config.mk
+ echo "USE_LAPACK=1" >> ./config.mk
+ echo "USE_DIST_KVSTORE=1" >> ./config.mk
+ echo "USE_S3=1" >> ./config.mk
+ make -j$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | tail -1)
+elif [[ $PLATFORM == "linux-x86_64-gpu" ]]
+then
+ echo "Building MXNet Backend on Linux GPU"
+ echo "Building MXNet Backend on Linux CPU"
+ echo "ADD_CFLAGS += -I/usr/local/include/opencv" >> ./config.mk
+ echo "ADD_LDFLAGS += -L/usr/local/lib" >> ./config.mk
+ echo "USE_OPENCV=1" >> ./config.mk
+ echo "USE_OPENMP=1" >> ./config.mk
+ echo "USE_BLAS=openblas" >> ./config.mk
+ echo "USE_LAPACK=1" >> ./config.mk
+ echo "USE_DIST_KVSTORE=1" >> ./config.mk
+ echo "USE_S3=1" >> ./config.mk
+ echo "USE_CUDA=1" >> ./config.mk
+ echo "USE_CUDNN=1" >> ./config.mk
+ echo "ADD_CFLAGS += -I/usr/local/cuda/include" >> ./config.mk
+ echo "ADD_LDFLAGS += -L/usr/local/cuda/lib64/ " >> ./config.mk
+ #update th nccl version approriately
+ echo "ADD_LDFLAGS += -L/lib/nccl/cuda-9.0/lib " >> ./config.mk
+ eval "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/lib/nccl/cuda-9.0/lib"
+ eval "export LD_LIBRARY_PATH=/usr/local/cuda/lib64:$LD_LIBRARY_PATH"
+ make -j$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | tail -1)
+ echo "Building MXNet Backend on Linux GPU"
+else
+ echo "MY ALIEN OVERLOADS HAVE NOT TOLD WHAT TO DO FOR INVALID INPUT !!!"
+ echo "Currently supported platforms: osx-x86_64-cpu or linux-x86_64-cpu or linux-x86_64-gpu"
+fi
+chkret popd
+echo "done building MXNet Backend"
+exit 0
diff --git a/scala-package/examples/pom.xml b/scala-package/examples/pom.xml
index 721f882..5ae86f4 100644
--- a/scala-package/examples/pom.xml
+++ b/scala-package/examples/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -150,13 +150,13 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-infer_${scala.binary.version}</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/scala-package/infer/pom.xml b/scala-package/infer/pom.xml
index 56a3507..daf4b47 100644
--- a/scala-package/infer/pom.xml
+++ b/scala-package/infer/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>mxnet-parent_2.11</artifactId>
<groupId>org.apache.mxnet</groupId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
diff --git a/scala-package/init-native/linux-x86_64/pom.xml b/scala-package/init-native/linux-x86_64/pom.xml
index d3653a5..c35e905 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>org.apache.mxnet</groupId>
<artifactId>mxnet-scala-init-native-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -20,7 +20,7 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-init_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-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 f2b2b3d..812ad64 100644
--- a/scala-package/init-native/osx-x86_64/pom.xml
+++ b/scala-package/init-native/osx-x86_64/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-scala-init-native-parent</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-init_${scala.binary.version}</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-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 3a56d58..55c724d 100644
--- a/scala-package/init-native/pom.xml
+++ b/scala-package/init-native/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/scala-package/init/pom.xml b/scala-package/init/pom.xml
index 35ab07d..38bd130 100644
--- a/scala-package/init/pom.xml
+++ b/scala-package/init/pom.xml
@@ -4,8 +4,8 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0</version>
-<!-- <relativePath>../pom.xml</relativePath>-->
+ <version>1.2.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>mxnet-init_2.11</artifactId>
@@ -30,18 +30,38 @@
<platform>linux-x86_64-gpu</platform>
</properties>
</profile>
+ <profile>
+ <id>apache-release</id>
+ <!--Running the compile-backend inside a different profile did not work when used with apache-release profile for release-perform-->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.6.0</version>
+ <executions>
+ <execution>
+ <id>compile-mxnet-backend</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>bash</executable>
+ <commandlineArgs>${project.parent.basedir}/dev/compile-mxnet-backend.sh ${build.platform} ${project.parent.basedir}/../</commandlineArgs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/scala-package/macros/pom.xml b/scala-package/macros/pom.xml
index e692d95..fee1dd2 100644
--- a/scala-package/macros/pom.xml
+++ b/scala-package/macros/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -51,13 +51,13 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-init_${scala.binary.version}</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>libmxnet-init-scala-${platform}</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-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 94c2a74..0f2bc84 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>org.apache.mxnet</groupId>
<artifactId>mxnet-scala-native-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -20,7 +20,7 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-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 3d2969b..8b9f875 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>org.apache.mxnet</groupId>
<artifactId>mxnet-scala-native-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -20,7 +20,7 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-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 01c3114..1296050 100644
--- a/scala-package/native/osx-x86_64-cpu/pom.xml
+++ b/scala-package/native/osx-x86_64-cpu/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-scala-native-parent</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
diff --git a/scala-package/native/pom.xml b/scala-package/native/pom.xml
index 3280ebf..a9b2ec9 100644
--- a/scala-package/native/pom.xml
+++ b/scala-package/native/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/scala-package/pom.xml b/scala-package/pom.xml
index 63208c5..1643c36 100644
--- a/scala-package/pom.xml
+++ b/scala-package/pom.xml
@@ -8,7 +8,7 @@
</parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<name>MXNet Scala Package - Parent</name>
<url>https://github.com/apache/incubator-mxnet/tree/master/scala-package</url>
<description>
@@ -30,12 +30,13 @@
<connection>scm:git:git@github.com:apache/incubator-mxnet.git</connection>
<developerConnection>scm:git:git@github.com:apache/incubator-mxnet.git</developerConnection>
<url>https://github.com/apache/incubator-mxnet</url>
- <tag>mxnet-parent_2.11-1.2.0</tag>
+ <tag>HEAD</tag>
</scm>
<properties>
<scala.version>2.11.8</scala.version>
<scala.binary.version>2.11</scala.binary.version>
+ <build.platform />
</properties>
<packaging>pom</packaging>
@@ -150,6 +151,14 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <localCheckout>true</localCheckout>
+ <pushChanges>false</pushChanges>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
diff --git a/scala-package/spark/pom.xml b/scala-package/spark/pom.xml
index 41c0905..8ba4241 100644
--- a/scala-package/spark/pom.xml
+++ b/scala-package/spark/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
marcoabreu@apache.org.