Upgraded to scala 2.12, added Bloop support, fixed compilation warnings.

elevate-lang · Jan 1, 2020 · de5b2a5 · de5b2a5
1 parent a800c08
commit de5b2a5
Show file tree

Hide file tree

Showing 171 changed files with 239 additions and 410 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,8 @@ project
 target
 modules.xml
 .vscode
+.metals
+.bloop
 
 *.aux
 *.bbl

diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.11.12"
+ThisBuild / scalaVersion := "2.12.10"
 ThisBuild / organization := "org.rise-lang"
 
 lazy val shine = (project in file("."))
@@ -25,18 +25,18 @@ lazy val shine = (project in file("."))
     libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
     libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value,
     libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value,
-    libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "1.0.5",
+    libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "1.2.0",
 
     // JUnit
     libraryDependencies += "junit" % "junit" % "4.11",
 
     // Scalatest
-    libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.5" % "test",
+    libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.0" % "test",
 
     // Silencer: Scala compiler plugin for warning suppression
     libraryDependencies ++= Seq(
-      compilerPlugin("com.github.ghik" %% "silencer-plugin" % "1.4.0"),
-      "com.github.ghik" %% "silencer-lib" % "1.4.0" % Provided
+      compilerPlugin("com.github.ghik" %% "silencer-plugin" % "1.4.3" cross CrossVersion.full),
+      "com.github.ghik" %% "silencer-lib" % "1.4.3" % Provided cross CrossVersion.full
     )
   )
 

diff --git a/lib/executor b/lib/executor
diff --git a/lib/rise b/lib/rise
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.0-RC1")
diff --git a/src/main/scala/FSmooth/Differentiation.scala b/src/main/scala/FSmooth/Differentiation.scala
@@ -2,7 +2,6 @@ package FSmooth
 
 import DSL._
 import FSmooth.MSmooth._
-import FSmooth.traversal._
 
 import scala.collection.mutable
 

