Merge pull request #266 from cmssnu/ys-update-REEF-version

Update pom to use REEF-0.11.0-incubating
snuspl · Jun 22, 2015 · 1c31c5c · 1c31c5c
2 parents 69f247f + 9577f59
commit 1c31c5c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/reef-inmemory/pom.xml b/reef-inmemory/pom.xml
@@ -18,7 +18,7 @@
         <tests.reuseForks>true</tests.reuseForks>
         <tests.argLine></tests.argLine>
         <hadoop.version>2.4.0</hadoop.version>
-        <reef.version>0.10.0-incubating</reef.version>
+        <reef.version>0.11.0-incubating</reef.version>
         <thrift.version>0.9.1</thrift.version>
         <junit.version>4.11</junit.version>
         <avro.version>1.7.6</avro.version>

diff --git a/reef-inmemory/src/main/java/org/apache/reef/inmemory/Launch.java b/reef-inmemory/src/main/java/org/apache/reef/inmemory/Launch.java
@@ -57,9 +57,9 @@ public class Launch
   public static final class Local implements Name<Boolean> {
   }
 
-  @NamedParameter(doc = "Number of threads to support for local runtime",
-    short_name = "local_threads", default_value = "2")
-  public static final class LocalThreads implements Name<Integer> {
+  @NamedParameter(doc = "Number of maximum evaluators that can be created in the local runtime",
+    short_name = "local_max_num_eval", default_value = "2")
+  public static final class LocalMaxNumEval implements Name<Integer> {
   }
 
   // See: JVMHeapSlack class
@@ -93,7 +93,7 @@ public static Configuration parseCommandLine(final String[] args) throws IOExcep
       Tang.Factory.getTang().newConfigurationBuilder();
     final CommandLine cl = new CommandLine(confBuilder);
     cl.registerShortNameOfClass(Local.class);
-    cl.registerShortNameOfClass(LocalThreads.class);
+    cl.registerShortNameOfClass(LocalMaxNumEval.class);
     cl.registerShortNameOfClass(ReefJvmHeapSlack.class);
     cl.registerShortNameOfClass(ReplicationRulesPath.class);
     cl.registerShortNameOfClass(MetaServerParameters.Port.class);
@@ -198,9 +198,9 @@ public static Configuration getRuntimeConfiguration(final Configuration clConf,
     final boolean isLocal = chooseNamedInstance(Local.class, clInjector, fileInjector);
     final Configuration runtimeConfig;
     if(isLocal) {
-      final int localThreads = chooseNamedInstance(LocalThreads.class, clInjector, fileInjector);
+      final int localMaxNumEvals = chooseNamedInstance(LocalMaxNumEval.class, clInjector, fileInjector);
       runtimeConfig = LocalRuntimeConfiguration.CONF
-              .set(LocalRuntimeConfiguration.NUMBER_OF_THREADS, localThreads)
+              .set(LocalRuntimeConfiguration.MAX_NUMBER_OF_EVALUATORS, localMaxNumEvals)
               .build();
     } else {
       final double jvmHeapSlack = chooseNamedInstance(ReefJvmHeapSlack.class, clInjector, fileInjector);