Merge branch '3.0.x' into 2.2.x

# Conflicts:
#	build.sbt
#	plugins-Builtins/src/main/scala-2.11/com/thoughtworks/deeplearning/plugins/Builtins.scala
#	plugins-Builtins/src/main/scala/com/thoughtworks/deeplearning/plugins/Builtins.scala
#	plugins-CumulativeFloatLayers/build.sbt
#	plugins-FloatLayers/src/main/scala/com/thoughtworks/deeplearning/plugins/FloatLayers.scala
#	plugins-INDArrayLayers/src/main/scala-2.11/com/thoughtworks/deeplearning/plugins/INDArrayLayers.scala
#	plugins-INDArrayWeights/build.sbt
#	plugins-ImplicitsSingleton/build.sbt
#	plugins-Layers/src/main/scala/com/thoughtworks/deeplearning/plugins/Layers.scala
#	project/build.properties
#	version.sbt

Author: Atry

.gitignore

@@ -1,2 +1,3 @@
 target/
 local.sbt
+secret/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Compute.scala"]
+	path = Compute.scala
+	url = https://github.com/ThoughtWorksInc/Compute.scala.git

.travis.yml

@@ -1,3 +1,5 @@
+sudo: false
+
 matrix:
   include:
     - os: linux
@@ -15,6 +17,18 @@ matrix:
         on:
           condition: -e ./deploy.sbt
           all_branches: true
+      before_install:
+        - wget --quiet --output-document=/tmp/AMD-SDK.tar.bz2 http://cs.wisc.edu/~riccardo/assets/AMD-APP-SDKInstaller-v3.0.130.136-GA-linux64.tar.bz2
+        - mkdir /tmp/amd-app-sdk-installer
+        - tar -xjf /tmp/AMD-SDK.tar.bz2 -C /tmp/amd-app-sdk-installer
+        - export AMDAPPSDK=${HOME}/AMDAPPSDK
+        - export OPENCL_VENDOR_PATH=${AMDAPPSDK}/etc/OpenCL/vendors
+        - mkdir -p ${OPENCL_VENDOR_PATH}
+        - sh /tmp/amd-app-sdk-installer/AMD-APP-SDK*.sh --tar -xf -C ${AMDAPPSDK}
+        - echo libamdocl64.so > ${OPENCL_VENDOR_PATH}/amdocl64.icd
+        - export LD_LIBRARY_PATH=${AMDAPPSDK}/lib/x86_64/sdk:${LD_LIBRARY_PATH}
+        - chmod +x ${AMDAPPSDK}/bin/x86_64/clinfo
+        - ${AMDAPPSDK}/bin/x86_64/clinfo
     - os: osx
       osx_image: xcode8
       language: java
@@ -32,6 +46,8 @@ cache:
     - $HOME/.sbt/boot/
     - $HOME/Library/Caches/Homebrew
 
+before_script:
+
 script:
   - sbt +test +unidoc
 

.travis/amd_sdk.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# Original script from https://github.com/gregvw/amd_sdk/
+
+# Location from which get nonce and file name from
+URL="https://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/"
+URLDOWN="https://developer.amd.com/amd-license-agreement-appsdk/"
+
+NONCE1_STRING='name="amd_developer_central_downloads_page_nonce"'
+FILE_STRING='name="f"'
+POSTID_STRING='name="post_id"'
+NONCE2_STRING='name="amd_developer_central_nonce"'
+
+#For newest FORM=`wget -qO - $URL | sed -n '/download-2/,/64-bit/p'`
+FORM=`wget -qO - $URL | sed -n '/download-5/,/64-bit/p'`
+
+# Get nonce from form
+NONCE1=`echo $FORM | awk -F ${NONCE1_STRING} '{print $2}'`
+NONCE1=`echo $NONCE1 | awk -F'"' '{print $2}'`
+echo $NONCE1
+
+# get the postid
+POSTID=`echo $FORM | awk -F ${POSTID_STRING} '{print $2}'`
+POSTID=`echo $POSTID | awk -F'"' '{print $2}'`
+echo $POSTID
+
+# get file name
+FILE=`echo $FORM | awk -F ${FILE_STRING} '{print $2}'`
+FILE=`echo $FILE | awk -F'"' '{print $2}'`
+echo $FILE
+
+FORM=`wget -qO - $URLDOWN --post-data "amd_developer_central_downloads_page_nonce=${NONCE1}&f=${FILE}&post_id=${POSTID}"`
+
+NONCE2=`echo $FORM | awk -F ${NONCE2_STRING} '{print $2}'`
+NONCE2=`echo $NONCE2 | awk -F'"' '{print $2}'`
+echo $NONCE2
+
+wget --content-disposition --trust-server-names $URLDOWN --post-data "amd_developer_central_nonce=${NONCE2}&f=${FILE}" -O /tmp/AMD-SDK.tar.bz2;

