You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ch...@apache.org on 2019/04/16 10:08:22 UTC
[ignite] branch master updated: IGNITE-11328: Ignite binary build
is too big
This is an automated email from the ASF dual-hosted git repository.
chief pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 27f4fab IGNITE-11328: Ignite binary build is too big
27f4fab is described below
commit 27f4fab7d4d56361bb77992563c8c710a99505fa
Author: Alexey Platonov <ap...@gmail.com>
AuthorDate: Tue Apr 16 13:08:12 2019 +0300
IGNITE-11328: Ignite binary build is too big
This closes #6144
---
examples/pom.xml | 6 ++++++
modules/ml/mleap-model-parser/pom.xml | 2 +-
modules/ml/pom.xml | 13 -------------
modules/ml/spark-model-parser/pom.xml | 1 +
.../pom.xml | 22 ++++++++++++++--------
.../parser/TensorFlowBaseModelParser.java | 0
.../parser/TensorFlowGraphModelParser.java | 0
.../parser/TensorFlowSavedModelModelParser.java | 0
modules/ml/xgboost-model-parser/pom.xml | 1 +
pom.xml | 1 +
10 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/examples/pom.xml b/examples/pom.xml
index 3563d74..634fd8b 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -96,6 +96,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-ml-tensorflow-model-parser</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.2</version>
diff --git a/modules/ml/mleap-model-parser/pom.xml b/modules/ml/mleap-model-parser/pom.xml
index 4221c3a..4826bcf 100644
--- a/modules/ml/mleap-model-parser/pom.xml
+++ b/modules/ml/mleap-model-parser/pom.xml
@@ -48,6 +48,7 @@
</goals>
<configuration>
<excludeTransitive>false</excludeTransitive>
+ <excludeArtifactIds>fastutil,h2</excludeArtifactIds>
</configuration>
</execution>
</executions>
@@ -67,5 +68,4 @@
<version>0.13.0</version>
</dependency>
</dependencies>
-
</project>
diff --git a/modules/ml/pom.xml b/modules/ml/pom.xml
index 478fb7a..bb66780 100644
--- a/modules/ml/pom.xml
+++ b/modules/ml/pom.xml
@@ -24,7 +24,6 @@
<modelVersion>4.0.0</modelVersion>
<properties>
<commons.math.version>3.6.1</commons.math.version>
- <tensorflow.version>1.12.0</tensorflow.version>
</properties>
<parent>
@@ -131,18 +130,6 @@
</dependency>
<dependency>
- <groupId>org.tensorflow</groupId>
- <artifactId>tensorflow</artifactId>
- <version>${tensorflow.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.tensorflow</groupId>
- <artifactId>proto</artifactId>
- <version>${tensorflow.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>${mockito.version}</version>
diff --git a/modules/ml/spark-model-parser/pom.xml b/modules/ml/spark-model-parser/pom.xml
index e852ac3..9dd60c8 100644
--- a/modules/ml/spark-model-parser/pom.xml
+++ b/modules/ml/spark-model-parser/pom.xml
@@ -48,6 +48,7 @@
</goals>
<configuration>
<excludeTransitive>false</excludeTransitive>
+ <excludeArtifactIds>fastutil,h2</excludeArtifactIds>
</configuration>
</execution>
</executions>
diff --git a/modules/ml/spark-model-parser/pom.xml b/modules/ml/tensorflow-model-parser/pom.xml
similarity index 81%
copy from modules/ml/spark-model-parser/pom.xml
copy to modules/ml/tensorflow-model-parser/pom.xml
index e852ac3..551a60c 100644
--- a/modules/ml/spark-model-parser/pom.xml
+++ b/modules/ml/tensorflow-model-parser/pom.xml
@@ -22,8 +22,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
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>
+ <properties>
+ <tensorflow.version>1.12.0</tensorflow.version>
+ </properties>
+
<parent>
<artifactId>ignite-parent</artifactId>
<groupId>org.apache.ignite</groupId>
@@ -31,7 +36,8 @@
<relativePath>../../../parent</relativePath>
</parent>
- <artifactId>ignite-ml-spark-model-parser</artifactId>
+
+ <artifactId>ignite-ml-tensorflow-model-parser</artifactId>
<version>2.8.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
@@ -48,6 +54,7 @@
</goals>
<configuration>
<excludeTransitive>false</excludeTransitive>
+ <excludeArtifactIds>fastutil,h2</excludeArtifactIds>
</configuration>
</execution>
</executions>
@@ -63,16 +70,15 @@
</dependency>
<dependency>
- <groupId>org.apache.parquet</groupId>
- <artifactId>parquet-hadoop</artifactId>
- <version>1.10.0</version>
+ <groupId>org.tensorflow</groupId>
+ <artifactId>tensorflow</artifactId>
+ <version>${tensorflow.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>2.9.1</version>
+ <groupId>org.tensorflow</groupId>
+ <artifactId>proto</artifactId>
+ <version>${tensorflow.version}</version>
</dependency>
</dependencies>
-
</project>
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/inference/parser/TensorFlowBaseModelParser.java b/modules/ml/tensorflow-model-parser/src/main/java/org/apache/ignite/ml/inference/parser/TensorFlowBaseModelParser.java
similarity index 100%
rename from modules/ml/src/main/java/org/apache/ignite/ml/inference/parser/TensorFlowBaseModelParser.java
rename to modules/ml/tensorflow-model-parser/src/main/java/org/apache/ignite/ml/inference/parser/TensorFlowBaseModelParser.java
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/inference/parser/TensorFlowGraphModelParser.java b/modules/ml/tensorflow-model-parser/src/main/java/org/apache/ignite/ml/inference/parser/TensorFlowGraphModelParser.java
similarity index 100%
rename from modules/ml/src/main/java/org/apache/ignite/ml/inference/parser/TensorFlowGraphModelParser.java
rename to modules/ml/tensorflow-model-parser/src/main/java/org/apache/ignite/ml/inference/parser/TensorFlowGraphModelParser.java
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/inference/parser/TensorFlowSavedModelModelParser.java b/modules/ml/tensorflow-model-parser/src/main/java/org/apache/ignite/ml/inference/parser/TensorFlowSavedModelModelParser.java
similarity index 100%
rename from modules/ml/src/main/java/org/apache/ignite/ml/inference/parser/TensorFlowSavedModelModelParser.java
rename to modules/ml/tensorflow-model-parser/src/main/java/org/apache/ignite/ml/inference/parser/TensorFlowSavedModelModelParser.java
diff --git a/modules/ml/xgboost-model-parser/pom.xml b/modules/ml/xgboost-model-parser/pom.xml
index 6e6800d..c86b8d0 100644
--- a/modules/ml/xgboost-model-parser/pom.xml
+++ b/modules/ml/xgboost-model-parser/pom.xml
@@ -52,6 +52,7 @@
</goals>
<configuration>
<excludeTransitive>false</excludeTransitive>
+ <excludeArtifactIds>fastutil,h2</excludeArtifactIds>
</configuration>
</execution>
</executions>
diff --git a/pom.xml b/pom.xml
index 9966408..e1586e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,7 @@
<module>modules/ml</module>
<module>modules/ml/spark-model-parser</module>
<module>modules/ml/xgboost-model-parser</module>
+ <module>modules/ml/tensorflow-model-parser</module>
<module>modules/tensorflow</module>
</modules>