This is an automated email from the ASF dual-hosted git repository.
hongze 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 7ffac7542 [VL] Minor follow-ups for #6942 (#7129)
7ffac7542 is described below
commit 7ffac75421c8d1f37807ee6dceda4fc72d796333
Author: Hongze Zhang <[email protected]>
AuthorDate: Fri Sep 6 10:11:46 2024 +0800
[VL] Minor follow-ups for #6942 (#7129)
---
backends-velox/pom.xml | 2 +-
.../backendsapi/velox/VeloxListenerApi.scala | 27 +++++++++++-----------
package/pom.xml | 14 +++++------
3 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/backends-velox/pom.xml b/backends-velox/pom.xml
index c67816825..88fa46045 100755
--- a/backends-velox/pom.xml
+++ b/backends-velox/pom.xml
@@ -187,7 +187,7 @@
<resources>
<resource>
<directory>${cpp.releases.dir}</directory>
- <targetPath>org/apache/gluten/${platform}/${arch}</targetPath>
+ <targetPath>${platform}/${arch}</targetPath>
</resource>
<resource>
<directory>${resource.dir}</directory>
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxListenerApi.scala
b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxListenerApi.scala
index b7b9ac263..02597f815 100644
---
a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxListenerApi.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxListenerApi.scala
@@ -138,8 +138,8 @@ class VeloxListenerApi extends ListenerApi with Logging {
JniLibLoader.loadFromPath(libPath, false)
} else {
val baseLibName = conf.get(GlutenConfig.GLUTEN_LIB_NAME, "gluten")
- loader.load(s"$baseLibPackage/${System.mapLibraryName(baseLibName)}",
false)
-
loader.load(s"$baseLibPackage/${System.mapLibraryName(VeloxBackend.BACKEND_NAME)}",
false)
+ loader.load(s"$platformLibDir/${System.mapLibraryName(baseLibName)}",
false)
+
loader.load(s"$platformLibDir/${System.mapLibraryName(VeloxBackend.BACKEND_NAME)}",
false)
}
// Initial native backend with configurations.
@@ -152,18 +152,6 @@ class VeloxListenerApi extends ListenerApi with Logging {
GlutenRowSplitter.setInstance(new VeloxRowSplitter())
}
- private lazy val baseLibPackage: String = {
- val osName = System.getProperty("os.name") match {
- case n if n.contains("Linux") => "linux"
- case n if n.contains("Mac") => "darwin"
- case _ =>
- // Default to linux
- "linux"
- }
- val arch = System.getProperty("os.arch")
- s"org/apache/gluten/$osName/$arch"
- }
-
private def shutdown(): Unit = {
// TODO shutdown implementation in velox to release resources
}
@@ -174,6 +162,17 @@ object VeloxListenerApi {
// As spark conf may change when active Spark session is recreated.
private val driverInitialized: AtomicBoolean = new AtomicBoolean(false)
private val executorInitialized: AtomicBoolean = new AtomicBoolean(false)
+ private val platformLibDir: String = {
+ val osName = System.getProperty("os.name") match {
+ case n if n.contains("Linux") => "linux"
+ case n if n.contains("Mac") => "darwin"
+ case _ =>
+ // Default to linux
+ "linux"
+ }
+ val arch = System.getProperty("os.arch")
+ s"$osName/$arch"
+ }
private def inLocalMode(conf: SparkConf): Boolean = {
SparkResourceUtil.isLocalMaster(conf)
diff --git a/package/pom.xml b/package/pom.xml
index ac0754c38..fc72fe93d 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -98,7 +98,7 @@
<dependencies>
<dependency>
<groupId>org.apache.gluten</groupId>
- <artifactId>gluten-delta</artifactId>
+ <artifactId>gluten-delta</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -196,12 +196,12 @@
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- <exclude>META-INF/DEPENDENCIES</exclude>
- <exclude>META-INF/LICENSE.txt</exclude>
- <exclude>META-INF/NOTICE.txt</exclude>
- <exclude>LICENSE.txt</exclude>
- <exclude>NOTICE.txt</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ <exclude>META-INF/DEPENDENCIES</exclude>
+ <exclude>META-INF/LICENSE.txt</exclude>
+ <exclude>META-INF/NOTICE.txt</exclude>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>NOTICE.txt</exclude>
</excludes>
</filter>
</filters>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