Compute.scala

@@ -1,4 +1,4 @@
-libraryDependencies += "com.thoughtworks.raii" %% "asynchronous" % "2.0.0"
+libraryDependencies += "com.thoughtworks.raii" %% "asynchronous" % "3.0.0-M11"
 
 addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.patch)
 

DeepLearning/build.sbt

@@ -93,11 +93,11 @@ object DeepLearning {
     /** Returns an asynchronous [[com.thoughtworks.raii.asynchronous.Do Do]] of forward pass, which creates a wengert list. */
     def forward(differentiable: Differentiable): Do[Tape[Data, Delta]]
 
-    /** Returns a [[com.thoughtworks.future.Future Future]] that updates [[plugins.Weights.Weight Weight]] internally used by `differentiable`. */
-    def train(differentiable: Differentiable)(implicit monoid: MultiplicativeMonoid[Delta]): Future[Data]
+//    /** Returns a [[com.thoughtworks.future.Future Future]] that updates [[plugins.Weights.Weight Weight]] internally used by `differentiable`. */
+//    def train(differentiable: Differentiable)(implicit monoid: MultiplicativeMonoid[Delta]): Future[Data]
 
-    /** Returns a [[com.thoughtworks.future.Future Future]] of the [[DeepLearning.Tape.data data]] of the `differentiable` expression. */
-    def predict(differentiable: Differentiable): Future[Data]
+//    /** Returns a [[com.thoughtworks.future.Future Future]] of the [[DeepLearning.Tape.data data]] of the `differentiable` expression. */
+//    def predict(differentiable: Differentiable): Future[Data]
   }
 
 }
@@ -122,17 +122,4 @@ trait DeepLearning[Differentiable] extends SimulacrumIssue82WorkAround[Different
 
   def forward(differentiable: Differentiable): Do[Tape[Data, Delta]]
 
-  final def train(differentiable: Differentiable)(implicit monoid: MultiplicativeMonoid[Delta]): Future[Data] = {
-    val doData = forward(differentiable).flatMap[Data] { tape =>
-      Do.garbageCollected(tape.backward(Do.now(monoid.one))).intransitiveMap { _: Unit =>
-        tape.data
-      }
-    }
-    doData.run
-  }
-
-  final def predict(differentiable: Differentiable): Future[Data] = {
-    val doData = forward(differentiable).map(_.data)
-    doData.run
-  }
 }

DeepLearning/src/main/scala/com/thoughtworks/deeplearning/DeepLearning.scala

