Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[jvm-packages] Fix up build for xgboost4j-gpu, xgboost4j-spark-gpu (#6216)

Browse Source 
* [CI] Clean up build for JVM packages

* Use correct path for saving native lib

* Fix groupId of maven-surefire-plugin

* Fix stashing of xgboost4j_jar_gpu

* [CI] Don't run xgboost4j-tester with GPU, since it doesn't use gpu_hist
This commit is contained in:
Philip Hyunsu Cho
2020-10-09 14:08:15 -07:00
committed by GitHub
parent 70ce5216b5
commit c991eb612d
9 changed files with 82 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
jvm-packages/create_jni.py
View File

@@ -120,30 +120,33 @@ if __name__ == "__main__":
run(sys.executable + " mapfeat.py")
run(sys.executable + " mknfold.py machine.txt 1")
xgboost4j = 'xgboost4j-gpu' if cli_args.use_cuda == 'ON' else 'xgboost4j'
xgboost4j_spark = 'xgboost4j-spark-gpu' if cli_args.use_cuda == 'ON' else 'xgboost4j-spark'
print("copying native library")
library_name = {
"win32": "xgboost4j.dll",
"darwin": "libxgboost4j.dylib",
"linux": "libxgboost4j.so"
}[sys.platform]
maybe_makedirs("xgboost4j/src/main/resources/lib")
cp("../lib/" + library_name, "xgboost4j/src/main/resources/lib")
maybe_makedirs("{}/src/main/resources/lib".format(xgboost4j))
cp("../lib/" + library_name, "{}/src/main/resources/lib".format(xgboost4j))
print("copying pure-Python tracker")
cp("../dmlc-core/tracker/dmlc_tracker/tracker.py",
"xgboost4j/src/main/resources")
"{}/src/main/resources".format(xgboost4j))
print("copying train/test files")
maybe_makedirs("xgboost4j-spark/src/test/resources")
maybe_makedirs("{}/src/test/resources".format(xgboost4j_spark))
with cd("../demo/regression"):
run("{} mapfeat.py".format(sys.executable))
run("{} mknfold.py machine.txt 1".format(sys.executable))
for file in glob.glob("../demo/regression/machine.txt.t*"):
cp(file, "xgboost4j-spark/src/test/resources")
cp(file, "{}/src/test/resources".format(xgboost4j_spark))
for file in glob.glob("../demo/data/agaricus.*"):
cp(file, "xgboost4j-spark/src/test/resources")
cp(file, "{}/src/test/resources".format(xgboost4j_spark))
maybe_makedirs("xgboost4j/src/test/resources")
maybe_makedirs("{}/src/test/resources".format(xgboost4j))
for file in glob.glob("../demo/data/agaricus.*"):
cp(file, "xgboost4j/src/test/resources")
cp(file, "{}/src/test/resources".format(xgboost4j))

69
jvm-packages/pom.xml
View File

@@ -50,12 +50,6 @@
</repository>
</repositories>
<modules>
<module>xgboost4j</module>
<module>xgboost4j-example</module>
<module>xgboost4j-spark</module>
<module>xgboost4j-flink</module>
<module>xgboost4j-gpu</module>
<module>xgboost4j-spark-gpu</module>
</modules>
<profiles>
@@ -65,6 +59,12 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>xgboost4j</module>
<module>xgboost4j-example</module>
<module>xgboost4j-spark</module>
<module>xgboost4j-flink</module>
</modules>
<build>
<plugins>
<plugin>
@@ -87,6 +87,10 @@
<value>ON</value>
</property>
</activation>
<modules>
<module>xgboost4j-gpu</module>
<module>xgboost4j-spark-gpu</module>
</modules>
<build>
<plugins>
<plugin>
@@ -103,6 +107,10 @@
<properties>
<use.cuda>ON</use.cuda>
</properties>
<modules>
<module>xgboost4j-gpu</module>
<module>xgboost4j-spark-gpu</module>
</modules>
<build>
<plugins>
<plugin>
@@ -118,6 +126,14 @@
<profile>
<id>release</id>
<modules>
<module>xgboost4j</module>
<module>xgboost4j-example</module>
<module>xgboost4j-spark</module>
<module>xgboost4j-flink</module>
<module>xgboost4j-gpu</module>
<module>xgboost4j-spark-gpu</module>
</modules>
<build>
<plugins>
<plugin>
@@ -187,6 +203,13 @@
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
</profile>
@@ -229,6 +252,14 @@
<properties>
<github.global.server>github</github.global.server>
</properties>
<modules>
<module>xgboost4j</module>
<module>xgboost4j-example</module>
<module>xgboost4j-spark</module>
<module>xgboost4j-flink</module>
<module>xgboost4j-gpu</module>
<module>xgboost4j-spark-gpu</module>
</modules>
<build>
<plugins>
<plugin>
@@ -265,6 +296,13 @@
<altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo</altDeploymentRepository>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
</profile>
@@ -290,6 +328,25 @@
<url>https://s3.amazonaws.com/xgboost-maven-repo/release</url>
</repository>
</repositories>
<modules>
<module>xgboost4j</module>
<module>xgboost4j-example</module>
<module>xgboost4j-spark</module>
<module>xgboost4j-flink</module>
<module>xgboost4j-gpu</module>
<module>xgboost4j-spark-gpu</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<distributionManagement>

1
jvm-packages/xgboost4j-gpu/src Symbolic link
View File

@@ -0,0 +1 @@
../xgboost4j/src/

1
jvm-packages/xgboost4j-spark-gpu/src Symbolic link
View File

@@ -0,0 +1 @@
../xgboost4j-spark/src/

2
jvm-packages/xgboost4j/pom.xml
View File

@@ -86,8 +86,6 @@
<argument>create_jni.py</argument>
<argument>--log-capi-invocation</argument>
<argument>${log.capi.invocation}</argument>
<argument>--use-cuda</argument>
<argument>${use.cuda}</argument>
</arguments>
<workingDirectory>${user.dir}</workingDirectory>
</configuration>