[Minor] Fix dag .json directory into one (#624)

Fixed dag .json directory into a single place - `./dag`, which is `default_value` of `JobConf.DAGDirectory`
snuspl · Dec 3, 2017 · 14ce517 · 14ce517
1 parent 065b0d1
commit 14ce517
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,12 +20,6 @@ sample_output*
 dag/*
 #
 # ----------------------------------------------------------------------
-# Configuration files
-# ----------------------------------------------------------------------
-config/*
-!config/default.json
-#
-# ----------------------------------------------------------------------
 # IDE settings
 # ----------------------------------------------------------------------
 .externalToolBuilders
@@ -59,4 +53,4 @@ MetricsData
 ml-data
 tang.conf
 *.sw[op]
-profile-*.json
+*.json
diff --git a/...common/src/main/java/edu/snu/onyx/runtime/common/plan/physical/PhysicalPlanGenerator.java b/...common/src/main/java/edu/snu/onyx/runtime/common/plan/physical/PhysicalPlanGenerator.java
@@ -61,7 +61,7 @@ public DAG<PhysicalStage, PhysicalStageEdge> apply(final DAG<IRVertex, IREdge> i
     // first, stage-partition the IR DAG.
     final DAG<Stage, StageEdge> dagOfStages = stagePartitionIrDAG(irDAG);
     // for debugging purposes.
-    dagOfStages.storeJSON(dagDirectory, "plan-logical", "logical execution plan");
+    dagOfStages.storeJSON("../" + dagDirectory, "plan-logical", "logical execution plan");
     // then create tasks and make it into a physical execution plan.
     return stagesIntoPlan(dagOfStages);
   }

diff --git a/tests/config/default.json b/tests/config/default.json
diff --git a/tests/dag/plan-logical.json b/tests/dag/plan-logical.json
diff --git a/tests/src/test/java/edu/snu/onyx/tests/compiler/CompilerTestUtil.java b/tests/src/test/java/edu/snu/onyx/tests/compiler/CompilerTestUtil.java
@@ -42,6 +42,7 @@
  */
 public final class CompilerTestUtil {
   public static final String rootDir = System.getProperty("user.dir");
+  public static final String dagDir = rootDir + "/../dag";
   public static final String padoPolicy = PadoPolicy.class.getCanonicalName();
   public static final String sailfishDisaggPolicy = SailfishDisaggPolicy.class.getCanonicalName();
   public static final String defaultPolicy = DefaultPolicy.class.getCanonicalName();
@@ -86,7 +87,7 @@ public static DAG<IRVertex, IREdge> compileALSInefficientDAG() throws Exception
     final String input = rootDir + "/../examples/src/main/resources/sample_input_als";
     final String numFeatures = "10";
     final String numIteration = "3";
-    final String dagDirectory = "./dag";
+    final String dagDirectory = dagDir;
 
     final ArgBuilder alsArgBuilder = new ArgBuilder()
         .addJobId(AlternatingLeastSquareInefficient.class.getSimpleName())

diff --git a/tests/src/test/java/edu/snu/onyx/tests/examples/beam/AlternatingLeastSquareITCase.java b/tests/src/test/java/edu/snu/onyx/tests/examples/beam/AlternatingLeastSquareITCase.java
@@ -34,7 +34,7 @@ public final class AlternatingLeastSquareITCase {
   private static final String input = CompilerTestUtil.rootDir + "/../examples/src/main/resources/sample_input_als";
   private static final String numFeatures = "10";
   private static final String numIteration = "3";
-  private static final String dagDirectory = "./dag";
+  private static final String dagDirectory = CompilerTestUtil.dagDir;
 
   public static ArgBuilder builder = new ArgBuilder()
       .addJobId(AlternatingLeastSquareITCase.class.getSimpleName())

diff --git a/tests/src/test/java/edu/snu/onyx/tests/examples/beam/BroadcastITCase.java b/tests/src/test/java/edu/snu/onyx/tests/examples/beam/BroadcastITCase.java
@@ -33,7 +33,7 @@ public final class BroadcastITCase {
   private static final int TIMEOUT = 120000;
   private static final String input = CompilerTestUtil.rootDir + "/../examples/src/main/resources/sample_input_mr";
   private static final String output = CompilerTestUtil.rootDir + "/../examples/src/main/resources/sample_output";
-  private static final String dagDirectory = "./dag";
+  private static final String dagDirectory = CompilerTestUtil.dagDir;
 
   private static ArgBuilder builder = new ArgBuilder()
       .addJobId(BroadcastITCase.class.getSimpleName())

diff --git a/tests/src/test/java/edu/snu/onyx/tests/examples/beam/MapReduceITCase.java b/tests/src/test/java/edu/snu/onyx/tests/examples/beam/MapReduceITCase.java
@@ -33,7 +33,7 @@ public final class MapReduceITCase {
   private static final int TIMEOUT = 60000;
   private static final String input = CompilerTestUtil.rootDir + "/../examples/src/main/resources/sample_input_mr";
   private static final String output = CompilerTestUtil.rootDir + "/../examples/src/main/resources/sample_output";
-  private static final String dagDirectory = "./dag";
+  private static final String dagDirectory = CompilerTestUtil.dagDir;
 
   public static ArgBuilder builder = new ArgBuilder()
       .addJobId(MapReduceITCase.class.getSimpleName())

diff --git a/...s/src/test/java/edu/snu/onyx/tests/examples/beam/MultinomialLogisticRegressionITCase.java b/...s/src/test/java/edu/snu/onyx/tests/examples/beam/MultinomialLogisticRegressionITCase.java
@@ -35,7 +35,7 @@ public final class MultinomialLogisticRegressionITCase {
   private static final String numFeatures = "100";
   private static final String numClasses = "5";
   private static final String numIteration = "3";
-  private static final String dagDirectory = "./dag";
+  private static final String dagDirectory = CompilerTestUtil.dagDir;
 
   public static ArgBuilder builder = new ArgBuilder()
       .addJobId(MultinomialLogisticRegressionITCase.class.getSimpleName())