Skip to content

Commit 5e17a20

Browse files
committed
[BUILD] Minor bug fixes and updates.
1 parent 0f55060 commit 5e17a20

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ crossScalaVersions in ThisBuild := Seq("2.11.11", "2.12.6")
2424

2525
organization in ThisBuild := "org.platanios"
2626

27-
val tensorFlowVersion = "1.8.0"
27+
val tensorFlowVersion = "1.9.0-rc0"
2828
val circeVersion = "0.9.1" // Use for working with JSON.
2929

3030
autoCompilerPlugins in ThisBuild := true
@@ -160,7 +160,7 @@ lazy val jni = (project in file("./jni"))
160160
target in nativeCompile := target.value / "native" / nativePlatform.value,
161161
target in JniCross := target.value / "native",
162162
nativePlatforms in JniCross := Set(LINUX_x86_64, LINUX_GPU_x86_64, DARWIN_x86_64),
163-
tfBinaryVersion in JniCross := "nightly", // tensorFlowVersion
163+
tfBinaryVersion in JniCross := tensorFlowVersion,
164164
tfLibCompile in JniCross := false,
165165
tfLibRepository in JniCross := "https://github.com/tensorflow/tensorflow.git",
166166
tfLibRepositoryBranch in JniCross := "master",
@@ -170,7 +170,7 @@ lazy val jni = (project in file("./jni"))
170170
lazy val api = (project in file("./api"))
171171
.dependsOn(jni)
172172
.enablePlugins(ProtobufPlugin)
173-
.settings(moduleName := "tensorflow-api", name := "TensorFlow Scala")
173+
.settings(moduleName := "tensorflow-api", name := "TensorFlow Scala - API")
174174
.settings(commonSettings)
175175
.settings(testSettings)
176176
.settings(publishSettings)

project/TensorFlowNativeCrossCompiler.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ object TensorFlowNativeCrossCompiler {
3232
platform: Platform
3333
): ProcessBuilder = {
3434
val repoDir = workingDir.resolve("tensorflow").toFile
35-
var processBuilder = Process("rm" :: "-rf" :: "tensorflow" :: Nil, workingDir.toFile) #&&
36-
Process("git" :: "clone" :: gitRepository :: Nil, workingDir.toFile)
35+
var processBuilder = Process("rm" :: "-rf" :: "tensorflow" :: Nil, workingDir.toFile)
36+
processBuilder = processBuilder #&& Process("git" :: "clone" :: gitRepository :: Nil, workingDir.toFile)
3737
if (gitRepositoryBranch != "master") {
3838
processBuilder = processBuilder #&&
3939
Process("git" :: "checkout" :: "-b" :: gitRepositoryBranch ::

project/TensorFlowNativePackage.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,10 @@ object TensorFlowNativePackage extends AutoPlugin {
7070
IO.createDirectory(platformTargetDir / "downloads" / "lib")
7171

7272
if (compileTfLibValue) {
73+
val workingDir = (platformTargetDir / "code").toPath
74+
workingDir.resolve("tensorflow").toFile.mkdirs()
7375
TensorFlowNativeCrossCompiler.compile(
74-
(platformTargetDir / "code").toPath, platformTargetDir.getPath, tfLibRepositoryValue,
76+
workingDir, platformTargetDir.getPath, tfLibRepositoryValue,
7577
tfLibRepositoryBranchValue, platform) ! log
7678
}
7779

0 commit comments

Comments
 (0)