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/05/23 12:08:47 UTC
[incubator-mxnet] 02/05: update link and compile paths for native
code
This is an automated email from the ASF dual-hosted git repository.
nswamy pushed a commit to branch v1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
commit b6bd078d210634ed2111a829439c20ca363a712c
Author: Naveen Swamy <mn...@gmail.com>
AuthorDate: Wed May 23 04:26:10 2018 -0700
update link and compile paths for native code
---
Makefile | 6 ++++++
scala-package/assembly/osx-x86_64-cpu/pom.xml | 8 ++++----
scala-package/assembly/pom.xml | 2 +-
scala-package/core/pom.xml | 6 +++---
scala-package/examples/pom.xml | 6 +++---
scala-package/infer/pom.xml | 4 ++--
scala-package/init-native/linux-x86_64/pom.xml | 2 +-
scala-package/init-native/osx-x86_64/pom.xml | 7 ++++---
scala-package/init-native/pom.xml | 2 +-
scala-package/init/pom.xml | 2 +-
scala-package/macros/pom.xml | 6 +++---
scala-package/native/linux-x86_64-cpu/pom.xml | 2 +-
scala-package/native/linux-x86_64-gpu/pom.xml | 2 +-
scala-package/native/osx-x86_64-cpu/pom.xml | 8 ++++----
scala-package/native/pom.xml | 2 +-
scala-package/pom.xml | 8 ++++----
scala-package/spark/pom.xml | 4 ++--
17 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/Makefile b/Makefile
index 9004dbe..3317fc5 100644
--- a/Makefile
+++ b/Makefile
@@ -604,6 +604,12 @@ scalarelease:
-Papache-release,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) \
-Darguments=""-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 \
+ -Papache-release,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) \
+ -Darguments=""-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)" \
diff --git a/scala-package/assembly/osx-x86_64-cpu/pom.xml b/scala-package/assembly/osx-x86_64-cpu/pom.xml
index 2b3c28c..085b16b 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.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -16,18 +16,18 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>libmxnet-scala-osx-x86_64-cpu</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<type>jnilib</type>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-infer_${scala.binary.version}</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/scala-package/assembly/pom.xml b/scala-package/assembly/pom.xml
index 456f453..2c2a4fc 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.1-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 fb5ea2b..509e732 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.1-SNAPSHOT</version>
+ <version>1.2.0-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.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-macros_${scala.binary.version}</artifactId>
- <version>1.2.1-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 5ae86f4..1d187ca 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.1-SNAPSHOT</version>
+ <version>1.2.0-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.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-infer_${scala.binary.version}</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/scala-package/infer/pom.xml b/scala-package/infer/pom.xml
index daf4b47..929a45e 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.1-SNAPSHOT</version>
+ <version>1.2.0-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.1-SNAPSHOT</version>
+ <version>1.2.0-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 a54b4b9..d3653a5 100644
--- a/scala-package/init-native/linux-x86_64/pom.xml
+++ b/scala-package/init-native/linux-x86_64/pom.xml
@@ -62,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 c3bb4a2..54581e6 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.1-SNAPSHOT</version>
+ <version>1.2.0-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.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -60,7 +60,7 @@
<compilerStartOption>-std=c++0x</compilerStartOption>
</compilerStartOptions>
<compilerEndOptions>
- <compilerEndOption>-I../../../include</compilerEndOption>
+ <compilerEndOption>-I${project.basedir}/../../../include</compilerEndOption>
<compilerEndOption>${cflags}</compilerEndOption>
</compilerEndOptions>
<linkerStartOptions>
@@ -71,6 +71,7 @@
<linkerMiddleOption>-Wl,-exported_symbol,_Java_*</linkerMiddleOption>
<linkerMiddleOption>-Wl,-x</linkerMiddleOption>
<linkerMiddleOption>${lddeps}</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 55c724d..e7834a0 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.1-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 198bd89..df24618 100644
--- a/scala-package/init/pom.xml
+++ b/scala-package/init/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.1-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 fee1dd2..1b33561 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.1-SNAPSHOT</version>
+ <version>1.2.0-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.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>libmxnet-init-scala-${platform}</artifactId>
- <version>1.2.1-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 d102299..94c2a74 100644
--- a/scala-package/native/linux-x86_64-cpu/pom.xml
+++ b/scala-package/native/linux-x86_64-cpu/pom.xml
@@ -62,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 00c6b8b..3d2969b 100644
--- a/scala-package/native/linux-x86_64-gpu/pom.xml
+++ b/scala-package/native/linux-x86_64-gpu/pom.xml
@@ -62,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 343f660..8a68864 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.1-SNAPSHOT</version>
+ <version>1.2.0-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.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -71,8 +71,8 @@
<linkerMiddleOption>-Wl,-exported_symbol,_Java_*</linkerMiddleOption>
<linkerMiddleOption>-Wl,-x</linkerMiddleOption>
<linkerMiddleOption>${lddeps}</linkerMiddleOption>
- <linkerMiddleOption>-force_load ../../../lib/libmxnet.a</linkerMiddleOption>
- <linkerMiddleOption>-force_load ../../../3rdparty/nnvm/lib/libnnvm.a</linkerMiddleOption>
+ <linkerMiddleOption>-force_load ${project.basedir}/../../../lib/libmxnet.a</linkerMiddleOption>
+ <linkerMiddleOption>-force_load ${project.basedir}/../../../3rdparty/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 a9b2ec9..594820a 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.1-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 6e4bfba..eeafb78 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.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<name>MXNet Scala Package - Parent</name>
<url>https://github.com/apache/incubator-mxnet/tree/master/scala-package</url>
<description>
@@ -27,10 +27,10 @@
</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>
+ <tag></tag>
</scm>
<properties>
diff --git a/scala-package/spark/pom.xml b/scala-package/spark/pom.xml
index 8ba4241..e2554c4 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.1-SNAPSHOT</version>
+ <version>1.2.0-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.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
nswamy@apache.org.