Skip to content

Commit

Permalink
Fix jar path and add missing ones for spark jobs (apache#14020)
Browse files Browse the repository at this point in the history
* Fix jar path and add missing ones for spark jobs

Fix path of jars / add missing jars in spark job

remove print, reduce clutter

* fixes scalastyle violations

* exclude all of javadoc, sources, bundle, and src while searching for jars

* simplfied the exclude experession
  • Loading branch information
ashutosh-dwivedi-e3502 authored and vdantu committed Mar 31, 2019
1 parent 88af4fe commit ae63b4d
Showing 1 changed file with 22 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -80,37 +80,37 @@ trait SharedSparkContext extends FunSuite with BeforeAndAfterEach with BeforeAnd
System.getProperty("user.dir")
}

private def getJarFilePath(root: String): String = {
for (platform <- List("linux-x86_64-cpu", "linux-x86_64-gpu", "osx-x86_64-cpu")) {
val jarFiles = new File(s"$root/$platform/target/").listFiles(new FileFilter {
override def accept(pathname: File) = {
pathname.getAbsolutePath.endsWith(".jar") &&
!pathname.getAbsolutePath.contains("javadoc") &&
!pathname.getAbsolutePath.contains("sources")
}
})
if (jarFiles != null && jarFiles.nonEmpty) {
return jarFiles.head.getAbsolutePath
private def findJars(root: String): Array[File] = {
val excludedSuffixes = List("bundle", "src", "javadoc", "sources")
new File(root).listFiles(new FileFilter {
override def accept(pathname: File) = {
pathname.getAbsolutePath.endsWith(".jar") &&
excludedSuffixes.forall(!pathname.getAbsolutePath.contains(_))
}
})
}

private def getJarFilePath(root: String): String = {
val jarFiles = findJars(s"$root/target/")
if (jarFiles != null && jarFiles.nonEmpty) {
jarFiles.head.getAbsolutePath
} else {
null
}
null
}

private def getSparkJar: String = {
val jarFiles = new File(s"$composeWorkingDirPath/target/").listFiles(new FileFilter {
override def accept(pathname: File) = {
pathname.getAbsolutePath.endsWith(".jar") &&
!pathname.getAbsolutePath.contains("javadoc") &&
!pathname.getAbsolutePath.contains("sources")
}
})
val jarFiles = findJars(s"$composeWorkingDirPath/target/")
if (jarFiles != null && jarFiles.nonEmpty) {
jarFiles.head.getAbsolutePath
} else {
null
}
}

private def getNativeJars(root: String): String =
new File(root).listFiles().map(_.toPath).mkString(",")

protected def buildLeNet(): MXNet = {
val workingDir = composeWorkingDirPath
val assemblyRoot = s"$workingDir/../assembly"
Expand All @@ -130,6 +130,8 @@ trait SharedSparkContext extends FunSuite with BeforeAndAfterEach with BeforeAnd
protected def buildMlp(): MXNet = {
val workingDir = composeWorkingDirPath
val assemblyRoot = s"$workingDir/../assembly"
val nativeRoot = s"$workingDir/../native/target/lib"

new MXNet()
.setBatchSize(128)
.setLabelName("softmax_label")
Expand All @@ -139,7 +141,7 @@ trait SharedSparkContext extends FunSuite with BeforeAndAfterEach with BeforeAnd
.setNumEpoch(10)
.setNumServer(1)
.setNumWorker(numWorkers)
.setExecutorJars(s"${getJarFilePath(assemblyRoot)},$getSparkJar")
.setExecutorJars(s"${getJarFilePath(assemblyRoot)},$getSparkJar,${getNativeJars(nativeRoot)}")
.setJava("java")
.setTimeout(0)
}
Expand Down

0 comments on commit ae63b4d

Please sign in to comment.