@@ -1,7 +1,7 @@
 # <a href="http://deeplearning.thoughtworks.school/"><img src="http://deeplearning.thoughtworks.school/assets/images/logo-text-black.png" alt="DeepLearning.scala" height="40"/></a>  <a href="http://thoughtworks.com/"><img align="right" src="https://www.thoughtworks.com/imgs/tw-logo.png" alt="ThoughtWorks" height="15"/></a>
 
 [![Join the chat at https://gitter.im/ThoughtWorksInc/DeepLearning.scala](https://badges.gitter.im/ThoughtWorksInc/DeepLearning.scala.svg)](https://gitter.im/ThoughtWorksInc/DeepLearning.scala?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/ThoughtWorksInc/DeepLearning.scala.svg?branch=2.0.x)](https://travis-ci.org/ThoughtWorksInc/DeepLearning.scala)
+[![Build Status](https://travis-ci.org/ThoughtWorksInc/DeepLearning.scala.svg?branch=3.0.x)](https://travis-ci.org/ThoughtWorksInc/DeepLearning.scala)
 [![Latest version](https://index.scala-lang.org/thoughtworksinc/deeplearning.scala/plugins-builtins/latest.svg)](https://index.scala-lang.org/thoughtworksinc/deeplearning.scala/plugins-builtins)
 [![Scaladoc](https://javadoc.io/badge/com.thoughtworks.deeplearning/deeplearning_2.11.svg?label=scaladoc)](https://javadoc.io/page/com.thoughtworks.deeplearning/deeplearning_2.11/latest/com/thoughtworks/deeplearning/package.html)
 

README.md

@@ -4,24 +4,20 @@ includeFilter in unmanagedSources := (includeFilter in unmanagedSources).value &
 
 lazy val DeepLearning = project
 
-lazy val `plugins-ImplicitsSingleton` = project
+lazy val `plugins-Layers` = project.dependsOn(DeepLearning, `plugins-Differentiables`)
 
-lazy val `plugins-Layers` = project.dependsOn(DeepLearning)
+lazy val `plugins-Weights` = project.dependsOn(DeepLearning, `plugins-Differentiables`)
 
-lazy val `plugins-Weights` = project.dependsOn(DeepLearning)
+lazy val `plugins-Names` = project.dependsOn(`plugins-Differentiables`)
 
-lazy val `plugins-Names` = project.dependsOn(`plugins-Layers`, `plugins-Weights`)
-
-lazy val `plugins-Logging` = project.dependsOn(`plugins-Layers`, `plugins-Weights`)
+lazy val `plugins-Logging` = project.dependsOn(`plugins-Differentiables`)
 
 lazy val `plugins-Operators` = project
 
 lazy val `plugins-HLists` = project.dependsOn(DeepLearning)
 
 lazy val `plugins-Products` = project.dependsOn(`plugins-HLists`)
 
-lazy val `plugins-FloatTraining` = project.dependsOn(`plugins-Training`)
-
 lazy val `plugins-FloatLiterals` = project.dependsOn(`DeepLearning`)
 
 lazy val `plugins-FloatWeights` = project.dependsOn(`plugins-Weights`)
@@ -30,45 +26,38 @@ lazy val `plugins-FloatLayers` =
   project.dependsOn(
     `plugins-Layers`,
     `plugins-Operators`,
-    `plugins-FloatLiterals` % Test,
-    `plugins-FloatTraining` % Test,
-    `plugins-ImplicitsSingleton` % Test
+    `plugins-FloatLiterals` % Test
   )
 
 lazy val `plugins-CumulativeFloatLayers` =
   project.dependsOn(
     DeepLearning % "test->test",
     `plugins-FloatLayers`,
-    `plugins-FloatTraining` % Test,
     `plugins-FloatLiterals` % Test,
     `plugins-FloatWeights` % Test,
-    `plugins-ImplicitsSingleton` % Test,
     `plugins-Products` % Test
   )
 
-lazy val `plugins-Training` = project.dependsOn(DeepLearning)
-
-lazy val `plugins-INDArrayTraining` = project.dependsOn(`plugins-Training`)
+lazy val `plugins-TensorLiterals` = project.dependsOn(`DeepLearning`, ProjectRef(file("Compute.scala"), "Tensors"))
 
-lazy val `plugins-INDArrayLiterals` = project.dependsOn(DeepLearning)
+lazy val `plugins-TensorWeights` = project.dependsOn(`plugins-Weights`, ProjectRef(file("Compute.scala"), "Tensors"))
 
-lazy val `plugins-INDArrayWeights` = project.dependsOn(`plugins-ImplicitsSingleton`, `plugins-Weights`)
-
-lazy val `plugins-INDArrayLayers` =
-  project.dependsOn(`plugins-ImplicitsSingleton`, `plugins-Layers`, `plugins-DoubleLiterals`, `plugins-DoubleLayers`)
+lazy val `plugins-TensorLayers` =
+  project.dependsOn(
+    `plugins-Layers`,
+    `plugins-Operators`,
+    `plugins-TensorWeights` % Test,
+    `plugins-TensorLiterals` % Test,
+    ProjectRef(file("Compute.scala"), "Tensors")
+  )
 
-lazy val `plugins-CumulativeINDArrayLayers` =
+lazy val `plugins-CumulativeTensorLayers` =
   project.dependsOn(
-    `plugins-INDArrayLayers`,
-    `plugins-CumulativeDoubleLayers`,
     DeepLearning % "test->test",
-    `plugins-DoubleLiterals` % Test,
-    `plugins-DoubleTraining` % Test,
-    `plugins-INDArrayTraining` % Test,
-    `plugins-INDArrayLiterals` % Test,
-    `plugins-INDArrayWeights` % Test,
+    `plugins-TensorLayers`,
     `plugins-Logging` % Test,
-    `plugins-ImplicitsSingleton` % Test
+    `plugins-TensorLiterals` % Test,
+    `plugins-TensorWeights` % Test
   )
 
 lazy val FloatRegex = """(?i:float)""".r
@@ -97,11 +86,6 @@ lazy val `plugins-DoubleWeights` =
     .dependsOn(`plugins-Weights`)
     .settings(sourceGenerators in Compile += copyAndReplace(`plugins-FloatWeights`).taskValue)
 
-lazy val `plugins-DoubleTraining` =
-  project
-    .dependsOn(`plugins-Training`)
-    .settings(sourceGenerators in Compile += copyAndReplace(`plugins-FloatTraining`).taskValue)
-
 lazy val `plugins-DoubleLiterals` =
   project
     .dependsOn(`DeepLearning`)
@@ -121,42 +105,36 @@ lazy val `plugins-Builtins` =
   project.dependsOn(
     `plugins-Products`,
     `plugins-HLists`,
-    `plugins-ImplicitsSingleton`,
     `plugins-Layers`,
     `plugins-Weights`,
     `plugins-Logging`,
     `plugins-Names`,
     `plugins-Operators`,
-    `plugins-FloatTraining`,
     `plugins-FloatLiterals`,
     `plugins-FloatWeights`,
     `plugins-FloatLayers`,
     `plugins-CumulativeFloatLayers`,
-    `plugins-DoubleTraining`,
     `plugins-DoubleLiterals`,
     `plugins-DoubleWeights`,
     `plugins-DoubleLayers`,
     `plugins-CumulativeDoubleLayers`,
-    `plugins-INDArrayTraining`,
-    `plugins-INDArrayLiterals`,
-    `plugins-INDArrayWeights`,
-    `plugins-INDArrayLayers`,
-    `plugins-CumulativeINDArrayLayers`,
+    `plugins-TensorLiterals`,
+    `plugins-TensorWeights`,
+    `plugins-TensorLayers`,
+    `plugins-CumulativeTensorLayers`,
     DeepLearning % "test->test"
   )
+lazy val `plugins-Differentiables` = project
+
 publishArtifact := false
 
-lazy val unidoc =
-  project
-    .enablePlugins(StandaloneUnidoc, TravisUnidocTitle)
-    .settings(
-      UnidocKeys.unidocProjectFilter in ScalaUnidoc in UnidocKeys.unidoc := inAggregates(LocalRootProject),
-      addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.3"),
-      addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full),
-      scalacOptions += "-Xexperimental",
-      scalacOptions += "-Ypartial-unification"
-    )
+enablePlugins(StandaloneUnidoc, TravisUnidocTitle)
+unidocProjectFilter in ScalaUnidoc in unidoc := inAggregates(LocalRootProject)
+addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.3")
+addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)
+scalacOptions += "-Xexperimental"
+scalacOptions += "-Ypartial-unification"
 
 organization in ThisBuild := "com.thoughtworks.deeplearning"
 
-crossScalaVersions := Seq("2.11.11", "2.12.3")
+crossScalaVersions in Global := Seq("2.11.12", "2.12.4")

build.sbt

@@ -13,15 +13,19 @@ scalacOptions in ThisBuild ++= {
   }
 }
 
-lazy val secret = project settings(publishArtifact := false) configure { secret =>
-  sys.env.get("GITHUB_PERSONAL_ACCESS_TOKEN") match {
-    case Some(pat) =>
-      import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider
-      secret.addSbtFilesFromGit(
-        "https://github.com/ThoughtWorksInc/tw-data-china-continuous-delivery-password.git",
-        new UsernamePasswordCredentialsProvider(pat, ""),
-        file("secret.sbt"))
-    case None =>
-      secret
+lazy val secret = project.settings(publishArtifact := false).in {
+  val secretDirectory = file(sourcecode.File()).getParentFile / "secret"
+  sys.env.get("GITHUB_PERSONAL_ACCESS_TOKEN").foreach { token =>
+    IO.delete(secretDirectory)
+    org.eclipse.jgit.api.Git
+      .cloneRepository()
+      .setURI("https://github.com/ThoughtWorksInc/tw-data-china-continuous-delivery-password.git")
+      .setDirectory(secretDirectory)
+      .setCredentialsProvider(
+        new org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider(token, "")
+      )
+      .call()
+      .close()
   }
+  secretDirectory
 }

deploy.sbt.disabled

@@ -1,23 +1,18 @@
 enablePlugins(Example)
 
-exampleSuperTypes ~= { oldExampleSuperTypes =>
-  import oldExampleSuperTypes._
-  updated(indexOf("_root_.org.scalatest.FreeSpec"), "_root_.org.scalatest.AsyncFreeSpec")
+import scala.meta._
+
+exampleSuperTypes := exampleSuperTypes.value.map {
+  case ctor"_root_.org.scalatest.FreeSpec" =>
+    ctor"_root_.org.scalatest.AsyncFreeSpec"
+  case otherTrait =>
+    otherTrait
 }
 
-exampleSuperTypes += "_root_.com.thoughtworks.deeplearning.scalatest.ThoughtworksFutureToScalaFuture"
+exampleSuperTypes += ctor"_root_.com.thoughtworks.deeplearning.scalatest.ThoughtworksFutureToScalaFuture"
 
 libraryDependencies += "com.thoughtworks.each" %% "each" % "3.3.1" % Test
 
-libraryDependencies ++= {
-  import Ordering.Implicits._
-  if (VersionNumber(scalaVersion.value).numbers >= Seq(2, 12)) {
-    Nil
-  } else {
-    Seq("org.nd4j" %% "nd4s" % "0.8.0",
-        "org.nd4j" % "nd4j-api" % "0.8.0",
-        "org.nd4j" % "nd4j-native-platform" % "0.8.0" % Test)
-  }
-}
+libraryDependencies += "com.thoughtworks.feature" %% "mixins-implicitssingleton" % "2.3.0-M8"
 
 fork in Test := true