From 902ae4ca1bc0eb47589ddb9d5150ef988a8bff24 Mon Sep 17 00:00:00 2001 From: Francis Russell Date: Mon, 9 Apr 2012 22:03:57 +0100 Subject: [PATCH] Switch back to "fftbox" not taking an index parameter. --- examples/test.ofl | 2 +- src/ofc/generators/onetep/SpatialRestriction.scala | 2 +- src/ofc/generators/onetep/TreeBuilder.scala | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/test.ofl b/examples/test.ofl index 72267b7..a923148 100644 --- a/examples/test.ofl +++ b/examples/test.ofl @@ -4,7 +4,7 @@ FunctionSet ket Index beta # Computation -kinet = fftbox(beta, ket[beta]) +kinet = fftbox(ket[beta]) # Implementation specific target ONETEP diff --git a/src/ofc/generators/onetep/SpatialRestriction.scala b/src/ofc/generators/onetep/SpatialRestriction.scala index bb54d40..27903a6 100644 --- a/src/ofc/generators/onetep/SpatialRestriction.scala +++ b/src/ofc/generators/onetep/SpatialRestriction.scala @@ -8,7 +8,7 @@ object SpatialRestriction { private val ppdWidth = for(dim <- 0 to 2) yield CellInfo.public % CellInfo.ppdWidth(dim) } -class SpatialRestriction(op: IterationSpace, function: BindingIndex) extends IterationSpace { +class SpatialRestriction(op: IterationSpace) extends IterationSpace { def getOperands = List(op) def getDiscreteIndices = Nil def getSuffixFragment = new NullStatement diff --git a/src/ofc/generators/onetep/TreeBuilder.scala b/src/ofc/generators/onetep/TreeBuilder.scala index 643ab76..777cb6d 100644 --- a/src/ofc/generators/onetep/TreeBuilder.scala +++ b/src/ofc/generators/onetep/TreeBuilder.scala @@ -96,8 +96,8 @@ class TreeBuilder(dictionary : Dictionary) { term match { case (t: IndexedIdentifier) => buildIndexedSpace(t) - case Operator(Identifier("fftbox"), List(indexID, op)) => - new SpatialRestriction(buildExpression(op), buildIndex(indexID)) + case Operator(Identifier("fftbox"), List(op)) => + new SpatialRestriction(buildExpression(op)) /* case ScalarConstant(s) => new Scalar(s) -- 2.47.3