From ec6ce08cd024d463e4724b2be35cce158243360a Mon Sep 17 00:00:00 2001 From: Philip Hyunsu Cho Date: Tue, 4 May 2021 14:00:03 -0700 Subject: [PATCH] [jvm-packages] Make it easier to release GPU/CPU code artifacts to Maven Central (#6940) --- jvm-packages/create_jni.py | 8 ++++++-- jvm-packages/xgboost4j-gpu/src | 1 - jvm-packages/xgboost4j-gpu/src/main/java | 1 + .../src/main/resources/xgboost4j-version.properties | 1 + jvm-packages/xgboost4j-gpu/src/main/scala | 1 + jvm-packages/xgboost4j-gpu/src/native | 1 + jvm-packages/xgboost4j-gpu/src/test | 1 + jvm-packages/xgboost4j-spark-gpu/src | 1 - jvm-packages/xgboost4j-spark-gpu/src/main/scala | 1 + jvm-packages/xgboost4j-spark-gpu/src/test | 1 + 10 files changed, 13 insertions(+), 4 deletions(-) delete mode 120000 jvm-packages/xgboost4j-gpu/src create mode 120000 jvm-packages/xgboost4j-gpu/src/main/java create mode 120000 jvm-packages/xgboost4j-gpu/src/main/resources/xgboost4j-version.properties create mode 120000 jvm-packages/xgboost4j-gpu/src/main/scala create mode 120000 jvm-packages/xgboost4j-gpu/src/native create mode 120000 jvm-packages/xgboost4j-gpu/src/test delete mode 120000 jvm-packages/xgboost4j-spark-gpu/src create mode 120000 jvm-packages/xgboost4j-spark-gpu/src/main/scala create mode 120000 jvm-packages/xgboost4j-spark-gpu/src/test diff --git a/jvm-packages/create_jni.py b/jvm-packages/create_jni.py index 851ddd668..b8f6c1480 100755 --- a/jvm-packages/create_jni.py +++ b/jvm-packages/create_jni.py @@ -84,8 +84,9 @@ if __name__ == "__main__": print("building Java wrapper") with cd(".."): - maybe_makedirs("build") - with cd("build"): + build_dir = 'build-gpu' if cli_args.use_cuda == 'ON' else 'build' + maybe_makedirs(build_dir) + with cd(build_dir): if sys.platform == "win32": # Force x64 build on Windows. maybe_generator = ' -A x64' @@ -114,6 +115,9 @@ if __name__ == "__main__": if gpu_arch_flag is not None: args.append("%s" % gpu_arch_flag) + lib_dir = os.path.join(os.pardir, 'lib') + if os.path.exists(lib_dir): + shutil.rmtree(lib_dir) run("cmake .. " + " ".join(args) + maybe_generator) run("cmake --build . --config Release" + maybe_parallel_build) diff --git a/jvm-packages/xgboost4j-gpu/src b/jvm-packages/xgboost4j-gpu/src deleted file mode 120000 index d5cb39952..000000000 --- a/jvm-packages/xgboost4j-gpu/src +++ /dev/null @@ -1 +0,0 @@ -../xgboost4j/src/ \ No newline at end of file diff --git a/jvm-packages/xgboost4j-gpu/src/main/java b/jvm-packages/xgboost4j-gpu/src/main/java new file mode 120000 index 000000000..2e2be8ff1 --- /dev/null +++ b/jvm-packages/xgboost4j-gpu/src/main/java @@ -0,0 +1 @@ +../../../xgboost4j/src/main/java/ \ No newline at end of file diff --git a/jvm-packages/xgboost4j-gpu/src/main/resources/xgboost4j-version.properties b/jvm-packages/xgboost4j-gpu/src/main/resources/xgboost4j-version.properties new file mode 120000 index 000000000..2aed8d3ee --- /dev/null +++ b/jvm-packages/xgboost4j-gpu/src/main/resources/xgboost4j-version.properties @@ -0,0 +1 @@ +../../../../xgboost4j/src/main/resources/xgboost4j-version.properties \ No newline at end of file diff --git a/jvm-packages/xgboost4j-gpu/src/main/scala b/jvm-packages/xgboost4j-gpu/src/main/scala new file mode 120000 index 000000000..d30038a1d --- /dev/null +++ b/jvm-packages/xgboost4j-gpu/src/main/scala @@ -0,0 +1 @@ +../../../xgboost4j/src/main/scala/ \ No newline at end of file diff --git a/jvm-packages/xgboost4j-gpu/src/native b/jvm-packages/xgboost4j-gpu/src/native new file mode 120000 index 000000000..54a2ea471 --- /dev/null +++ b/jvm-packages/xgboost4j-gpu/src/native @@ -0,0 +1 @@ +../../xgboost4j/src/native \ No newline at end of file diff --git a/jvm-packages/xgboost4j-gpu/src/test b/jvm-packages/xgboost4j-gpu/src/test new file mode 120000 index 000000000..6923fed2a --- /dev/null +++ b/jvm-packages/xgboost4j-gpu/src/test @@ -0,0 +1 @@ +../../xgboost4j/src/test \ No newline at end of file diff --git a/jvm-packages/xgboost4j-spark-gpu/src b/jvm-packages/xgboost4j-spark-gpu/src deleted file mode 120000 index 72da7507a..000000000 --- a/jvm-packages/xgboost4j-spark-gpu/src +++ /dev/null @@ -1 +0,0 @@ -../xgboost4j-spark/src/ \ No newline at end of file diff --git a/jvm-packages/xgboost4j-spark-gpu/src/main/scala b/jvm-packages/xgboost4j-spark-gpu/src/main/scala new file mode 120000 index 000000000..e516459f8 --- /dev/null +++ b/jvm-packages/xgboost4j-spark-gpu/src/main/scala @@ -0,0 +1 @@ +../../../xgboost4j-spark/src/main/scala \ No newline at end of file diff --git a/jvm-packages/xgboost4j-spark-gpu/src/test b/jvm-packages/xgboost4j-spark-gpu/src/test new file mode 120000 index 000000000..6522134af --- /dev/null +++ b/jvm-packages/xgboost4j-spark-gpu/src/test @@ -0,0 +1 @@ +../../xgboost4j-spark/src/test \ No newline at end of file