diff --git a/backends-velox/pom.xml b/backends-velox/pom.xml index c678168252b6..88fa460452b2 100755 --- a/backends-velox/pom.xml +++ b/backends-velox/pom.xml @@ -187,7 +187,7 @@ ${cpp.releases.dir} - org/apache/gluten/${platform}/${arch} + ${platform}/${arch} ${resource.dir} 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 b7b9ac263a50..02597f815178 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 ac0754c38e7e..fc72fe93de84 100644 --- a/package/pom.xml +++ b/package/pom.xml @@ -98,7 +98,7 @@ org.apache.gluten - gluten-delta + gluten-delta ${project.version} @@ -196,12 +196,12 @@ META-INF/*.SF META-INF/*.DSA - META-INF/*.RSA - META-INF/DEPENDENCIES - META-INF/LICENSE.txt - META-INF/NOTICE.txt - LICENSE.txt - NOTICE.txt + META-INF/*.RSA + META-INF/DEPENDENCIES + META-INF/LICENSE.txt + META-INF/NOTICE.txt + LICENSE.txt + NOTICE.txt