Add the plugin Differentiables

Author: RevySR

build.sbt

@@ -4,13 +4,13 @@ includeFilter in unmanagedSources := (includeFilter in unmanagedSources).value &
 
 lazy val DeepLearning = project
 
-lazy val `plugins-Layers` = project.dependsOn(DeepLearning)
+lazy val `plugins-Layers` = project.dependsOn(DeepLearning, `plugins-Differentiables`)
 
-lazy val `plugins-Weights` = project.dependsOn(DeepLearning)
+lazy val `plugins-Weights` = project.dependsOn(DeepLearning, `plugins-Differentiables`)
 
-lazy val `plugins-Names` = project.dependsOn(`plugins-Layers`, `plugins-Weights`)
+lazy val `plugins-Names` = project.dependsOn(`plugins-Differentiables`)
 
-lazy val `plugins-Logging` = project.dependsOn(`plugins-Layers`, `plugins-Weights`)
+lazy val `plugins-Logging` = project.dependsOn(`plugins-Differentiables`)
 
 lazy val `plugins-Operators` = project
 
@@ -104,6 +104,7 @@ lazy val `plugins-Builtins` =
     `plugins-CumulativeDoubleLayers`,
     DeepLearning % "test->test"
   )
+lazy val `plugins-Differentiables` = project
 
 lazy val `plugins-OpenCLBuffers` =
   project.dependsOn(DeepLearning,

plugins-Builtins/src/main/scala/com/thoughtworks/deeplearning/plugins/Builtins.scala

@@ -37,13 +37,6 @@ trait Builtins
 
   type Implicits <: ImplicitsApi
 
-  trait LayerApi extends super[Logging].LayerApi with super[Names].LayerApi { this: Layer =>
-  }
-
-  type Layer <: LayerApi
-
-  trait WeightApi extends super[Logging].WeightApi with super[Names].WeightApi { this: Weight =>
-  }
-
-  type Weight <: WeightApi
+  trait DifferentiableApi extends super[Logging].DifferentiableApi with super[Names].DifferentiableApi
+  type Differentiable <: DifferentiableApi
 }

plugins-Differentiables/src/main/scala/com/thoughtworks/deeplearning/plugins/Differentiables.scala

@@ -0,0 +1,17 @@
+package com.thoughtworks.deeplearning.plugins
+
+/**
+  * @author 杨博 (Yang Bo)
+  */
+trait Differentiables {
+
+  trait DifferentiableApi {
+
+    protected def handleException(throwable: Throwable): Unit = {
+      throwable.printStackTrace()
+    }
+  }
+
+  type Differentiable <: DifferentiableApi
+
+}

plugins-Layers/src/main/scala/com/thoughtworks/deeplearning/plugins/Layers.scala

@@ -31,23 +31,19 @@ object Layers {
 }
 
 /** A plugin that enables [[Layer]] in neural networks. */
