[BUILD] Preparing for the next release.

Author: eaplatanios

README.md

@@ -219,6 +219,13 @@ On Ubuntu 18.04 you may get some linking errors, in which case you should use:
 bazel build --config=opt --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=0 --noincompatible_do_not_split_linking_cmdline //tensorflow:libtensorflow.so
 ```
 
+On Windows you may get some CUDA-related errors, in which case you should use:
+
+```cmd
+bazel build --config=opt --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=0 --define=no_tensorflow_py_deps=true --copt=-DTHRUST_IGNORE_CUB_VERSION_CHECK --copt=-nvcc_options=disable-warnings //tensorflow:tensorflow.lib
+bazel build --config=opt --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=0 --define=no_tensorflow_py_deps=true --copt=-DTHRUST_IGNORE_CUB_VERSION_CHECK --copt=-nvcc_options=disable-warnings //tensorflow:tensorflow_framework.lib
+```
+
 To publish the documentation website we use the following commands:
 
 ```bash

RELEASE.md

@@ -1,3 +1,13 @@
+# 0.5.6
+
+Switched to using TensorFlow 2.3.1 that fixes multiple 
+security vulnerabilities of TensorFlow 2.3.0. Also:
+
+- Fixed a minor bug related to optimizers.
+- Switched to supporting three native platforms:
+  `linux`, `windows`, and `darwin`, where the last one 
+   does not include GPU support.
+
 # 0.5.5
 
 Fix for 0.5.4 that includes pre-compiled binaries for 

build.sbt

@@ -26,7 +26,7 @@ fork in ThisBuild := true
 autoCompilerPlugins in ThisBuild := true
 nativeCrossCompilationEnabled in ThisBuild := false
 
-val tensorFlowVersion = "2.3.0"
+val tensorFlowVersion = "2.3.1"
 val circeVersion = "0.12.3" // Used for working with JSON.
 
 scalacOptions in ThisBuild ++= Seq(
@@ -168,13 +168,7 @@ lazy val jni = (project in file("./modules/jni"))
       sourceDirectory in nativeCompile := sourceDirectory.value / "main" / "native",
       target in nativeCompile := target.value / "native" / nativePlatform.value,
       target in JniCross := target.value / "native",
-      nativePlatforms in JniCross := Set(
-        LINUX_x86_64,
-        LINUX_GPU_x86_64,
-        WINDOWS_x86_64,
-        WINDOWS_GPU_x86_64,
-        DARWIN_x86_64,
-      ),
+      nativePlatforms in JniCross := Set(LINUX, WINDOWS, DARWIN),
       tfBinaryVersion in JniCross := tensorFlowVersion,
       // Specify the order in which the different compilation tasks are executed.
       nativeCompile := nativeCompile.dependsOn(generateTensorOps).value)

docs/src/main/paradox/installation.md

@@ -17,7 +17,7 @@ for Scala, you should add the following dependency:
 @@ dependency[sbt,Maven,Gradle] {
   group="org.platanios"
   artifact="tensorflow_2.13"
-  version="0.4.1"
+  version="0.5.6"
 }
 
 @@@ note
@@ -52,16 +52,15 @@ Add the following dependency, instead of the previous one:
 @@ dependency[sbt,Maven,Gradle] {
   group="org.platanios"
   artifact="tensorflow_2.13"
-  version="0.4.1"
-  classifier="linux-cpu-x86_64"
+  version="0.5.6"
+  classifier="linux"
 }
 
 @@@ warning { title='Operating System' }
 
-Make sure to replace `linux-cpu-x86_64` with the string
-that corresponds to your platform.* Currently supported
-platforms are: `linux-cpu-x86_64`, `linux-gpu-x86_64`, and
-`darwin-cpu-x86_64`.
+Make sure to replace `linux` with the string that corresponds 
+to your platform.* Currently supported platforms are: `linux`, 
+`windows`, and `darwin`.
 
 @@@
 

modules/jni/src/main/native/CMakeLists.txt

@@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED on)
 project(tensorflow)
 set(PROJECT_VERSION_MAJOR 0)
 set(PROJECT_VERSION_MINOR 5)
-set(PROJECT_VERSION_PATCH 1)
+set(PROJECT_VERSION_PATCH 6)
 
 add_definitions(-DNOMINMAX)
 
@@ -29,7 +29,7 @@ include_directories(./ops)
 include_directories(${JNI_INCLUDE_DIRS})
 
 # Find Native TensorFlow Library to link
