This is an automated email from the ASF dual-hosted git repository.
yangzy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 98b4846ed [GLUTEN-7241][VL] Correct loaded libname in
SharedLibraryLoader (#7245)
98b4846ed is described below
commit 98b4846edb9997959f3b36f8510789fc154882de
Author: Zhen Wang <[email protected]>
AuthorDate: Sat Sep 14 15:32:53 2024 +0800
[GLUTEN-7241][VL] Correct loaded libname in SharedLibraryLoader (#7245)
---
.../gluten/utils/SharedLibraryLoaderCentos7.scala | 44 ++++++-----
.../gluten/utils/SharedLibraryLoaderCentos8.scala | 52 +++++++------
.../gluten/utils/SharedLibraryLoaderCentos9.scala | 52 +++++++------
.../gluten/utils/SharedLibraryLoaderDebian11.scala | 55 +++++++-------
.../gluten/utils/SharedLibraryLoaderDebian12.scala | 67 ++++++++---------
.../utils/SharedLibraryLoaderUbuntu2004.scala | 87 ++++++++++------------
.../utils/SharedLibraryLoaderUbuntu2204.scala | 57 +++++++-------
7 files changed, 194 insertions(+), 220 deletions(-)
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos7.scala
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos7.scala
index b7b63acc7..a5e638d9b 100755
---
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos7.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos7.scala
@@ -20,28 +20,26 @@ import org.apache.gluten.jni.JniLibLoader
class SharedLibraryLoaderCentos7 extends SharedLibraryLoader {
override def loadLib(loader: JniLibLoader): Unit = {
- def loadAndCreateLink(libName: String, linkName: String): Unit = {
- val mapLibName = System.mapLibraryName(libName)
- loader.loadAndCreateLink(mapLibName, linkName, false)
- }
-
- loadAndCreateLink("libboost_atomic.so.1.84.0", "libboost_atomic.so")
- loadAndCreateLink("libboost_thread.so.1.84.0", "libboost_thread.so")
- loadAndCreateLink("libboost_system.so.1.84.0", "libboost_system.so")
- loadAndCreateLink("libboost_regex.so.1.84.0", "libboost_regex.so")
- loadAndCreateLink("libboost_program_options.so.1.84.0",
"libboost_program_options.so")
- loadAndCreateLink("libboost_filesystem.so.1.84.0",
"libboost_filesystem.so")
- loadAndCreateLink("libboost_context.so.1.84.0", "libboost_context.so")
- loadAndCreateLink("libdouble-conversion.so.1", "libdouble-conversion.so")
- loadAndCreateLink("libevent-2.0.so.5", "libevent-2.0.so")
- loadAndCreateLink("libgflags.so.2.2", "libgflags.so")
- loadAndCreateLink("libglog.so.0", "libglog.so")
- loadAndCreateLink("libntlm.so.0", "libntlm.so")
- loadAndCreateLink("libgsasl.so.7", "libgsasl.so")
- loadAndCreateLink("libprotobuf.so.32", "libprotobuf.so")
- loadAndCreateLink("libhdfs3.so.1", "libhdfs3.so")
- loadAndCreateLink("libre2.so.10", "libre2.so")
- loadAndCreateLink("libzstd.so.1", "libzstd.so")
- loadAndCreateLink("liblz4.so.1", "liblz4.so")
+ loader.loadAndCreateLink("libboost_atomic.so.1.84.0",
"libboost_atomic.so", false)
+ loader.loadAndCreateLink("libboost_thread.so.1.84.0",
"libboost_thread.so", false)
+ loader.loadAndCreateLink("libboost_system.so.1.84.0",
"libboost_system.so", false)
+ loader.loadAndCreateLink("libboost_regex.so.1.84.0", "libboost_regex.so",
false)
+ loader.loadAndCreateLink(
+ "libboost_program_options.so.1.84.0",
+ "libboost_program_options.so",
+ false)
+ loader.loadAndCreateLink("libboost_filesystem.so.1.84.0",
"libboost_filesystem.so", false)
+ loader.loadAndCreateLink("libboost_context.so.1.84.0",
"libboost_context.so", false)
+ loader.loadAndCreateLink("libdouble-conversion.so.1",
"libdouble-conversion.so", false)
+ loader.loadAndCreateLink("libevent-2.0.so.5", "libevent-2.0.so", false)
+ loader.loadAndCreateLink("libgflags.so.2.2", "libgflags.so", false)
+ loader.loadAndCreateLink("libglog.so.0", "libglog.so", false)
+ loader.loadAndCreateLink("libntlm.so.0", "libntlm.so", false)
+ loader.loadAndCreateLink("libgsasl.so.7", "libgsasl.so", false)
+ loader.loadAndCreateLink("libprotobuf.so.32", "libprotobuf.so", false)
+ loader.loadAndCreateLink("libhdfs3.so.1", "libhdfs3.so", false)
+ loader.loadAndCreateLink("libre2.so.10", "libre2.so", false)
+ loader.loadAndCreateLink("libzstd.so.1", "libzstd.so", false)
+ loader.loadAndCreateLink("liblz4.so.1", "liblz4.so", false)
}
}
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos8.scala
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos8.scala
index d0b91c09b..5d8c18b8b 100755
---
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos8.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos8.scala
@@ -20,32 +20,30 @@ import org.apache.gluten.jni.JniLibLoader
class SharedLibraryLoaderCentos8 extends SharedLibraryLoader {
override def loadLib(loader: JniLibLoader): Unit = {
- def loadAndCreateLink(libName: String, linkName: String): Unit = {
- val mapLibName = System.mapLibraryName(libName)
- loader.loadAndCreateLink(mapLibName, linkName, false)
- }
-
- loadAndCreateLink("libboost_atomic.so.1.84.0", "libboost_atomic.so")
- loadAndCreateLink("libboost_thread.so.1.84.0", "libboost_thread.so")
- loadAndCreateLink("libboost_system.so.1.84.0", "libboost_system.so")
- loadAndCreateLink("libicudata.so.60", "libicudata.so")
- loadAndCreateLink("libicuuc.so.60", "libicuuc.so")
- loadAndCreateLink("libicui18n.so.60", "libicui18n.so")
- loadAndCreateLink("libboost_regex.so.1.84.0", "libboost_regex.so")
- loadAndCreateLink("libboost_program_options.so.1.84.0",
"libboost_program_options.so")
- loadAndCreateLink("libboost_filesystem.so.1.84.0",
"libboost_filesystem.so")
- loadAndCreateLink("libboost_context.so.1.84.0", "libboost_context.so")
- loadAndCreateLink("libdouble-conversion.so.3", "libdouble-conversion.so")
- loadAndCreateLink("libevent-2.1.so.6", "libevent-2.1.so")
- loadAndCreateLink("libgflags.so.2.2", "libgflags.so")
- loadAndCreateLink("libglog.so.1", "libglog.so")
- loadAndCreateLink("libdwarf.so.1", "libdwarf.so")
- loadAndCreateLink("libidn.so.11", "libidn.so")
- loadAndCreateLink("libntlm.so.0", "libntlm.so")
- loadAndCreateLink("libgsasl.so.7", "libgsasl.so")
- loadAndCreateLink("libprotobuf.so.32", "libprotobuf.so")
- loadAndCreateLink("libhdfs3.so.1", "libhdfs3.so")
- loadAndCreateLink("libre2.so.0", "libre2.so")
- loadAndCreateLink("libsodium.so.23", "libsodium.so")
+ loader.loadAndCreateLink("libboost_atomic.so.1.84.0",
"libboost_atomic.so", false)
+ loader.loadAndCreateLink("libboost_thread.so.1.84.0",
"libboost_thread.so", false)
+ loader.loadAndCreateLink("libboost_system.so.1.84.0",
"libboost_system.so", false)
+ loader.loadAndCreateLink("libicudata.so.60", "libicudata.so", false)
+ loader.loadAndCreateLink("libicuuc.so.60", "libicuuc.so", false)
+ loader.loadAndCreateLink("libicui18n.so.60", "libicui18n.so", false)
+ loader.loadAndCreateLink("libboost_regex.so.1.84.0", "libboost_regex.so",
false)
+ loader.loadAndCreateLink(
+ "libboost_program_options.so.1.84.0",
+ "libboost_program_options.so",
+ false)
+ loader.loadAndCreateLink("libboost_filesystem.so.1.84.0",
"libboost_filesystem.so", false)
+ loader.loadAndCreateLink("libboost_context.so.1.84.0",
"libboost_context.so", false)
+ loader.loadAndCreateLink("libdouble-conversion.so.3",
"libdouble-conversion.so", false)
+ loader.loadAndCreateLink("libevent-2.1.so.6", "libevent-2.1.so", false)
+ loader.loadAndCreateLink("libgflags.so.2.2", "libgflags.so", false)
+ loader.loadAndCreateLink("libglog.so.1", "libglog.so", false)
+ loader.loadAndCreateLink("libdwarf.so.1", "libdwarf.so", false)
+ loader.loadAndCreateLink("libidn.so.11", "libidn.so", false)
+ loader.loadAndCreateLink("libntlm.so.0", "libntlm.so", false)
+ loader.loadAndCreateLink("libgsasl.so.7", "libgsasl.so", false)
+ loader.loadAndCreateLink("libprotobuf.so.32", "libprotobuf.so", false)
+ loader.loadAndCreateLink("libhdfs3.so.1", "libhdfs3.so", false)
+ loader.loadAndCreateLink("libre2.so.0", "libre2.so", false)
+ loader.loadAndCreateLink("libsodium.so.23", "libsodium.so", false)
}
}
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos9.scala
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos9.scala
index 7084c9e47..694cf4c62 100755
---
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos9.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderCentos9.scala
@@ -20,32 +20,30 @@ import org.apache.gluten.jni.JniLibLoader
class SharedLibraryLoaderCentos9 extends SharedLibraryLoader {
override def loadLib(loader: JniLibLoader): Unit = {
- def loadAndCreateLink(libName: String, linkName: String): Unit = {
- val mapLibName = System.mapLibraryName(libName)
- loader.loadAndCreateLink(mapLibName, linkName, false)
- }
-
- loadAndCreateLink("libboost_atomic.so.1.84.0", "libboost_atomic.so")
- loadAndCreateLink("libboost_thread.so.1.84.0", "libboost_thread.so")
- loadAndCreateLink("libboost_system.so.1.84.0", "libboost_system.so")
- loadAndCreateLink("libicudata.so.67", "libicudata.so")
- loadAndCreateLink("libicuuc.so.67", "libicuuc.so")
- loadAndCreateLink("libicui18n.so.67", "libicui18n.so")
- loadAndCreateLink("libboost_regex.so.1.84.0", "libboost_regex.so")
- loadAndCreateLink("libboost_program_options.so.1.84.0",
"libboost_program_options.so")
- loadAndCreateLink("libboost_filesystem.so.1.84.0",
"libboost_filesystem.so")
- loadAndCreateLink("libboost_context.so.1.84.0", "libboost_context.so")
- loadAndCreateLink("libdouble-conversion.so.3", "libdouble-conversion.so")
- loadAndCreateLink("libevent-2.1.so.7", "libevent-2.1.so")
- loadAndCreateLink("libgflags.so.2.2", "libgflags.so")
- loadAndCreateLink("libglog.so.1", "libglog.so")
- loadAndCreateLink("libdwarf.so.0", "libdwarf.so")
- loadAndCreateLink("libidn.so.12", "libidn.so")
- loadAndCreateLink("libntlm.so.0", "libntlm.so")
- loadAndCreateLink("libgsasl.so.7", "libgsasl.so")
- loadAndCreateLink("libprotobuf.so.32", "libprotobuf.so")
- loadAndCreateLink("libhdfs3.so.1", "libhdfs3.so")
- loadAndCreateLink("libre2.so.9", "libre2.so")
- loadAndCreateLink("libsodium.so.23", "libsodium.so")
+ loader.loadAndCreateLink("libboost_atomic.so.1.84.0",
"libboost_atomic.so", false)
+ loader.loadAndCreateLink("libboost_thread.so.1.84.0",
"libboost_thread.so", false)
+ loader.loadAndCreateLink("libboost_system.so.1.84.0",
"libboost_system.so", false)
+ loader.loadAndCreateLink("libicudata.so.67", "libicudata.so", false)
+ loader.loadAndCreateLink("libicuuc.so.67", "libicuuc.so", false)
+ loader.loadAndCreateLink("libicui18n.so.67", "libicui18n.so", false)
+ loader.loadAndCreateLink("libboost_regex.so.1.84.0", "libboost_regex.so",
false)
+ loader.loadAndCreateLink(
+ "libboost_program_options.so.1.84.0",
+ "libboost_program_options.so",
+ false)
+ loader.loadAndCreateLink("libboost_filesystem.so.1.84.0",
"libboost_filesystem.so", false)
+ loader.loadAndCreateLink("libboost_context.so.1.84.0",
"libboost_context.so", false)
+ loader.loadAndCreateLink("libdouble-conversion.so.3",
"libdouble-conversion.so", false)
+ loader.loadAndCreateLink("libevent-2.1.so.7", "libevent-2.1.so", false)
+ loader.loadAndCreateLink("libgflags.so.2.2", "libgflags.so", false)
+ loader.loadAndCreateLink("libglog.so.1", "libglog.so", false)
+ loader.loadAndCreateLink("libdwarf.so.0", "libdwarf.so", false)
+ loader.loadAndCreateLink("libidn.so.12", "libidn.so", false)
+ loader.loadAndCreateLink("libntlm.so.0", "libntlm.so", false)
+ loader.loadAndCreateLink("libgsasl.so.7", "libgsasl.so", false)
+ loader.loadAndCreateLink("libprotobuf.so.32", "libprotobuf.so", false)
+ loader.loadAndCreateLink("libhdfs3.so.1", "libhdfs3.so", false)
+ loader.loadAndCreateLink("libre2.so.9", "libre2.so", false)
+ loader.loadAndCreateLink("libsodium.so.23", "libsodium.so", false)
}
}
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderDebian11.scala
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderDebian11.scala
index 5713c8522..6927f2539 100644
---
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderDebian11.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderDebian11.scala
@@ -20,35 +20,30 @@ import org.apache.gluten.jni.JniLibLoader
class SharedLibraryLoaderDebian11 extends SharedLibraryLoader {
override def loadLib(loader: JniLibLoader): Unit = {
- def loadAndCreateLink(libName: String, linkName: String): Unit = {
- val mapLibName = System.mapLibraryName(libName)
- loader.loadAndCreateLink(mapLibName, linkName, false)
- }
-
- loadAndCreateLink("libicudata.so.67", "libicudata.so")
- loadAndCreateLink("libre2.so.9", "libre2.so")
- loadAndCreateLink("libicuuc.so.67", "libicuuc.so")
- loadAndCreateLink("liblber-2.4.so.2", "liblber-2.4.so")
- loadAndCreateLink("libsasl2.so.2", "libsasl2.so")
- loadAndCreateLink("libbrotlicommon.so.1", "libbrotlicommon.so")
- loadAndCreateLink("libicui18n.so.67", "libicui18n.so")
- loadAndCreateLink("libunwind.so.8", "libunwind.so")
- loadAndCreateLink("libgflags.so.2.2", "libgflags.so")
- loadAndCreateLink("libnghttp2.so.14", "libnghttp2.so")
- loadAndCreateLink("librtmp.so.1", "librtmp.so")
- loadAndCreateLink("libssh2.so.1", "libssh2.so")
- loadAndCreateLink("libpsl.so.5", "libpsl.so")
- loadAndCreateLink("libldap_r-2.4.so.2", "libldap_r-2.4.so")
- loadAndCreateLink("libbrotlidec.so.1", "libbrotlidec.so")
- loadAndCreateLink("libthrift-0.13.0.so", "libthrift.so")
- loadAndCreateLink("libboost_context.so.1.84.0", "libboost_context.so")
- loadAndCreateLink("libboost_regex.so.1.84.0", "libboost_regex.so")
- loadAndCreateLink("libdouble-conversion.so.3", "libdouble-conversion.so")
- loadAndCreateLink("libglog.so.0", "libglog.so")
- loadAndCreateLink("libevent-2.1.so.7", "libevent-2.1.so")
- loadAndCreateLink("libsnappy.so.1", "libsnappy.so")
- loadAndCreateLink("libcurl.so.4", "libcurl.so")
- loadAndCreateLink("libprotobuf.so.32", "libprotobuf.so")
- loadAndCreateLink("libhdfs3.so.1", "libhdfs3.so")
+ loader.loadAndCreateLink("libicudata.so.67", "libicudata.so", false)
+ loader.loadAndCreateLink("libre2.so.9", "libre2.so", false)
+ loader.loadAndCreateLink("libicuuc.so.67", "libicuuc.so", false)
+ loader.loadAndCreateLink("liblber-2.4.so.2", "liblber-2.4.so", false)
+ loader.loadAndCreateLink("libsasl2.so.2", "libsasl2.so", false)
+ loader.loadAndCreateLink("libbrotlicommon.so.1", "libbrotlicommon.so",
false)
+ loader.loadAndCreateLink("libicui18n.so.67", "libicui18n.so", false)
+ loader.loadAndCreateLink("libunwind.so.8", "libunwind.so", false)
+ loader.loadAndCreateLink("libgflags.so.2.2", "libgflags.so", false)
+ loader.loadAndCreateLink("libnghttp2.so.14", "libnghttp2.so", false)
+ loader.loadAndCreateLink("librtmp.so.1", "librtmp.so", false)
+ loader.loadAndCreateLink("libssh2.so.1", "libssh2.so", false)
+ loader.loadAndCreateLink("libpsl.so.5", "libpsl.so", false)
+ loader.loadAndCreateLink("libldap_r-2.4.so.2", "libldap_r-2.4.so", false)
+ loader.loadAndCreateLink("libbrotlidec.so.1", "libbrotlidec.so", false)
+ loader.loadAndCreateLink("libthrift-0.13.0.so", "libthrift.so", false)
+ loader.loadAndCreateLink("libboost_context.so.1.84.0",
"libboost_context.so", false)
+ loader.loadAndCreateLink("libboost_regex.so.1.84.0", "libboost_regex.so",
false)
+ loader.loadAndCreateLink("libdouble-conversion.so.3",
"libdouble-conversion.so", false)
+ loader.loadAndCreateLink("libglog.so.0", "libglog.so", false)
+ loader.loadAndCreateLink("libevent-2.1.so.7", "libevent-2.1.so", false)
+ loader.loadAndCreateLink("libsnappy.so.1", "libsnappy.so", false)
+ loader.loadAndCreateLink("libcurl.so.4", "libcurl.so", false)
+ loader.loadAndCreateLink("libprotobuf.so.32", "libprotobuf.so", false)
+ loader.loadAndCreateLink("libhdfs3.so.1", "libhdfs3.so", false)
}
}
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderDebian12.scala
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderDebian12.scala
index 62eb813c5..ce01f4399 100644
---
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderDebian12.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderDebian12.scala
@@ -20,41 +20,36 @@ import org.apache.gluten.jni.JniLibLoader
class SharedLibraryLoaderDebian12 extends SharedLibraryLoader {
override def loadLib(loader: JniLibLoader): Unit = {
- def loadAndCreateLink(libName: String, linkName: String): Unit = {
- val mapLibName = System.mapLibraryName(libName)
- loader.loadAndCreateLink(mapLibName, linkName, false)
- }
-
- loadAndCreateLink("libcrypto.so.3", "libcrypto.so")
- loadAndCreateLink("libkrb5support.so.0", "libkrb5support.so")
- loadAndCreateLink("libssl.so.3", "libssl.so")
- loadAndCreateLink("libicudata.so.72", "libicudata.so")
- loadAndCreateLink("libk5crypto.so.3", "libk5crypto.so")
- loadAndCreateLink("libkeyutils.so.1", "libkeyutils.so")
- loadAndCreateLink("libsnappy.so.1", "libsnappy.so")
- loadAndCreateLink("libthrift-0.17.0.so", "libthrift.so")
- loadAndCreateLink("libicuuc.so.72", "libicuuc.so")
- loadAndCreateLink("libkrb5.so.3", "libkrb5.so")
- loadAndCreateLink("liblber-2.5.so.0", "liblber-2.4.so")
- loadAndCreateLink("libsasl2.so.2", "libsasl2.so")
- loadAndCreateLink("libbrotlicommon.so.1", "libbrotlicommon.so")
- loadAndCreateLink("libicui18n.so.72", "libicui18n.so")
- loadAndCreateLink("libgflags.so.2.2", "libgflags.so")
- loadAndCreateLink("libunwind.so.8", "libunwind.so")
- loadAndCreateLink("libnghttp2.so.14", "libnghttp2.so")
- loadAndCreateLink("librtmp.so.1", "librtmp.so")
- loadAndCreateLink("libssh2.so.1", "libssh2.so")
- loadAndCreateLink("libpsl.so.5", "libpsl.so")
- loadAndCreateLink("libgssapi_krb5.so.2", "libgssapi_krb5.so")
- loadAndCreateLink("libldap-2.5.so.0", "libldap_r-2.4.so")
- loadAndCreateLink("libbrotlidec.so.1", "libbrotlidec.so")
- loadAndCreateLink("libboost_context.so.1.84.0", "libboost_context.so")
- loadAndCreateLink("libboost_regex.so.1.84.0", "libboost_regex.so")
- loadAndCreateLink("libdouble-conversion.so.3", "libdouble-conversion.so")
- loadAndCreateLink("libglog.so.1", "libglog.so")
- loadAndCreateLink("libevent-2.1.so.7", "libevent-2.1.so")
- loadAndCreateLink("libcurl.so.4", "libcurl.so")
- loadAndCreateLink("libprotobuf.so.32", "libprotobuf.so")
- loadAndCreateLink("libhdfs3.so.1", "libhdfs3.so")
+ loader.loadAndCreateLink("libcrypto.so.3", "libcrypto.so", false)
+ loader.loadAndCreateLink("libkrb5support.so.0", "libkrb5support.so", false)
+ loader.loadAndCreateLink("libssl.so.3", "libssl.so", false)
+ loader.loadAndCreateLink("libicudata.so.72", "libicudata.so", false)
+ loader.loadAndCreateLink("libk5crypto.so.3", "libk5crypto.so", false)
+ loader.loadAndCreateLink("libkeyutils.so.1", "libkeyutils.so", false)
+ loader.loadAndCreateLink("libsnappy.so.1", "libsnappy.so", false)
+ loader.loadAndCreateLink("libthrift-0.17.0.so", "libthrift.so", false)
+ loader.loadAndCreateLink("libicuuc.so.72", "libicuuc.so", false)
+ loader.loadAndCreateLink("libkrb5.so.3", "libkrb5.so", false)
+ loader.loadAndCreateLink("liblber-2.5.so.0", "liblber-2.4.so", false)
+ loader.loadAndCreateLink("libsasl2.so.2", "libsasl2.so", false)
+ loader.loadAndCreateLink("libbrotlicommon.so.1", "libbrotlicommon.so",
false)
+ loader.loadAndCreateLink("libicui18n.so.72", "libicui18n.so", false)
+ loader.loadAndCreateLink("libgflags.so.2.2", "libgflags.so", false)
+ loader.loadAndCreateLink("libunwind.so.8", "libunwind.so", false)
+ loader.loadAndCreateLink("libnghttp2.so.14", "libnghttp2.so", false)
+ loader.loadAndCreateLink("librtmp.so.1", "librtmp.so", false)
+ loader.loadAndCreateLink("libssh2.so.1", "libssh2.so", false)
+ loader.loadAndCreateLink("libpsl.so.5", "libpsl.so", false)
+ loader.loadAndCreateLink("libgssapi_krb5.so.2", "libgssapi_krb5.so", false)
+ loader.loadAndCreateLink("libldap-2.5.so.0", "libldap_r-2.4.so", false)
+ loader.loadAndCreateLink("libbrotlidec.so.1", "libbrotlidec.so", false)
+ loader.loadAndCreateLink("libboost_context.so.1.84.0",
"libboost_context.so", false)
+ loader.loadAndCreateLink("libboost_regex.so.1.84.0", "libboost_regex.so",
false)
+ loader.loadAndCreateLink("libdouble-conversion.so.3",
"libdouble-conversion.so", false)
+ loader.loadAndCreateLink("libglog.so.1", "libglog.so", false)
+ loader.loadAndCreateLink("libevent-2.1.so.7", "libevent-2.1.so", false)
+ loader.loadAndCreateLink("libcurl.so.4", "libcurl.so", false)
+ loader.loadAndCreateLink("libprotobuf.so.32", "libprotobuf.so", false)
+ loader.loadAndCreateLink("libhdfs3.so.1", "libhdfs3.so", false)
}
}
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderUbuntu2004.scala
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderUbuntu2004.scala
index bb9d72747..79c0518ea 100755
---
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderUbuntu2004.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderUbuntu2004.scala
@@ -20,51 +20,46 @@ import org.apache.gluten.jni.JniLibLoader
class SharedLibraryLoaderUbuntu2004 extends SharedLibraryLoader {
override def loadLib(loader: JniLibLoader): Unit = {
- def loadAndCreateLink(libName: String, linkName: String): Unit = {
- val mapLibName = System.mapLibraryName(libName)
- loader.loadAndCreateLink(mapLibName, linkName, false)
- }
-
- loadAndCreateLink("libroken.so.18", "libroken.so")
- loadAndCreateLink("libasn1.so.8", "libasn1.so")
- loadAndCreateLink("libboost_context.so.1.84.0", "libboost_context.so")
- loadAndCreateLink("libboost_regex.so.1.84.0", "libboost_regex.so")
- loadAndCreateLink("libbrotlicommon.so.1", "libbrotlicommon.so")
- loadAndCreateLink("libbrotlidec.so.1", "libbrotlidec.so")
- loadAndCreateLink("libpsl.so.5", "libpsl.so")
- loadAndCreateLink("libcrypto.so.1.1", "libcrypto.so")
- loadAndCreateLink("libnghttp2.so.14", "libnghttp2.so")
- loadAndCreateLink("libnettle.so.7", "libnettle.so")
- loadAndCreateLink("libhogweed.so.5", "libhogweed.so")
- loadAndCreateLink("librtmp.so.1", "librtmp.so")
- loadAndCreateLink("libssh.so.4", "libssh.so")
- loadAndCreateLink("libssl.so.1.1", "libssl.so")
- loadAndCreateLink("liblber-2.4.so.2", "liblber-2.4.so")
- loadAndCreateLink("libsasl2.so.2", "libsasl2.so")
- loadAndCreateLink("libwind.so.0", "libwind.so")
- loadAndCreateLink("libheimbase.so.1", "libheimbase.so")
- loadAndCreateLink("libhcrypto.so.4", "libhcrypto.so")
- loadAndCreateLink("libhx509.so.5", "libhx509.so")
- loadAndCreateLink("libkrb5.so.26", "libkrb5.so")
- loadAndCreateLink("libheimntlm.so.0", "libheimntlm.so")
- loadAndCreateLink("libgssapi.so.3", "libgssapi.so")
- loadAndCreateLink("libldap_r-2.4.so.2", "libldap_r-2.4.so")
- loadAndCreateLink("libcurl.so.4", "libcurl.so")
- loadAndCreateLink("libdouble-conversion.so.3", "libdouble-conversion.so")
- loadAndCreateLink("libevent-2.1.so.7", "libevent-2.1.so")
- loadAndCreateLink("libgflags.so.2.2", "libgflags.so")
- loadAndCreateLink("libunwind.so.8", "libunwind.so")
- loadAndCreateLink("libglog.so.0", "libglog.so")
- loadAndCreateLink("libidn.so.11", "libidn.so")
- loadAndCreateLink("libntlm.so.0", "libntlm.so")
- loadAndCreateLink("libgsasl.so.7", "libgsasl.so")
- loadAndCreateLink("libprotobuf.so.32", "libprotobuf.so")
- loadAndCreateLink("libicudata.so.66", "libicudata.so")
- loadAndCreateLink("libicuuc.so.66", "libicuuc.so")
- loadAndCreateLink("libxml2.so.2", "libxml2.so")
- loadAndCreateLink("libhdfs3.so.1", "libhdfs3.so")
- loadAndCreateLink("libre2.so.5", "libre2.so")
- loadAndCreateLink("libsnappy.so.1", "libsnappy.so")
- loadAndCreateLink("libthrift-0.13.0.so", "libthrift.so")
+ loader.loadAndCreateLink("libroken.so.18", "libroken.so", false)
+ loader.loadAndCreateLink("libasn1.so.8", "libasn1.so", false)
+ loader.loadAndCreateLink("libboost_context.so.1.84.0",
"libboost_context.so", false)
+ loader.loadAndCreateLink("libboost_regex.so.1.84.0", "libboost_regex.so",
false)
+ loader.loadAndCreateLink("libbrotlicommon.so.1", "libbrotlicommon.so",
false)
+ loader.loadAndCreateLink("libbrotlidec.so.1", "libbrotlidec.so", false)
+ loader.loadAndCreateLink("libpsl.so.5", "libpsl.so", false)
+ loader.loadAndCreateLink("libcrypto.so.1.1", "libcrypto.so", false)
+ loader.loadAndCreateLink("libnghttp2.so.14", "libnghttp2.so", false)
+ loader.loadAndCreateLink("libnettle.so.7", "libnettle.so", false)
+ loader.loadAndCreateLink("libhogweed.so.5", "libhogweed.so", false)
+ loader.loadAndCreateLink("librtmp.so.1", "librtmp.so", false)
+ loader.loadAndCreateLink("libssh.so.4", "libssh.so", false)
+ loader.loadAndCreateLink("libssl.so.1.1", "libssl.so", false)
+ loader.loadAndCreateLink("liblber-2.4.so.2", "liblber-2.4.so", false)
+ loader.loadAndCreateLink("libsasl2.so.2", "libsasl2.so", false)
+ loader.loadAndCreateLink("libwind.so.0", "libwind.so", false)
+ loader.loadAndCreateLink("libheimbase.so.1", "libheimbase.so", false)
+ loader.loadAndCreateLink("libhcrypto.so.4", "libhcrypto.so", false)
+ loader.loadAndCreateLink("libhx509.so.5", "libhx509.so", false)
+ loader.loadAndCreateLink("libkrb5.so.26", "libkrb5.so", false)
+ loader.loadAndCreateLink("libheimntlm.so.0", "libheimntlm.so", false)
+ loader.loadAndCreateLink("libgssapi.so.3", "libgssapi.so", false)
+ loader.loadAndCreateLink("libldap_r-2.4.so.2", "libldap_r-2.4.so", false)
+ loader.loadAndCreateLink("libcurl.so.4", "libcurl.so", false)
+ loader.loadAndCreateLink("libdouble-conversion.so.3",
"libdouble-conversion.so", false)
+ loader.loadAndCreateLink("libevent-2.1.so.7", "libevent-2.1.so", false)
+ loader.loadAndCreateLink("libgflags.so.2.2", "libgflags.so", false)
+ loader.loadAndCreateLink("libunwind.so.8", "libunwind.so", false)
+ loader.loadAndCreateLink("libglog.so.0", "libglog.so", false)
+ loader.loadAndCreateLink("libidn.so.11", "libidn.so", false)
+ loader.loadAndCreateLink("libntlm.so.0", "libntlm.so", false)
+ loader.loadAndCreateLink("libgsasl.so.7", "libgsasl.so", false)
+ loader.loadAndCreateLink("libprotobuf.so.32", "libprotobuf.so", false)
+ loader.loadAndCreateLink("libicudata.so.66", "libicudata.so", false)
+ loader.loadAndCreateLink("libicuuc.so.66", "libicuuc.so", false)
+ loader.loadAndCreateLink("libxml2.so.2", "libxml2.so", false)
+ loader.loadAndCreateLink("libhdfs3.so.1", "libhdfs3.so", false)
+ loader.loadAndCreateLink("libre2.so.5", "libre2.so", false)
+ loader.loadAndCreateLink("libsnappy.so.1", "libsnappy.so", false)
+ loader.loadAndCreateLink("libthrift-0.13.0.so", "libthrift.so", false)
}
}
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderUbuntu2204.scala
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderUbuntu2204.scala
index e988ed691..a5d99ede4 100755
---
a/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderUbuntu2204.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/utils/SharedLibraryLoaderUbuntu2204.scala
@@ -20,36 +20,31 @@ import org.apache.gluten.jni.JniLibLoader
class SharedLibraryLoaderUbuntu2204 extends SharedLibraryLoader {
override def loadLib(loader: JniLibLoader): Unit = {
- def loadAndCreateLink(libName: String, linkName: String): Unit = {
- val mapLibName = System.mapLibraryName(libName)
- loader.loadAndCreateLink(mapLibName, linkName, false)
- }
-
- loadAndCreateLink("libboost_context.so.1.84.0", "libboost_context.so")
- loadAndCreateLink("libicudata.so.70", "libicudata.so")
- loadAndCreateLink("libicuuc.so.70", "libicuuc.so")
- loadAndCreateLink("libicui18n.so.70", "libicui18n.so")
- loadAndCreateLink("libboost_regex.so.1.84.0", "libboost_regex.so")
- loadAndCreateLink("libnghttp2.so.14", "libnghttp2.so")
- loadAndCreateLink("librtmp.so.1", "librtmp.so")
- loadAndCreateLink("libssh.so.4", "libssh.so")
- loadAndCreateLink("libsasl2.so.2", "libsasl2.so")
- loadAndCreateLink("liblber-2.5.so.0", "liblber-2.5.so")
- loadAndCreateLink("libldap-2.5.so.0", "libldap-2.5.so")
- loadAndCreateLink("libcurl.so.4", "libcurl.so")
- loadAndCreateLink("libdouble-conversion.so.3", "libdouble-conversion.so")
- loadAndCreateLink("libevent-2.1.so.7", "libevent-2.1.so")
- loadAndCreateLink("libgflags.so.2.2", "libgflags.so")
- loadAndCreateLink("libunwind.so.8", "libunwind.so")
- loadAndCreateLink("libglog.so.0", "libglog.so")
- loadAndCreateLink("libidn.so.12", "libidn.so")
- loadAndCreateLink("libntlm.so.0", "libntlm.so")
- loadAndCreateLink("libgsasl.so.7", "libgsasl.so")
- loadAndCreateLink("libprotobuf.so.32", "libprotobuf.so")
- loadAndCreateLink("libxml2.so.2", "libxml2.so")
- loadAndCreateLink("libhdfs3.so.1", "libhdfs3.so")
- loadAndCreateLink("libre2.so.9", "libre2.so")
- loadAndCreateLink("libsnappy.so.1", "libsnappy.so")
- loadAndCreateLink("libthrift-0.16.0.so", "libthrift.so")
+ loader.loadAndCreateLink("libboost_context.so.1.84.0",
"libboost_context.so", false)
+ loader.loadAndCreateLink("libicudata.so.70", "libicudata.so", false)
+ loader.loadAndCreateLink("libicuuc.so.70", "libicuuc.so", false)
+ loader.loadAndCreateLink("libicui18n.so.70", "libicui18n.so", false)
+ loader.loadAndCreateLink("libboost_regex.so.1.84.0", "libboost_regex.so",
false)
+ loader.loadAndCreateLink("libnghttp2.so.14", "libnghttp2.so", false)
+ loader.loadAndCreateLink("librtmp.so.1", "librtmp.so", false)
+ loader.loadAndCreateLink("libssh.so.4", "libssh.so", false)
+ loader.loadAndCreateLink("libsasl2.so.2", "libsasl2.so", false)
+ loader.loadAndCreateLink("liblber-2.5.so.0", "liblber-2.5.so", false)
+ loader.loadAndCreateLink("libldap-2.5.so.0", "libldap-2.5.so", false)
+ loader.loadAndCreateLink("libcurl.so.4", "libcurl.so", false)
+ loader.loadAndCreateLink("libdouble-conversion.so.3",
"libdouble-conversion.so", false)
+ loader.loadAndCreateLink("libevent-2.1.so.7", "libevent-2.1.so", false)
+ loader.loadAndCreateLink("libgflags.so.2.2", "libgflags.so", false)
+ loader.loadAndCreateLink("libunwind.so.8", "libunwind.so", false)
+ loader.loadAndCreateLink("libglog.so.0", "libglog.so", false)
+ loader.loadAndCreateLink("libidn.so.12", "libidn.so", false)
+ loader.loadAndCreateLink("libntlm.so.0", "libntlm.so", false)
+ loader.loadAndCreateLink("libgsasl.so.7", "libgsasl.so", false)
+ loader.loadAndCreateLink("libprotobuf.so.32", "libprotobuf.so", false)
+ loader.loadAndCreateLink("libxml2.so.2", "libxml2.so", false)
+ loader.loadAndCreateLink("libhdfs3.so.1", "libhdfs3.so", false)
+ loader.loadAndCreateLink("libre2.so.9", "libre2.so", false)
+ loader.loadAndCreateLink("libsnappy.so.1", "libsnappy.so", false)
+ loader.loadAndCreateLink("libthrift-0.16.0.so", "libthrift.so", false)
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