-trait Layers {
-  trait LayerApi {
+trait Layers extends Differentiables {
+  trait LayerApi extends DifferentiableApi {
     type Data
     type Delta
 
     def forward: Do[Tape[Data, Delta]]
 
-    protected def handleException(throwable: Throwable): Unit = {
-      throwable.printStackTrace()
-    }
-
   }
 
   /** A differentiable operation.
     * @template
     */
-  type Layer <: LayerApi
+  type Layer <: LayerApi with Differentiable
 
   trait ImplicitsApi {
     implicit def layerDeepLearning[From, Data0, Delta0](implicit asLayer: From <:< LayerApi {

plugins-Logging/src/main/scala/com/thoughtworks/deeplearning/plugins/Logging.scala

@@ -33,53 +33,35 @@ object Logging {
       case message => message
     }
   }
-
-  final class ThrownInLayer(val layer: Layers#Layer, getThrown: Throwable)(implicit fullName: sourcecode.FullName,
-                                                                           name: sourcecode.Name,
-                                                                           caller: Caller[_])
-      extends ContextualLogRecord(Level.SEVERE, thrown = getThrown)
-      with LazyMessage {
-    override protected def makeDefaultMessage: Fastring = fast"An exception is thrown in layer $layer"
-  }
-
-  final class ThrownInWeight(val weight: Weights#Weight, getThrown: Throwable)(implicit fullName: sourcecode.FullName,
-                                                                               name: sourcecode.Name,
-                                                                               caller: Caller[_])
+  final class UncaughtException(val differentiable: Logging#DifferentiableApi, getThrown: Throwable)(
+      implicit fullName: sourcecode.FullName,
+      name: sourcecode.Name,
+      caller: Caller[_])
       extends ContextualLogRecord(Level.SEVERE, thrown = getThrown)
       with LazyMessage {
-    override protected def makeDefaultMessage: Fastring = fast"An exception is thrown in weight $weight"
+    override protected def makeDefaultMessage: Fastring = fast"An exception is thrown in $differentiable"
   }
 
 }
 
-/** A plugin that logs uncaught exceptions raised from [[Layer]] and [[Weight]].
+/** A plugin that logs uncaught exceptions.
   *
   * @author 杨博 (Yang Bo)
   */
-trait Logging extends Layers with Weights {
+trait Logging extends Differentiables {
   import Logging._
 
   @transient lazy val logger: Logger = Logger.getLogger(getClass.getName)
 
-  trait LayerApi extends super.LayerApi { this: Layer =>
+  trait DifferentiableApi extends super.DifferentiableApi {
     implicit protected def fullName: sourcecode.FullName
     implicit protected def name: sourcecode.Name
     implicit protected def caller: Caller[_]
     override protected def handleException(thrown: Throwable): Unit = {
-      logger.log(new ThrownInLayer(this, thrown))
+      logger.log(new UncaughtException(this, thrown))
     }
   }
-  override type Layer <: LayerApi
 
-  trait WeightApi extends super.WeightApi { this: Weight =>
-    implicit protected def fullName: sourcecode.FullName
-    implicit protected def name: sourcecode.Name
-    implicit protected def caller: Caller[_]
-    override protected def handleException(thrown: Throwable): Unit = {
-      logger.log(new ThrownInWeight(this, thrown))
-    }
-  }
-  override type Weight <: WeightApi
-  override type Implicits <: super[Layers].ImplicitsApi with super[Weights].ImplicitsApi
+  type Differentiable <: DifferentiableApi
 
 }

plugins-Names/src/main/scala/com/thoughtworks/deeplearning/plugins/Names.scala

@@ -4,19 +4,9 @@ package com.thoughtworks.deeplearning.plugins
   *
   * @author 杨博 (Yang Bo)
   */
-trait Names extends Layers with Weights {
+trait Names {
 
-  trait LayerApi extends super.LayerApi { this: Layer =>
-    def fullName: sourcecode.FullName
-    def name: sourcecode.Name
-
-    override def toString: String = {
-      raw"""Layer[fullName=${fullName.value}]"""
-    }
-  }
-  override type Layer <: LayerApi
-
-  trait WeightApi extends super.WeightApi { this: Weight =>
+  trait DifferentiableApi {
     def fullName: sourcecode.FullName
     def name: sourcecode.Name
 
@@ -25,7 +15,6 @@ trait Names extends Layers with Weights {
     }
 
   }
-  override type Weight <: WeightApi
-  override type Implicits <: super[Layers].ImplicitsApi with super[Weights].ImplicitsApi
+  type Differentiable <: DifferentiableApi
 
 }

plugins-Weights/src/main/scala/com/thoughtworks/deeplearning/plugins/Weights.scala

@@ -15,9 +15,9 @@ import com.thoughtworks.continuation._
   *
   * @author 杨博 (Yang Bo)
   */
-trait Weights {
+trait Weights extends Differentiables {
 
-  trait WeightApi {
+  trait WeightApi extends DifferentiableApi {
 
     protected type PartiallyAppliedOptimizer
 
@@ -49,16 +49,12 @@ trait Weights {
     type Data
     type Delta
 
-    protected def handleException(throwable: Throwable): Unit = {
-      throwable.printStackTrace()
-    }
-
     var data: Data
 
   }
 
   /** @template */
-  type Weight <: WeightApi
+  type Weight <: WeightApi with Differentiable
 
   trait OptimizerApi {
     type Delta