diff --git a/src/main/scala/apps/acoustic3D.scala b/src/main/scala/apps/acoustic3D.scala
@@ -37,7 +37,7 @@ object acoustic3D {
   private val SR = 441.0f
   private val alpha = 0.005f
   private val c = 344.0f
-  private val NF = 4410
+  // private val NF = 4410
   private val k = 1.0f / SR
   private val h = Math.sqrt(3.0f) * c * k
   private val lambda = c * k / h

diff --git a/src/main/scala/apps/convolution.scala b/src/main/scala/apps/convolution.scala
@@ -4,7 +4,6 @@ import rise.core._
 import rise.core.DSL._
 import rise.core.types._
 import rise.core.TypeLevelDSL._
-import rise.core.primitives._
 import rise.OpenCL.DSL._
 import rise.core.HighLevelConstructs._
 import util.{Time, TimeSpan}

diff --git a/src/main/scala/apps/harrisCornerDetection.scala b/src/main/scala/apps/harrisCornerDetection.scala
@@ -1,13 +1,10 @@
 package apps
 
-import rise.core._
 import rise.core.DSL._
 import rise.core.TypeLevelDSL._
 import rise.core.types._
 import rise.core.primitives._
-import rise.OpenCL.primitives._
 import rise.OpenCL.DSL._
-import rise.core.HighLevelConstructs._
 import util.gen
 
 import scala.reflect.ClassTag
@@ -17,7 +14,7 @@ object harrisCornerDetection {
   private val id = C2D.id
   private val mulT = C2D.mulT
   private val sq = fun(x => x * x)
-  private def zip2D(a: Expr, b: Expr) = zipND(2)(a)(b)
+  // private def zip2D(a: Expr, b: Expr) = zipND(2)(a)(b)
 
   // 5 for two scalar stencils of 3
   private val hRange = arithexpr.arithmetic.RangeAdd(5, arithexpr.arithmetic.PosInf, 1)

diff --git a/src/main/scala/apps/kmeans.scala b/src/main/scala/apps/kmeans.scala
@@ -4,7 +4,6 @@ import rise.core._
 import rise.core.DSL._
 import rise.core.TypeLevelDSL._
 import rise.core.types._
-import rise.core.primitives._
 import rise.OpenCL.DSL._
 
 object kmeans {

diff --git a/src/main/scala/apps/mm.scala b/src/main/scala/apps/mm.scala
@@ -4,8 +4,6 @@ import rise.core._
 import rise.core.DSL._
 import rise.core.TypeLevelDSL._
 import rise.core.types._
-import rise.core.primitives._
-import rise.OpenCL.primitives._
 import rise.OpenCL.DSL._
 
 object mm {

diff --git a/src/main/scala/apps/molecularDynamics.scala b/src/main/scala/apps/molecularDynamics.scala
@@ -4,7 +4,6 @@ import rise.core._
 import rise.core.DSL._
 import rise.core.TypeLevelDSL._
 import rise.core.types._
-import rise.core.primitives._
 import rise.OpenCL.DSL._
 
 object molecularDynamics {

diff --git a/src/main/scala/apps/mriQ.scala b/src/main/scala/apps/mriQ.scala
@@ -4,7 +4,6 @@ import rise.core._
 import rise.core.DSL._
 import rise.core.TypeLevelDSL._
 import rise.core.types._
-import rise.core.primitives._
 import rise.OpenCL.DSL._
 
 object mriQ {

diff --git a/src/main/scala/apps/nbody.scala b/src/main/scala/apps/nbody.scala
@@ -4,7 +4,6 @@ import rise.core._
 import rise.core.DSL._
 import rise.core.TypeLevelDSL._
 import rise.core.types._
-import rise.core.primitives._
 import rise.OpenCL.DSL._
 
 object nbody {

diff --git a/src/main/scala/apps/separableConvolution2D.scala b/src/main/scala/apps/separableConvolution2D.scala
@@ -6,7 +6,6 @@ import rise.core.TypeLevelDSL._
 import rise.core.types._
 import rise.core.semantics._
 import rise.core.primitives._
-import rise.OpenCL.primitives._
 import rise.OpenCL.DSL._
 import rise.core.HighLevelConstructs._
 

diff --git a/src/main/scala/apps/sgemm.scala b/src/main/scala/apps/sgemm.scala
@@ -6,10 +6,9 @@ import rise.core.HighLevelConstructs.reorderWithStride
 import rise.core._
 import rise.core.DSL._
 import rise.core.TypeLevelDSL._
-import rise.core.primitives._
 import rise.OpenCL.DSL._
 import rise.core.types._
-import util.{Time, TimeSpan, gen}
+import util.{Time, TimeSpan}
 
 object sgemm {
   // we can use implicit type parameters and type annotations to specify the function type of mult

diff --git a/src/main/scala/benchmarks/core/package.scala b/src/main/scala/benchmarks/core/package.scala
@@ -1,6 +1,5 @@
 package benchmarks
 
-import opencl.executor.Executor
 import util.{Time, TimeSpan}
 
 package object core {

diff --git a/src/main/scala/elevate/fsmooth/traversal.scala b/src/main/scala/elevate/fsmooth/traversal.scala
@@ -48,7 +48,7 @@ object traversal {
         case Success(f: FSmooth) => Success(Application(s(f).get, args, t))
         case Failure(state) => {
           val strategy = if(carryOverState) state else s
-          args.foldLeft[(Boolean, RewriteResult[FSmooth])](true, Failure(s))(
+          args.foldLeft[(Boolean, RewriteResult[FSmooth])]((true, Failure(s)))(
             (state,expr) => {
               val (cont, result) = (state._1, state._2)
               if (cont) strategy(expr) match {

diff --git a/src/main/scala/elevate/rise/rules/movement.scala b/src/main/scala/elevate/rise/rules/movement.scala
@@ -1,7 +1,6 @@
 package elevate.rise.rules
 
 import elevate.core.strategies.predicate._
-import elevate.rise.rules.traversal._
 import elevate.core.{Failure, RewriteResult, Strategy, Success}
 import elevate.rise._
 import rise.core._

diff --git a/src/main/scala/elevate/rise/strategies/predicate.scala b/src/main/scala/elevate/rise/strategies/predicate.scala
@@ -5,8 +5,6 @@ import elevate.rise.Rise
 import rise.core.primitives.{Generate, Let, Map, Reduce, Zip}
 import rise.core.{App, Identifier, Lambda}
 
-import scala.language.implicitConversions
-
 object predicate {
 
   // Matching Single Nodes

diff --git a/src/main/scala/shine/C/AST/Nodes.scala b/src/main/scala/shine/C/AST/Nodes.scala
@@ -1,8 +1,8 @@
 package shine.C.AST
 
+import arithexpr.arithmetic.ArithExpr
 import shine.C
 import shine.C.AST.Nodes.{VisitAndGenerateStmt, VisitAndRebuild}
-import arithexpr.arithmetic.ArithExpr
 
 /*
 * This implementation follows the design from the Lift repository by Adam Harries

diff --git a/src/main/scala/shine/C/AST/Printer.scala b/src/main/scala/shine/C/AST/Printer.scala
@@ -1,8 +1,7 @@
 package shine.C.AST
 
-import shine.DPIA.NatFunCall
-import shine.DPIA.Types.ExpType
 import arithexpr.arithmetic._
+import shine.DPIA.NatFunCall
 
 trait Printer {
   def printNode(n: Node): String

diff --git a/src/main/scala/shine/C/CodeGeneration/CodeGenerator.scala b/src/main/scala/shine/C/CodeGeneration/CodeGenerator.scala
@@ -1,7 +1,8 @@
 package shine.C.CodeGeneration
 
+import arithexpr.arithmetic.BoolExpr.ArithPredicate
+import arithexpr.arithmetic.{NamedVar, _}
 import shine.C.AST.Block
-import shine.C.AST.DefaultImplementations.ArrayLiteral
 import shine.DPIA.Compilation.SimplifyNats
 import shine.DPIA.DSL._
 import shine.DPIA.FunctionalPrimitives._
@@ -12,8 +13,6 @@ import shine.DPIA.Semantics.OperationalSemantics._
 import shine.DPIA.Types._
 import shine.DPIA._
 import shine._
-import arithexpr.arithmetic.BoolExpr.ArithPredicate
-import arithexpr.arithmetic.{NamedVar, _}
 
 import scala.collection.immutable.VectorBuilder
 import scala.collection.{immutable, mutable}

diff --git a/src/main/scala/shine/C/Program.scala b/src/main/scala/shine/C/Program.scala
@@ -1,11 +1,8 @@
 package shine.C
 
-import shine._
 import shine.DPIA.Phrases.Identifier
 import shine.DPIA.Types.{AccType, ExpType}
-
-import scala.language.implicitConversions
-
+import shine._
 
 case class Program(decls: Seq[C.AST.Decl],
                    function: C.AST.FunDecl,

diff --git a/src/main/scala/shine/C/ProgramGenerator.scala b/src/main/scala/shine/C/ProgramGenerator.scala
@@ -1,13 +1,13 @@
 package shine.C
 
+import arithexpr.arithmetic.{Cst, Var}
 import shine.DPIA.Compilation._
 import shine.DPIA.DSL._
 import shine.DPIA.FunctionalPrimitives.AsIndex
-import shine.DPIA.{LetNatIdentifier, Lifting}
 import shine.DPIA.Phrases._
 import shine.DPIA.Types._
+import shine.DPIA.{LetNatIdentifier, Lifting}
 import shine._
-import arithexpr.arithmetic.{Cst, Var}
 
 import scala.collection._
 

diff --git a/src/main/scala/shine/C/TranslationContext.scala b/src/main/scala/shine/C/TranslationContext.scala
@@ -1,12 +1,10 @@
 package shine.C
 
-import shine.DPIA
 import shine.DPIA.DSL._
 import shine.DPIA.ImperativePrimitives.Assign
-import shine.DPIA.IntermediatePrimitives.{DepMapSeqI, MapSeqI}
-import shine.DPIA.Phrases.{DepLambda, Phrase}
+import shine.DPIA.IntermediatePrimitives.DepMapSeqI
+import shine.DPIA.Phrases.Phrase
 import shine.DPIA.Types._
-import shine.DPIA.freshName
 
 class TranslationContext() extends shine.DPIA.Compilation.TranslationContext {
   override def assign(dt: DataType,
@@ -26,7 +24,7 @@ class TranslationContext() extends shine.DPIA.Compilation.TranslationContext {
         DepMapSeqI(n, ft, ft,
           depFun[NatKind]()(k =>
             λ(ExpType(ft(k), read))(x => λ(AccType( ft(k) ))(a => assign(ft(k), a, x) ))),
-          rhs, lhs)(this)
+          rhs, lhs)
 
       case x => throw new Exception(s"Don't know how to assign value of type $x")
     }

diff --git a/src/main/scala/shine/DPIA/Compilation/CodeGenerator.scala b/src/main/scala/shine/DPIA/Compilation/CodeGenerator.scala
@@ -1,9 +1,9 @@
 package shine.DPIA.Compilation
 
 import shine.C.CodeGeneration.{CodeGenerator => CCodeGenerator}
-import shine.DPIA.{LetNatIdentifier, Nat}
 import shine.DPIA.Phrases.Phrase
 import shine.DPIA.Types.{AccType, CommType, DataType, ExpType}
+import shine.DPIA.{LetNatIdentifier, Nat}
 
 trait CodeGenerator[Environment, Path, Stmt, Expr, Decl, Ident, Type] {
   def name: String

diff --git a/src/main/scala/shine/DPIA/Compilation/SimplifyNats.scala b/src/main/scala/shine/DPIA/Compilation/SimplifyNats.scala
@@ -1,9 +1,9 @@
 package shine.DPIA.Compilation
 
-import shine.DPIA._
+import shine.DPIA.FunctionalPrimitives.AsIndex
 import shine.DPIA.Phrases._
 import shine.DPIA.Types._
-import shine.DPIA.FunctionalPrimitives.AsIndex
+import shine.DPIA._
 
 object SimplifyNats {
   def apply(p: Phrase[CommType]): Phrase[CommType] = {

diff --git a/src/main/scala/shine/DPIA/Compilation/UnrollLoops.scala b/src/main/scala/shine/DPIA/Compilation/UnrollLoops.scala
@@ -1,13 +1,13 @@
 package shine.DPIA.Compilation
 
-import shine.DPIA._
+import arithexpr.arithmetic.ArithExpr.isSmaller
+import arithexpr.arithmetic.Cst
+import shine.DPIA.FunctionalPrimitives.AsIndex
+import shine.DPIA.ImperativePrimitives._
 import shine.DPIA.Phrases._
 import shine.DPIA.Types._
-import shine.DPIA.ImperativePrimitives.{Comment, For, ForNat, IdxAcc, Seq}
-import shine.DPIA.FunctionalPrimitives.AsIndex
+import shine.DPIA._
 import shine.OpenCL.ImperativePrimitives.OpenCLParFor
-import arithexpr.arithmetic.Cst
-import arithexpr.arithmetic.ArithExpr.isSmaller
 
 object UnrollLoops {
   def apply(p: Phrase[CommType]): Phrase[CommType] = {

diff --git a/src/main/scala/shine/DPIA/DSL/Core.scala b/src/main/scala/shine/DPIA/DSL/Core.scala
@@ -26,8 +26,7 @@ object λ extends funDef
 
 object nFun {
   def apply[T <: PhraseType](f: NatIdentifier => Phrase[T],
-                             range: arithexpr.arithmetic.Range)
-                            (implicit w: Kind.IdentifierMaker[NatKind]): DepLambda[NatKind, T] = {
+                             range: arithexpr.arithmetic.Range): DepLambda[NatKind, T] = {
     val x = NatIdentifier(freshName("n"), range)
     DepLambda[NatKind, T](x, f(x))
   }

diff --git a/src/main/scala/shine/DPIA/DSL/ImperativePrimitives.scala b/src/main/scala/shine/DPIA/DSL/ImperativePrimitives.scala
@@ -5,7 +5,6 @@ import shine.DPIA.ImperativePrimitives._
 import shine.DPIA.Phrases.{Identifier, IfThenElse, Phrase}
 import shine.DPIA.Types._
 import shine.DPIA._
-import shine.OpenCL.ImperativePrimitives.Barrier
 
 object `new` {
   def apply(dt: DataType,

diff --git a/src/main/scala/shine/DPIA/DSL/package.scala b/src/main/scala/shine/DPIA/DSL/package.scala
@@ -1,14 +1,13 @@
 package shine.DPIA
 
 import shine.DPIA.Compilation.TranslationContext
-import shine.DPIA.FunctionalPrimitives.{DepIdx, Idx, IdxVec, AsIndex}
+import shine.DPIA.FunctionalPrimitives.{AsIndex, DepIdx, Idx, IdxVec}
 import shine.DPIA.ImperativePrimitives._
-import shine.DPIA.Phrases._
+import shine.DPIA.Phrases.{Operators, _}
 import shine.DPIA.Semantics.OperationalSemantics.{FloatData, IntData}
 import shine.DPIA.Types._
-import shine.DPIA.Phrases.Operators
 
-import scala.language.{implicitConversions, reflectiveCalls}
+import scala.language.implicitConversions
 
 package object DSL {
 

diff --git a/src/main/scala/shine/DPIA/FunctionalPrimitives/AbstractMap.scala b/src/main/scala/shine/DPIA/FunctionalPrimitives/AbstractMap.scala
@@ -1,7 +1,6 @@
 package shine.DPIA.FunctionalPrimitives
 
 import shine.DPIA.Compilation.TranslationContext
-import shine.DPIA.DSL._
 import shine.DPIA.Phrases._
 import shine.DPIA.Semantics.OperationalSemantics
 import shine.DPIA.Semantics.OperationalSemantics._

diff --git a/src/main/scala/shine/DPIA/FunctionalPrimitives/AbstractMapLoop.scala b/src/main/scala/shine/DPIA/FunctionalPrimitives/AbstractMapLoop.scala
@@ -1,10 +1,10 @@
 package shine.DPIA.FunctionalPrimitives
 
-import shine.DPIA.Compilation.{TranslationToImperative, TranslationContext}
-import shine.DPIA._
+import shine.DPIA.Compilation.{TranslationContext, TranslationToImperative}
 import shine.DPIA.DSL._
 import shine.DPIA.Phrases._
 import shine.DPIA.Types._
+import shine.DPIA._
 
 abstract class AbstractMapLoop(override val n: Nat,
                                override val dt1: DataType,

diff --git a/src/main/scala/shine/DPIA/FunctionalPrimitives/AbstractScan.scala b/src/main/scala/shine/DPIA/FunctionalPrimitives/AbstractScan.scala
@@ -3,7 +3,6 @@ package shine.DPIA.FunctionalPrimitives
 
 import shine.DPIA.Compilation.{TranslationContext, TranslationToImperative}
 import shine.DPIA.DSL._
-import shine.DPIA.IntermediatePrimitives.ScanSeqI
 import shine.DPIA.Phrases._
 import shine.DPIA.Semantics.OperationalSemantics._
 import shine.DPIA.Types._
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,8 @@ project @@
     target
     modules.xml
     .vscode
+    .metals
+    .bloop
     *.aux
     *.bbl
@@ Expand Down @@
+2 −0		.gitignore
+4 −4		build.sbt
+1 −1		lib/arithexpr
+0 −1		macros/src/main/scala/primitiveMacro/Primitive.scala
+1 −0		project/plugins.sbt
+1 −2		src/main/scala/rise/OpenCL/primitives.scala
+0 −2		src/main/scala/rise/OpenMP/DSL.scala
+0 −2		src/main/scala/rise/OpenMP/primitives.scala
+0 −6		src/main/scala/rise/core/DSL.scala
+0 −1		src/main/scala/rise/core/HighLevelConstructs.scala
+1 −1		src/main/scala/rise/core/dotPrinter.scala
+0 −1		src/main/scala/rise/core/primitives.scala
+1 −3		src/main/scala/rise/core/semantics/Data.scala
+21 −4		src/main/scala/rise/core/substitute.scala
+0 −1		src/main/scala/rise/core/typedLifting.scala
+0 −1		src/main/scala/rise/core/types/NatToData.scala
+1 −1		src/main/scala/rise/core/types/NatToNat.scala
+0 −1		src/test/scala/rise/core/structuralEquality.scala
+2 −2		src/test/scala/rise/core/typedDSL.scala
+3 −2		src/test/scala/test_util/package.scala
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.0-RC1")