Add a Naming plugin

Author: Atry

build.sbt

@@ -10,6 +10,8 @@ lazy val `plugins-Layers` = project.dependsOn(DeepLearning)
 
 lazy val `plugins-Weights` = project.dependsOn(DeepLearning)
 
+lazy val `plugins-Naming` = project.dependsOn(`plugins-Layers`, `plugins-Weights`)
+
 lazy val `plugins-Logging` = project.dependsOn(`plugins-Layers`, `plugins-Weights`)
 
 lazy val `plugins-Operators` = project
@@ -116,6 +118,7 @@ lazy val `plugins-Builtins` =
     `plugins-Layers`,
     `plugins-Weights`,
     `plugins-Logging`,
+    `plugins-Naming`,
     `plugins-Operators`,
     `plugins-FloatTraining`,
     `plugins-FloatLiterals`,

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

@@ -87,6 +87,7 @@ trait Builtins
     with Layers
     with Weights
     with Logging
+    with Naming
     with Operators
     with FloatTraining
     with FloatLiterals
@@ -119,4 +120,14 @@ trait Builtins
       with super[INDArrayLayers].ImplicitsApi
 
   type Implicits <: ImplicitsApi
+
+  trait LayerApi extends super[Logging].LayerApi with super[Naming].LayerApi { this: Layer =>
+  }
+
+  type Layer <: LayerApi
+
+  trait WeightApi extends super[Logging].WeightApi with super[Naming].WeightApi { this: Weight =>
+  }
+
+  type Weight <: WeightApi
 }

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

@@ -9,6 +9,7 @@ trait Builtins
     with Layers
     with Weights
     with Logging
+    with Naming
     with Operators
     with FloatTraining
     with FloatLiterals
@@ -27,4 +28,14 @@ trait Builtins
       with super[DoubleLiterals].ImplicitsApi
 
   type Implicits <: ImplicitsApi
+
+  trait LayerApi extends super[Logging].LayerApi with super[Naming].LayerApi { this: Layer =>
+  }
+
+  type Layer <: LayerApi
+
+  trait WeightApi extends super[Logging].WeightApi with super[Naming].WeightApi { this: Weight =>
+  }
+
+  type Weight <: WeightApi
 }

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

@@ -13,14 +13,14 @@ object Logging {
       level: Level,
       message: String = null,
       parameters: Array[AnyRef] = null,
-      thrown: Throwable = null)(implicit fullName: sourcecode.FullName, methodName: sourcecode.Name, caller: Caller[_])
+      thrown: Throwable = null)(implicit fullName: sourcecode.FullName, name: sourcecode.Name, caller: Caller[_])
       extends LogRecord(level, message) {
 
     setParameters(parameters)
     setThrown(thrown)
     setLoggerName(fullName.value)
     setSourceClassName(caller.value.getClass.getName)
-    setSourceMethodName(methodName.value)
+    setSourceMethodName(name.value)
   }
 
   trait LazyMessage extends LogRecord {
@@ -35,15 +35,15 @@ object Logging {
   }
 
   final class ThrownInLayer(val layer: Layers#Layer, getThrown: Throwable)(implicit fullName: sourcecode.FullName,
-                                                                           methodName: sourcecode.Name,
+                                                                           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,
-                                                                               methodName: sourcecode.Name,
+                                                                               name: sourcecode.Name,
                                                                                caller: Caller[_])
       extends ContextualLogRecord(Level.SEVERE, thrown = getThrown)
       with LazyMessage {
@@ -63,7 +63,7 @@ trait Logging extends Layers with Weights {
 
   trait LayerApi extends super.LayerApi { this: Layer =>
     implicit protected def fullName: sourcecode.FullName
-    implicit protected def methodName: sourcecode.Name
+    implicit protected def name: sourcecode.Name
     implicit protected def caller: Caller[_]
     override protected def handleException(thrown: Throwable): Unit = {
       super.handleException(thrown)
@@ -74,7 +74,7 @@ trait Logging extends Layers with Weights {
 
   trait WeightApi extends super.WeightApi { this: Weight =>
     implicit protected def fullName: sourcecode.FullName
-    implicit protected def methodName: sourcecode.Name
+    implicit protected def name: sourcecode.Name
     implicit protected def caller: Caller[_]
     override protected def handleException(thrown: Throwable): Unit = {
       super.handleException(thrown)

plugins-Naming/build.sbt

@@ -0,0 +1 @@
+libraryDependencies += "com.lihaoyi" %% "sourcecode" % "0.1.3"

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

@@ -0,0 +1,31 @@
+package com.thoughtworks.deeplearning.plugins
+
+/** A plugin that automatically names [[Layer]]s and [[Weight]]s.
+  *
+  * @author 杨博 (Yang Bo)
+  */
+trait Naming extends Layers with Weights {
+
+  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 =>
+    def fullName: sourcecode.FullName
+    def name: sourcecode.Name
+
+    override def toString: String = {
+      raw"""Weight[fullName=${fullName.value}]"""
+    }
+
+  }
+  override type Weight <: WeightApi
+  override type Implicits <: super[Layers].ImplicitsApi with super[Weights].ImplicitsApi
+
+}