Update xgboost4j from 0.60-0.10 to 0.7
Project: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/commit/b246527c Tree: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/tree/b246527c Diff: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/diff/b246527c Branch: refs/heads/v0.5.0 Commit: b246527c27fde5ba12226739ef3ea9386fc217e2 Parents: 428cd84 Author: Makoto Yui <[email protected]> Authored: Thu Jan 18 20:28:56 2018 +0900 Committer: Makoto Yui <[email protected]> Committed: Thu Jan 18 20:28:56 2018 +0900 ---------------------------------------------------------------------- xgboost/lib/xgboost4j-0.60-0.10.jar | Bin 1983065 -> 0 bytes xgboost/lib/xgboost4j-0.7.jar | Bin 0 -> 1699734 bytes xgboost/pom.xml | 17 ++++++++--------- .../main/java/hivemall/xgboost/XGBoostUtils.java | 4 +++- 4 files changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/b246527c/xgboost/lib/xgboost4j-0.60-0.10.jar ---------------------------------------------------------------------- diff --git a/xgboost/lib/xgboost4j-0.60-0.10.jar b/xgboost/lib/xgboost4j-0.60-0.10.jar deleted file mode 100644 index 4e606e1..0000000 Binary files a/xgboost/lib/xgboost4j-0.60-0.10.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/b246527c/xgboost/lib/xgboost4j-0.7.jar ---------------------------------------------------------------------- diff --git a/xgboost/lib/xgboost4j-0.7.jar b/xgboost/lib/xgboost4j-0.7.jar new file mode 100644 index 0000000..f0627c2 Binary files /dev/null and b/xgboost/lib/xgboost4j-0.7.jar differ http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/b246527c/xgboost/pom.xml ---------------------------------------------------------------------- diff --git a/xgboost/pom.xml b/xgboost/pom.xml index 45df10b..81767ce 100644 --- a/xgboost/pom.xml +++ b/xgboost/pom.xml @@ -31,8 +31,7 @@ <packaging>jar</packaging> <properties> - <xgboost.version>0.60</xgboost.version> - <xgboost4j.version>0.10</xgboost4j.version> + <xgboost.version>0.7</xgboost.version> <main.basedir>${project.parent.basedir}</main.basedir> </properties> @@ -103,7 +102,7 @@ <dependency> <groupId>ml.dmlc</groupId> <artifactId>xgboost4j</artifactId> - <version>${xgboost4j.version}</version> + <version>${xgboost.version}</version> <scope>compile</scope> </dependency> <dependency> @@ -131,11 +130,11 @@ <id>install-xgboost</id> <phase>validate</phase> <configuration> - <file>${basedir}/lib/xgboost4j-${xgboost.version}-${xgboost4j.version}.jar</file> + <file>${basedir}/lib/xgboost4j-${xgboost.version}.jar</file> <repositoryLayout>default</repositoryLayout> <groupId>ml.dmlc</groupId> <artifactId>xgboost4j</artifactId> - <version>${xgboost4j.version}</version> + <version>${xgboost.version}</version> <packaging>jar</packaging> <generatePom>true</generatePom> </configuration> @@ -150,7 +149,7 @@ <artifactId>maven-shade-plugin</artifactId> <version>3.1.0</version> <executions> - <!-- hivemall-xgboost_xx-xx.jar --> + <!-- hivemall-xgboost-xx.jar --> <execution> <id>jar-with-portal-binaries</id> <phase>package</phase> @@ -158,7 +157,7 @@ <goal>shade</goal> </goals> <configuration> - <finalName>${project.artifactId}-${xgboost.version}-${project.version}</finalName> + <finalName>${project.artifactId}-${project.version}</finalName> <outputDirectory>${project.parent.build.directory}</outputDirectory> <minimizeJar>false</minimizeJar> <createDependencyReducedPom>false</createDependencyReducedPom> @@ -177,7 +176,7 @@ </filters> </configuration> </execution> - <!-- hivemall-xgboost_xx-xx-with-dependencies.jar including minimum dependencies --> + <!-- hivemall-xgboost-xx-with-dependencies.jar including minimum dependencies --> <execution> <id>jar-with-dependencies</id> <phase>package</phase> @@ -185,7 +184,7 @@ <goal>shade</goal> </goals> <configuration> - <finalName>${project.artifactId}-${xgboost.version}-${project.version}-with-dependencies</finalName> + <finalName>${project.artifactId}-${project.version}-with-dependencies</finalName> <outputDirectory>${project.parent.build.directory}</outputDirectory> <minimizeJar>true</minimizeJar> <createDependencyReducedPom>false</createDependencyReducedPom> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/b246527c/xgboost/src/main/java/hivemall/xgboost/XGBoostUtils.java ---------------------------------------------------------------------- diff --git a/xgboost/src/main/java/hivemall/xgboost/XGBoostUtils.java b/xgboost/src/main/java/hivemall/xgboost/XGBoostUtils.java index 2e2bf25..0472229 100644 --- a/xgboost/src/main/java/hivemall/xgboost/XGBoostUtils.java +++ b/xgboost/src/main/java/hivemall/xgboost/XGBoostUtils.java @@ -48,7 +48,9 @@ public final class XGBoostUtils { values[i] = Float.parseFloat(str.substring(pos + 1)); } } - return LabeledPoint.fromSparseVector((float) target, indices, values); + + + return new LabeledPoint((float) target, indices, values); } }
