[incubator-nemo] branch reshaping updated: all compiles

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

johnyangk pushed a commit to branch reshaping
in repository https://gitbox.apache.org/repos/asf/incubator-nemo.git


The following commit(s) were added to refs/heads/reshaping by this push:
     new 9cba450  all compiles
9cba450 is described below

commit 9cba450ea12b57601b43c6f8061eb2dcd93ccbc4
Author: John Yang <jo...@apache.org>
AuthorDate: Tue Jan 22 14:44:58 2019 +0900

    all compiles
---
 common/src/main/java/org/apache/nemo/common/ir/IRDAG.java           | 4 ++++
 .../nemo/compiler/frontend/beam/transform/DoFnTransformTest.java    | 6 +++---
 .../optimizer/pass/compiletime/reshaping/LoopFusionPassTest.java    | 5 ++---
 .../org/apache/nemo/runtime/common/plan/PhysicalPlanGenerator.java  | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/common/src/main/java/org/apache/nemo/common/ir/IRDAG.java b/common/src/main/java/org/apache/nemo/common/ir/IRDAG.java
index 9a31d3f..025ec51 100644
--- a/common/src/main/java/org/apache/nemo/common/ir/IRDAG.java
+++ b/common/src/main/java/org/apache/nemo/common/ir/IRDAG.java
@@ -107,6 +107,10 @@ public class IRDAG {
     return dag.getChildren(vertexId);
   }
 
+  public DAG<IRVertex, IREdge> getUnderlyingDAG() {
+    return dag;
+  }
+
   ////////////////////////////////////////////////// Reshaping methods.
 
   /**
diff --git a/compiler/test/src/test/java/org/apache/nemo/compiler/frontend/beam/transform/DoFnTransformTest.java b/compiler/test/src/test/java/org/apache/nemo/compiler/frontend/beam/transform/DoFnTransformTest.java
index ca21190..fa1169c 100644
--- a/compiler/test/src/test/java/org/apache/nemo/compiler/frontend/beam/transform/DoFnTransformTest.java
+++ b/compiler/test/src/test/java/org/apache/nemo/compiler/frontend/beam/transform/DoFnTransformTest.java
@@ -59,9 +59,9 @@ public final class DoFnTransformTest {
 
   @Before
   public void setUp() {
-    Pipeline.create().optimize(Create.of("1"));
-    view1 = Pipeline.create().optimize(Create.of("1")).optimize(View.asIterable());
-    view2 = Pipeline.create().optimize(Create.of("2")).optimize(View.asIterable());
+    Pipeline.create().apply(Create.of("1"));
+    view1 = Pipeline.create().apply(Create.of("1")).apply(View.asIterable());
+    view2 = Pipeline.create().apply(Create.of("2")).apply(View.asIterable());
   }
 
   @Test
diff --git a/compiler/test/src/test/java/org/apache/nemo/compiler/optimizer/pass/compiletime/reshaping/LoopFusionPassTest.java b/compiler/test/src/test/java/org/apache/nemo/compiler/optimizer/pass/compiletime/reshaping/LoopFusionPassTest.java
index f7ead28..96c0c74 100644
--- a/compiler/test/src/test/java/org/apache/nemo/compiler/optimizer/pass/compiletime/reshaping/LoopFusionPassTest.java
+++ b/compiler/test/src/test/java/org/apache/nemo/compiler/optimizer/pass/compiletime/reshaping/LoopFusionPassTest.java
@@ -19,7 +19,6 @@
 package org.apache.nemo.compiler.optimizer.pass.compiletime.reshaping;
 
 import org.apache.nemo.client.JobLauncher;
-import org.apache.nemo.common.dag.DAG;
 import org.apache.nemo.common.dag.DAGBuilder;
 import org.apache.nemo.common.ir.IRDAG;
 import org.apache.nemo.common.ir.edge.IREdge;
@@ -63,10 +62,10 @@ public class LoopFusionPassTest {
     groupedDAG = new LoopExtractionPass().optimize(originalALSDAG);
 
     groupedDAG.topologicalDo(v -> {
-      dagToBeFusedBuilder.addVertex(v, groupedDAG);
+      dagToBeFusedBuilder.addVertex(v, groupedDAG.getUnderlyingDAG());
       groupedDAG.getIncomingEdgesOf(v).forEach(dagToBeFusedBuilder::connectVertices);
 
-      dagNotToBeFusedBuilder.addVertex(v, groupedDAG);
+      dagNotToBeFusedBuilder.addVertex(v, groupedDAG.getUnderlyingDAG());
       groupedDAG.getIncomingEdgesOf(v).forEach(dagNotToBeFusedBuilder::connectVertices);
     });
     final Optional<LoopVertex> loopInDAG = groupedDAG.getTopologicalSort().stream()
diff --git a/runtime/common/src/main/java/org/apache/nemo/runtime/common/plan/PhysicalPlanGenerator.java b/runtime/common/src/main/java/org/apache/nemo/runtime/common/plan/PhysicalPlanGenerator.java
index 02f68ab..d22ed21 100644
--- a/runtime/common/src/main/java/org/apache/nemo/runtime/common/plan/PhysicalPlanGenerator.java
+++ b/runtime/common/src/main/java/org/apache/nemo/runtime/common/plan/PhysicalPlanGenerator.java
@@ -47,7 +47,7 @@ import java.util.function.Function;
 /**
  * A function that converts an IR DAG to physical DAG.
  */
-public final class PhysicalPlanGenerator implements Function<DAG<IRVertex, IREdge>, DAG<Stage, StageEdge>> {
+public final class PhysicalPlanGenerator implements Function<IRDAG, DAG<Stage, StageEdge>> {
   private final String dagDirectory;
   private final StagePartitioner stagePartitioner;
   private static final Logger LOG = LoggerFactory.getLogger(PhysicalPlanGenerator.class.getName());