-list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .so.2.3.0 .so.2 .so .2.3.0.dylib .2.dylib .dylib .lib)
+list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .so.2.3.1 .so.2 .so .2.3.1.dylib .2.dylib .dylib .lib)
 find_library(LIB_TENSORFLOW tensorflow HINTS ENV LD_LIBRARY_PATH)
 if(NOT LIB_TENSORFLOW)
   message(FATAL_ERROR "Library `tensorflow` not found.")

project/JniCrossPackage.scala

@@ -59,7 +59,7 @@ object JniCrossPackage extends AutoPlugin {
   import JniNative.autoImport._
 
   lazy val settings: Seq[Setting[_]] = Seq(
-    nativePlatforms := Set(LINUX_x86_64, LINUX_GPU_x86_64, WINDOWS_x86_64, DARWIN_x86_64),
+    nativePlatforms := Set(LINUX, WINDOWS, DARWIN),
     target := (target in Compile).value / "native",
     nativeLibPath := {
       val targetDir = (target in nativeCrossCompile).value
@@ -97,16 +97,16 @@ object JniCrossPackage extends AutoPlugin {
             log.info(s"Using '$baseDir' as the base directory.")
             val platformTargetDir = targetDir / platform.name
 
-            // TODO: Uncomment this once we properly sort out cross-compilation.
 //            IO.createDirectory(platformTargetDir)
 //            IO.createDirectory(platformTargetDir / "code")
 //            IO.createDirectory(platformTargetDir / "docker")
 //            IO.createDirectory(platformTargetDir / "lib")
 //
 //            platform match {
+//              // TODO: Figure out the right cross-compilation story.
 //              // For Windows, we expect the binaries to have already been built and placed in the `bin` and the `lib`
 //              // subdirectories, because we currently have no way to cross-compile.
-//              case WINDOWS_x86_64 | WINDOWS_GPU_x86_64 =>
+//              case WINDOWS =>
 //                if (!(platformTargetDir / "bin").exists()) {
 //                  throw new IllegalStateException("The Windows binaries must have already been prebuilt.")
 //                }
@@ -119,7 +119,8 @@ object JniCrossPackage extends AutoPlugin {
 //                  dockerContainer = dockerContainer,
 //                  srcDir = (baseDirectory.value / "src" / "main" / "native").getPath,
 //                  tgtDir = platformTargetDir.getPath,
-//                  libPath = nativeLibPath.value(platform).getPath).map(_ ! log)
+//                  libPath = nativeLibPath.value(platform).getPath,
+//                ).map(_ ! log)
 //
 //                // Clean up.
 //                log.info("Cleaning up after build.")
@@ -206,7 +207,6 @@ object JniCrossPackage extends AutoPlugin {
 
   sealed trait Platform {
     val name        : String
-    val tag         : String
     val dockerImage : String = ""
     val cMakePath   : String = "/usr/bin"
     val cMakeLibPath: String = "/usr/lib"
@@ -253,31 +253,17 @@ object JniCrossPackage extends AutoPlugin {
     override def toString: String = name
   }
 
-  object LINUX_x86_64 extends Platform {
-    override val name       : String = "linux-x86_64"
-    override val tag        : String = "linux-cpu-x86_64"
+  object LINUX extends Platform {
+    override val name       : String = "linux"
     override val dockerImage: String = "eaplatanios/tensorflow_scala:linux-cpu-x86_64-0.5.3"
   }
 
-  object LINUX_GPU_x86_64 extends Platform {
-    override val name       : String = "linux-gpu-x86_64"
-    override val tag        : String = "linux-gpu-x86_64"
-    override val dockerImage: String = "eaplatanios/tensorflow_scala:linux-gpu-x86_64-0.5.3"
+  object WINDOWS extends Platform {
+    override val name: String = "windows"
   }
 
-  object WINDOWS_x86_64 extends Platform {
-    override val name: String = "windows-x86_64"
-    override val tag : String = "windows-cpu-x86_64"
-  }
-
-  object WINDOWS_GPU_x86_64 extends Platform {
-    override val name: String = "windows-gpu-x86_64"
-    override val tag : String = "windows-gpu-x86_64"
-  }
-
-  object DARWIN_x86_64 extends Platform {
-    override val name: String = "darwin-x86_64"
-    override val tag : String = "darwin-cpu-x86_64"
+  object DARWIN extends Platform {
+    override val name: String = "darwin"
 
     override def build(
         dockerImage: String,

project/JniNative.scala

@@ -27,22 +27,14 @@ import sbt.Keys._
 object JniNative extends AutoPlugin {
   override def requires: Plugins = plugins.JvmPlugin
 
-  private[this] val os = {
+  private[this] val currentNativePlatform: String = {
     val name = System.getProperty("os.name").toLowerCase
     if (name.contains("linux")) "linux"
     else if (name.contains("os x") || name.contains("darwin")) "darwin"
     else if (name.contains("windows")) "windows"
     else name.replaceAll("\\s", "")
   }
 
-  private[this] val architecture = {
-    val arch = System.getProperty("os.arch").toLowerCase
-    if (arch == "amd64") "x86_64"
-    else arch
-  }
-
-  private[this] val currentNativePlatform: String = s"$os-$architecture"
-
   object autoImport {
     val nativeCompile: TaskKey[Seq[File]] =
       taskKey[Seq[File]]("Builds a native library by calling the native build tool.")

project/TensorFlowNativePackage.scala

@@ -36,7 +36,7 @@ object TensorFlowNativePackage extends AutoPlugin {
   import JniCrossPackage.autoImport._
 
   lazy val settings: Seq[Setting[_]] = Seq(
-    tfBinaryVersion := "2.3.0",
+    tfBinaryVersion := "2.3.1",
     nativeArtifactName := "tensorflow",
     nativeLibPath := {
       val log       = streams.value.log
@@ -66,32 +66,28 @@ object TensorFlowNativePackage extends AutoPlugin {
   val tfLibUrlPrefix: String = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow"
 
   def tfLibFilename(platform: Platform): String = platform match {
-    case LINUX_x86_64 | LINUX_GPU_x86_64 | DARWIN_x86_64 => "libtensorflow.tar.gz"
-    case WINDOWS_x86_64 | WINDOWS_GPU_x86_64 => "libtensorflow.zip"
+    case LINUX | DARWIN => "libtensorflow.tar.gz"
+    case WINDOWS => "libtensorflow.zip"
   }
 
   def tfLibExtractCommand(platform: Platform): String = platform match {
-    case LINUX_x86_64 => s"tar xf /root/${tfLibFilename(platform)} -C /usr"
-    case LINUX_GPU_x86_64 => s"tar xf /root/${tfLibFilename(platform)} -C /usr"
-    case WINDOWS_x86_64 => ???
-    case WINDOWS_GPU_x86_64 => ???
-    case DARWIN_x86_64 => s"tar xf /root/${tfLibFilename(platform)} -C /usr"
+    case LINUX => s"tar xf /root/${tfLibFilename(platform)} -C /usr"
+    case WINDOWS => ???
+    case DARWIN => s"tar xf /root/${tfLibFilename(platform)} -C /usr"
   }
 
   def tfLibUrl(platform: Platform, version: String): String = (platform, version) match {
-    case (LINUX_x86_64, v) => s"$tfLibUrlPrefix-cpu-linux-x86_64-$v.tar.gz"
-    case (LINUX_GPU_x86_64, v) => s"$tfLibUrlPrefix-gpu-linux-x86_64-$v.tar.gz"
-    case (WINDOWS_x86_64, v) => s"$tfLibUrlPrefix-cpu-windows-x86_64-$v.zip"
-    case (WINDOWS_GPU_x86_64, v) => s"$tfLibUrlPrefix-gpu-windows-x86_64-$v.zip"
-    case (DARWIN_x86_64, v) => s"$tfLibUrlPrefix-cpu-darwin-x86_64-$v.tar.gz"
+    case (LINUX, v) => s"$tfLibUrlPrefix-cpu-linux-x86_64-$v.tar.gz"
+    case (WINDOWS, v) => s"$tfLibUrlPrefix-cpu-windows-x86_64-$v.zip"
+    case (DARWIN, v) => s"$tfLibUrlPrefix-cpu-darwin-x86_64-$v.tar.gz"
   }
 
   def downloadAndExtractLibrary(platform: Platform, targetDir: String, tfVersion: String): Option[ProcessBuilder] = {
     // TODO: Setup cross-compilation environments (maybe using CircleCI).
     None
 //    val path = s"$targetDir/downloads/${tfLibFilename(platform)}"
 //    platform match {
-//      case WINDOWS_x86_64 | WINDOWS_GPU_x86_64 =>
+//      case WINDOWS =>
 //        if (Files.notExists(Paths.get(targetDir).resolve("lib"))) {
 //          throw new IllegalStateException("The Windows TensorFlow library must have already been downloaded manually.")
 //        }