You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by ns...@apache.org on 2018/07/25 07:09:58 UTC
[incubator-mxnet] branch master updated: [MXNET-710] Change POM
files to be able to regularly publish to Apache Release & Maven Central
Repo (#11862)
This is an automated email from the ASF dual-hosted git repository.
nswamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 424fafe [MXNET-710] Change POM files to be able to regularly publish to Apache Release & Maven Central Repo (#11862)
424fafe is described below
commit 424fafe58785520cfb8e3ad0e6ce26f9e9db5e24
Author: Naveen Swamy <mn...@gmail.com>
AuthorDate: Wed Jul 25 00:09:51 2018 -0700
[MXNET-710] Change POM files to be able to regularly publish to Apache Release & Maven Central Repo (#11862)
* pom file changes for maven builds
---
Makefile | 23 ++++-
scala-package/assembly/linux-x86_64-cpu/pom.xml | 36 +++++++-
scala-package/assembly/linux-x86_64-gpu/pom.xml | 36 +++++++-
scala-package/assembly/osx-x86_64-cpu/pom.xml | 41 +++++++++
scala-package/assembly/pom.xml | 9 +-
scala-package/core/pom.xml | 7 ++
scala-package/dev/compile-mxnet-backend.sh | 108 ++++++++++++++++++++++++
scala-package/infer/pom.xml | 7 ++
scala-package/init-native/linux-x86_64/pom.xml | 9 +-
scala-package/init-native/osx-x86_64/pom.xml | 11 ++-
scala-package/init-native/pom.xml | 13 +++
scala-package/init/pom.xml | 33 ++++++++
scala-package/macros/pom.xml | 7 ++
scala-package/native/linux-x86_64-cpu/pom.xml | 9 +-
scala-package/native/linux-x86_64-gpu/pom.xml | 9 +-
scala-package/native/osx-x86_64-cpu/pom.xml | 9 +-
scala-package/native/pom.xml | 13 +++
scala-package/pom.xml | 75 ++++++++--------
18 files changed, 402 insertions(+), 53 deletions(-)
diff --git a/Makefile b/Makefile
index 5816637..88f7dd9 100644
--- a/Makefile
+++ b/Makefile
@@ -589,6 +589,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")
@@ -608,12 +609,32 @@ scalaintegrationtest:
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")
+scalarelease-dryrun:
+ (cd $(ROOTDIR)/scala-package; \
+ mvn release:clean release:prepare -DdryRun=true -DautoVersionSubmodules=true \
+ -Papache-release,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) \
+ -Darguments=""-Dbuild\.platform=\""$(SCALA_PKG_PROFILE)\""\ -DskipTests\ -Dcflags=\""$(CFLAGS)\""\ -Dcxx=\""$(CXX)\""\ -Dldflags=\""$(LDFLAGS)\""\ -Dlddeps=\""$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a\"""")
+
+scalarelease-prepare:
+ (cd $(ROOTDIR)/scala-package; \
+ mvn release:clean release:prepare -DautoVersionSubmodules=true \
+ -Papache-release,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) \
+ -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:perform -DautoVersionSubmodules=true \
+ -Papache-release,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) \
+ -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 -Prelease,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) -DskipTests -Dcxx="$(CXX)" \
+ 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 5ae050c..b410de1 100644
--- a/scala-package/assembly/linux-x86_64-cpu/pom.xml
+++ b/scala-package/assembly/linux-x86_64-cpu/pom.xml
@@ -26,15 +26,49 @@
<version>1.3.0-SNAPSHOT</version>
<type>so</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.mxnet</groupId>
+ <artifactId>mxnet-infer_${scala.binary.version}</artifactId>
+ <version>1.3.0-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>
<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 c4d7aa9..0a1e795 100644
--- a/scala-package/assembly/linux-x86_64-gpu/pom.xml
+++ b/scala-package/assembly/linux-x86_64-gpu/pom.xml
@@ -26,15 +26,49 @@
<version>1.3.0-SNAPSHOT</version>
<type>so</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.mxnet</groupId>
+ <artifactId>mxnet-infer_${scala.binary.version}</artifactId>
+ <version>1.3.0-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>
<configuration>
- <skip>true</skip>
+ <skip>false</skip>
</configuration>
</plugin>
<plugin>
diff --git a/scala-package/assembly/osx-x86_64-cpu/pom.xml b/scala-package/assembly/osx-x86_64-cpu/pom.xml
index 69e87b7..8a12d80 100644
--- a/scala-package/assembly/osx-x86_64-cpu/pom.xml
+++ b/scala-package/assembly/osx-x86_64-cpu/pom.xml
@@ -26,11 +26,52 @@
<version>1.3.0-SNAPSHOT</version>
<type>jnilib</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.mxnet</groupId>
+ <artifactId>mxnet-infer_${scala.binary.version}</artifactId>
+ <version>1.3.0-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>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
diff --git a/scala-package/assembly/pom.xml b/scala-package/assembly/pom.xml
index 83d6c73..aef50ce 100644
--- a/scala-package/assembly/pom.xml
+++ b/scala-package/assembly/pom.xml
@@ -39,6 +39,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
@@ -47,7 +54,7 @@
<goal>jar-no-fork</goal>
</goals>
<configuration>
- <includePom>true</includePom>>
+ <includePom>true</includePom>
</configuration>
</execution>
</executions>
diff --git a/scala-package/core/pom.xml b/scala-package/core/pom.xml
index 79da63b..134e0a5 100644
--- a/scala-package/core/pom.xml
+++ b/scala-package/core/pom.xml
@@ -50,6 +50,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
diff --git a/scala-package/dev/compile-mxnet-backend.sh b/scala-package/dev/compile-mxnet-backend.sh
new file mode 100755
index 0000000..b065e01
--- /dev/null
+++ b/scala-package/dev/compile-mxnet-backend.sh
@@ -0,0 +1,108 @@
+#!/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 2) || ( $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
+# This routine executes a command,
+# prints error message on the console on non-zero exit codes and
+# returns the exit code to the caller.
+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/include" >> ./config.mk
+ echo "ADD_CFLAGS += -I/usr/local/opt/openblas/include" >> ./config.mk
+ echo "ADD_LDFLAGS += -L/usr/local/opt/opencv/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 "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/infer/pom.xml b/scala-package/infer/pom.xml
index 573684d..3425579 100644
--- a/scala-package/infer/pom.xml
+++ b/scala-package/infer/pom.xml
@@ -50,6 +50,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
diff --git a/scala-package/init-native/linux-x86_64/pom.xml b/scala-package/init-native/linux-x86_64/pom.xml
index 2ddeaba..7a6d908 100644
--- a/scala-package/init-native/linux-x86_64/pom.xml
+++ b/scala-package/init-native/linux-x86_64/pom.xml
@@ -30,6 +30,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
@@ -55,7 +62,7 @@
<compilerStartOption>-std=c++0x</compilerStartOption>
</compilerStartOptions>
<compilerEndOptions>
- <compilerEndOption>-I../../../include</compilerEndOption>
+ <compilerEndOption>-I${project.basedir}/../../../include</compilerEndOption>
<compilerEndOption>${all_includes}</compilerEndOption>
<compilerEndOption>${cflags}</compilerEndOption>
</compilerEndOptions>
diff --git a/scala-package/init-native/osx-x86_64/pom.xml b/scala-package/init-native/osx-x86_64/pom.xml
index 1208549..0eaf4e3 100644
--- a/scala-package/init-native/osx-x86_64/pom.xml
+++ b/scala-package/init-native/osx-x86_64/pom.xml
@@ -30,6 +30,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
@@ -55,7 +62,7 @@
<compilerStartOption>-std=c++0x</compilerStartOption>
</compilerStartOptions>
<compilerEndOptions>
- <compilerEndOption>-I../../../include</compilerEndOption>
+ <compilerEndOption>-I${project.basedir}/../../../include</compilerEndOption>
<compilerEndOption>${cflags}</compilerEndOption>
</compilerEndOptions>
<linkerStartOptions>
@@ -66,7 +73,7 @@
<linkerMiddleOption>-Wl,-exported_symbol,_Java_*</linkerMiddleOption>
<linkerMiddleOption>-Wl,-x</linkerMiddleOption>
<linkerMiddleOption>${lddeps}</linkerMiddleOption>
- <linkerMiddleOption>-force_load ../../../lib/libmxnet.a</linkerMiddleOption>
+ <linkerMiddleOption>-force_load ${project.basedir}/../../../lib/libmxnet.a</linkerMiddleOption>
</linkerMiddleOptions>
<linkerEndOptions>
<linkerEndOption>${ldflags}</linkerEndOption>
diff --git a/scala-package/init-native/pom.xml b/scala-package/init-native/pom.xml
index 8ac369d..1cd79a8 100644
--- a/scala-package/init-native/pom.xml
+++ b/scala-package/init-native/pom.xml
@@ -34,4 +34,17 @@
</modules>
</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/init/pom.xml b/scala-package/init/pom.xml
index ef1d67b..2c00ca5 100644
--- a/scala-package/init/pom.xml
+++ b/scala-package/init/pom.xml
@@ -32,5 +32,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>
</project>
diff --git a/scala-package/macros/pom.xml b/scala-package/macros/pom.xml
index 15f13f3..7959009 100644
--- a/scala-package/macros/pom.xml
+++ b/scala-package/macros/pom.xml
@@ -75,6 +75,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
diff --git a/scala-package/native/linux-x86_64-cpu/pom.xml b/scala-package/native/linux-x86_64-cpu/pom.xml
index 2504b1f..c45635e 100644
--- a/scala-package/native/linux-x86_64-cpu/pom.xml
+++ b/scala-package/native/linux-x86_64-cpu/pom.xml
@@ -30,6 +30,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
@@ -55,7 +62,7 @@
<compilerStartOption>-std=c++0x</compilerStartOption>
</compilerStartOptions>
<compilerEndOptions>
- <compilerEndOption>-I../../../include</compilerEndOption>
+ <compilerEndOption>-I${project.basedir}/../../../include</compilerEndOption>
<compilerEndOption>${all_includes}</compilerEndOption>
<compilerEndOption>${cflags}</compilerEndOption>
</compilerEndOptions>
diff --git a/scala-package/native/linux-x86_64-gpu/pom.xml b/scala-package/native/linux-x86_64-gpu/pom.xml
index aca290f..a1f5ec3 100644
--- a/scala-package/native/linux-x86_64-gpu/pom.xml
+++ b/scala-package/native/linux-x86_64-gpu/pom.xml
@@ -30,6 +30,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
@@ -55,7 +62,7 @@
<compilerStartOption>-std=c++0x</compilerStartOption>
</compilerStartOptions>
<compilerEndOptions>
- <compilerEndOption>-I../../../include</compilerEndOption>
+ <compilerEndOption>-I${project.basedir}/../../../include</compilerEndOption>
<compilerEndOption>${all_includes}</compilerEndOption>
<compilerEndOption>${cflags}</compilerEndOption>
</compilerEndOptions>
diff --git a/scala-package/native/osx-x86_64-cpu/pom.xml b/scala-package/native/osx-x86_64-cpu/pom.xml
index 1503353..3f66fe6 100644
--- a/scala-package/native/osx-x86_64-cpu/pom.xml
+++ b/scala-package/native/osx-x86_64-cpu/pom.xml
@@ -30,6 +30,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
@@ -66,8 +73,6 @@
<linkerMiddleOption>-Wl,-exported_symbol,_Java_*</linkerMiddleOption>
<linkerMiddleOption>-Wl,-x</linkerMiddleOption>
<linkerMiddleOption>${lddeps}</linkerMiddleOption>
- <linkerMiddleOption>-force_load ../../../lib/libmxnet.a</linkerMiddleOption>
- <linkerMiddleOption>-force_load ../../../3rdparty/tvm/nnvm/lib/libnnvm.a</linkerMiddleOption>
</linkerMiddleOptions>
<linkerEndOptions>
<linkerEndOption>${ldflags}</linkerEndOption>
diff --git a/scala-package/native/pom.xml b/scala-package/native/pom.xml
index 54ba2b5..485b69f 100644
--- a/scala-package/native/pom.xml
+++ b/scala-package/native/pom.xml
@@ -34,4 +34,17 @@
</modules>
</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/pom.xml b/scala-package/pom.xml
index d931a82..c4f1620 100644
--- a/scala-package/pom.xml
+++ b/scala-package/pom.xml
@@ -3,31 +3,42 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>19</version>
+ </parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
<version>1.3.0-SNAPSHOT</version>
<name>MXNet Scala Package - Parent</name>
<url>https://github.com/apache/incubator-mxnet/tree/master/scala-package</url>
- <description>MXNet Scala Package</description>
+ <description>
+ Scala Package for Apache MXNet (Incubating) - flexible and efficient library for deep learning.
+ </description>
<organization>
- <name>Distributed (Deep) Machine Learning Community</name>
- <url>http://dmlc.ml</url>
+ <name>The Apache Software Foundation</name>
+ <url>https://www.apache.org/</url>
</organization>
<licenses>
<license>
- <name>The Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <name>Apache License, Version 2.0</name>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
</license>
</licenses>
+
<scm>
- <connection>scm:git:git@github.com:dmlc/mxnet.git</connection>
- <developerConnection>scm:git:git@github.com:dmlc/mxnet.git</developerConnection>
+ <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>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>
@@ -65,29 +76,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <serverId>ossrh</serverId>
- <nexusUrl>https://oss.sonatype.org/</nexusUrl>
- <autoReleaseAfterClose>true</autoReleaseAfterClose>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
@@ -161,17 +149,25 @@
</profile>
</profiles>
- <distributionManagement>
- <snapshotRepository>
- <id>ossrh</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<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>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
@@ -215,11 +211,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19</version>
<configuration>