Merge pull request #209 from ThoughtWorksInc/optional

Atry · web-flow · commit 2468f244b589 · 2018-05-10T01:23:37.000+08:00
Set platform dependency as Optional instead of Test
diff --git a/Compute.scala b/Compute.scala
@@ -1 +1 @@
-Subproject commit d173f6e6e5e1dcdf3e86de72e2b887aa7cd82925
+Subproject commit a40cc0b2863c8014c629dadf2992af16e80c5de1
diff --git a/plugins-CumulativeTensorLayers/build.sbt b/plugins-CumulativeTensorLayers/build.sbt
@@ -1,4 +1,4 @@
-libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Test).jar().classifier {
+libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Optional).jar().classifier {
   import scala.util.Properties._
   if (isMac) {
     "natives-macos"
diff --git a/plugins-CumulativeTensorLayers/src/test/scala/com/thoughtworks/deeplearning/plugins/CumulativeTensorLayersSpec.scala b/plugins-CumulativeTensorLayers/src/test/scala/com/thoughtworks/deeplearning/plugins/CumulativeTensorLayersSpec.scala
@@ -66,7 +66,7 @@ final class CumulativeTensorLayersSpec extends AsyncFreeSpec with Matchers {
   "translate" in {
     Do.monadicCloseable {
         Factory[
-          Logging with TensorLiterals with TensorWeights with CNNs with Operators with StrictLogging with Tensors.UnsafeMathOptimizations with OpenCL.LogContextNotification with OpenCL.GlobalExecutionContext with OpenCL.CommandQueuePool with OpenCL.UseAllCpuDevices with OpenCL.DontReleaseEventTooEarly with OpenCL.SynchronizedCreatingKernel with OpenCL.HandleEventInExecutionContextForIntelAndAMDPlatform with Tensors.WangHashingRandomNumberGenerator with ImplicitsSingleton]
+          Logging with TensorLiterals with TensorWeights with CNNs with Operators with StrictLogging with OpenCL.UnsafeMathOptimizations with OpenCL.LogContextNotification with OpenCL.GlobalExecutionContext with OpenCL.CommandQueuePool with OpenCL.UseAllCpuDevices with OpenCL.DontReleaseEventTooEarly with OpenCL.SynchronizedCreatingKernel with OpenCL.HandleEventInExecutionContextForIntelAndAMDPlatform with Tensors.WangHashingRandomNumberGenerator with ImplicitsSingleton]
           .newInstance(numberOfCommandQueuesPerDevice = 5)
       }
       .flatMap { hyperparameters =>
@@ -130,7 +130,7 @@ final class CumulativeTensorLayersSpec extends AsyncFreeSpec with Matchers {
 
     Do.monadicCloseable {
         Factory[
-          Logging with TensorLiterals with TensorWeights with CNNs with Operators with StrictLogging with Tensors.UnsafeMathOptimizations with OpenCL.LogContextNotification with OpenCL.GlobalExecutionContext with OpenCL.CommandQueuePool with OpenCL.UseAllCpuDevices with OpenCL.DontReleaseEventTooEarly with OpenCL.SynchronizedCreatingKernel with OpenCL.HandleEventInExecutionContextForIntelAndAMDPlatform with Tensors.WangHashingRandomNumberGenerator with ImplicitsSingleton]
+          Logging with TensorLiterals with TensorWeights with CNNs with Operators with StrictLogging with OpenCL.UnsafeMathOptimizations with OpenCL.LogContextNotification with OpenCL.GlobalExecutionContext with OpenCL.CommandQueuePool with OpenCL.UseAllCpuDevices with OpenCL.DontReleaseEventTooEarly with OpenCL.SynchronizedCreatingKernel with OpenCL.HandleEventInExecutionContextForIntelAndAMDPlatform with Tensors.WangHashingRandomNumberGenerator with ImplicitsSingleton]
           .newInstance(numberOfCommandQueuesPerDevice = 5)
       }
       .flatMap { hyperparameters =>
diff --git a/plugins-TensorLayers/build.sbt b/plugins-TensorLayers/build.sbt
@@ -1,4 +1,4 @@
-libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Test).jar().classifier {
+libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Optional).jar().classifier {
   import scala.util.Properties._
   if (isMac) {
     "natives-macos"
diff --git a/plugins-TensorLayers/src/test/scala/com/thoughtworks/deeplearning/plugins/TensorLayersSpec.scala b/plugins-TensorLayers/src/test/scala/com/thoughtworks/deeplearning/plugins/TensorLayersSpec.scala
@@ -20,7 +20,7 @@ class TensorLayersSpec extends AsyncFreeSpec with Matchers {
 
     Do.monadicCloseable {
         Factory[
-          TensorWeights with TensorLayers with Operators with StrictLogging with Tensors.UnsafeMathOptimizations with OpenCL.LogContextNotification with OpenCL.GlobalExecutionContext with OpenCL.CommandQueuePool with OpenCL.UseAllCpuDevices with OpenCL.DontReleaseEventTooEarly with OpenCL.SynchronizedCreatingKernel with OpenCL.HandleEventInExecutionContextForIntelAndAMDPlatform with Tensors.WangHashingRandomNumberGenerator with ImplicitsSingleton]
+          TensorWeights with TensorLayers with Operators with StrictLogging with OpenCL.UnsafeMathOptimizations with OpenCL.LogContextNotification with OpenCL.GlobalExecutionContext with OpenCL.CommandQueuePool with OpenCL.UseAllCpuDevices with OpenCL.DontReleaseEventTooEarly with OpenCL.SynchronizedCreatingKernel with OpenCL.HandleEventInExecutionContextForIntelAndAMDPlatform with Tensors.WangHashingRandomNumberGenerator with ImplicitsSingleton]
           .newInstance(numberOfCommandQueuesPerDevice = 5)
       }
       .flatMap { hyperparameters =>
diff --git a/plugins-TensorLiterals/build.sbt b/plugins-TensorLiterals/build.sbt
@@ -1,4 +1,4 @@
-libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Test).jar().classifier {
+libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Optional).jar().classifier {
   import scala.util.Properties._
   if (isMac) {
     "natives-macos"
diff --git a/plugins-TensorTraining/build.sbt b/plugins-TensorTraining/build.sbt
@@ -1,4 +1,4 @@
-libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Test).jar().classifier {
+libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Optional).jar().classifier {
   import scala.util.Properties._
   if (isMac) {
     "natives-macos"
diff --git a/plugins-TensorWeights/build.sbt b/plugins-TensorWeights/build.sbt
@@ -1,4 +1,4 @@
-libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Test).jar().classifier {
+libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Optional).jar().classifier {
   import scala.util.Properties._
   if (isMac) {
     "natives-macos"
diff --git a/plugins-TensorWeights/src/main/scala/com/thoughtworks/deeplearning/plugins/TensorWeights.scala b/plugins-TensorWeights/src/main/scala/com/thoughtworks/deeplearning/plugins/TensorWeights.scala
@@ -116,7 +116,7 @@ trait TensorWeights extends Tensors with Weights {
       *            Factory[
       *              TensorWeights
       *                 with StrictLogging
-      *                 with Tensors.UnsafeMathOptimizations
+      *                 with OpenCL.UnsafeMathOptimizations
       *                 with OpenCL.LogContextNotification
       *                 with OpenCL.GlobalExecutionContext
       *                 with OpenCL.CommandQueuePool

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Test).jar().classifier {`
	`1`	`+libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Optional).jar().classifier {`
`2`	`2`	`import scala.util.Properties._`
`3`	`3`	`if (isMac) {`
`4`	`4`	`"natives-macos"`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class TensorLayersSpec extends AsyncFreeSpec with Matchers {`
`20`	`20`
`21`	`21`	`Do.monadicCloseable {`
`22`	`22`	`Factory[`
`23`		`- TensorWeights with TensorLayers with Operators with StrictLogging with Tensors.UnsafeMathOptimizations with OpenCL.LogContextNotification with OpenCL.GlobalExecutionContext with OpenCL.CommandQueuePool with OpenCL.UseAllCpuDevices with OpenCL.DontReleaseEventTooEarly with OpenCL.SynchronizedCreatingKernel with OpenCL.HandleEventInExecutionContextForIntelAndAMDPlatform with Tensors.WangHashingRandomNumberGenerator with ImplicitsSingleton]`
	`23`	`+ TensorWeights with TensorLayers with Operators with StrictLogging with OpenCL.UnsafeMathOptimizations with OpenCL.LogContextNotification with OpenCL.GlobalExecutionContext with OpenCL.CommandQueuePool with OpenCL.UseAllCpuDevices with OpenCL.DontReleaseEventTooEarly with OpenCL.SynchronizedCreatingKernel with OpenCL.HandleEventInExecutionContextForIntelAndAMDPlatform with Tensors.WangHashingRandomNumberGenerator with ImplicitsSingleton]`
`24`	`24`	`.newInstance(numberOfCommandQueuesPerDevice = 5)`
`25`	`25`	`}`
`26`	`26`	`.flatMap { hyperparameters =>`