diff --git a/etc/examples/6-enhanced-output/config.json b/etc/examples/6-enhanced-output/config.json
index a16d67dd91b4fd9b4ecc3832161e05997292d22f..b42a3f7334446ee973c7cd64f994e9df7ae110b8 100644
--- a/etc/examples/6-enhanced-output/config.json
+++ b/etc/examples/6-enhanced-output/config.json
@@ -1,5 +1,5 @@
{
"output": {
- "curveTypes": ["TOTAL", "GMM"]
+ "curveTypes": ["TOTAL", "GMM", "SOURCE"]
}
}
diff --git a/src/org/opensha2/calc/Calcs.java b/src/org/opensha2/calc/Calcs.java
index df2a653888caa771b53751efe1cedd3292187e28..7ddecbd88850f5e23ef8c136b2c65dd88d31b3c9 100644
--- a/src/org/opensha2/calc/Calcs.java
+++ b/src/org/opensha2/calc/Calcs.java
@@ -107,7 +107,7 @@ public class Calcs {
/**
* Compute probabilistic seismic hazard, possibly using an {@link Optional}
- * {@link Executor}. If no {@code Executor} is supplied, the calculation
+ * {@link Executor}. If no executor is supplied, the calculation
* will run on the current thread.
*
* @param model to use
diff --git a/src/org/opensha2/calc/ThreadCount.java b/src/org/opensha2/calc/ThreadCount.java
index cbae631351e8fee64532d85a9339b425e89788c0..f1dc3a94bdbb19a8170517b61c7ba984fec93207 100644
--- a/src/org/opensha2/calc/ThreadCount.java
+++ b/src/org/opensha2/calc/ThreadCount.java
@@ -2,6 +2,8 @@ package org.opensha2.calc;
import java.util.concurrent.ExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+
/**
* The number of threads with which to intialize thread pools. Values reference
* the number of non-competing threads that could be supported on a particular
@@ -12,28 +14,57 @@ import java.util.concurrent.ExecutorService;
public enum ThreadCount {
/**
- * A single thread. Use of a single thread will generally prevent an
- * {@link ExecutorService} from being used, and all calculations will be run
+ * A single thread. This identifier will typically cause a program to
+ * either use Guava's {@link MoreExecutors#directExecutor()} or skip using
+ * an {@link ExecutorService} altogether, and all calculations will be run
* on the thread from which a program was called. This is useful for
* debugging.
*/
- ONE,
+ ONE {
+ @Override
+ public int value() {
+ return 1;
+ }
+ },
/**
* Half of {@code ALL}.
*/
- HALF,
+ HALF {
+ @Override
+ public int value() {
+ return Math.max(1, CORES / 2);
+ }
+ },
/**
- * Two less than {@code ALL}. So as to not commandeer all available
+ * Two less than {@code ALL}, so as to not commandeer all available
* resources.
*/
- N_MINUS_2,
+ N_MINUS_2 {
+ @Override
+ public int value() {
+ return Math.max(1, CORES - 2);
+ }
+ },
/**
* All possible non-competing threads. The number of threads will equal the
* number of available processors.
*/
- ALL;
+ ALL {
+ @Override
+ public int value() {
+ return CORES;
+ }
+ };
+
+ private static final int CORES = Runtime.getRuntime().availableProcessors();
+
+ /**
+ * The number of threads relative to the number of available processors on a
+ * system. The value returned will never be less than one.
+ */
+ public abstract int value();
}
diff --git a/src/org/opensha2/programs/DeaggCalc.java b/src/org/opensha2/programs/DeaggCalc.java
index 2e07692f15180a5b32f0f5d9f3ec49f43df1989e..d9a9d37df8ae57460afc871bb61d471e4606abc9 100644
--- a/src/org/opensha2/programs/DeaggCalc.java
+++ b/src/org/opensha2/programs/DeaggCalc.java
@@ -57,8 +57,9 @@ public class DeaggCalc {
/**
* Perform a hazard deaggregation at a {@code site} for a {@code model},
* {@code config}, and return period. If an {@code executor} is supplied, it
- * will be used to distribute hazard calculation tasks; otherwise, one will
- * be created.
+ * will be used to distribute tasks; otherwise, the calculation will run on
+ * the current thread. Be sure to shutdown any supplied executor after a
+ * calculation completes.
*
* <p><b>Note:</b> any model initialization settings in {@code config} will
* be ignored as the supplied model will already have been initialized.</p>
@@ -76,12 +77,8 @@ public class DeaggCalc {
Site site,
double returnPeriod,
Optional<Executor> executor) {
-
- Optional<Executor> execLocal = executor.or(Optional.of(createExecutor()));
-
try {
- Hazard result = Calcs.hazard(model, config, site, execLocal);
- if (!executor.isPresent()) ((ExecutorService) executor).shutdown();
+ Hazard result = Calcs.hazard(model, config, site, executor);
return Calcs.deaggregation(result, returnPeriod);
} catch (ExecutionException | InterruptedException e) {
Throwables.propagate(e);
@@ -89,8 +86,4 @@ public class DeaggCalc {
}
}
- private static ExecutorService createExecutor() {
- return newFixedThreadPool(getRuntime().availableProcessors());
- }
-
}
diff --git a/src/org/opensha2/programs/HazardCalc.java b/src/org/opensha2/programs/HazardCalc.java
index eb05b0344ea07dae40f62e7afce3803a8892973e..aff44addd63bb402adf03d1923b34ef203b2a758 100644
--- a/src/org/opensha2/programs/HazardCalc.java
+++ b/src/org/opensha2/programs/HazardCalc.java
@@ -1,6 +1,5 @@
package org.opensha2.programs;
-import static java.lang.Runtime.getRuntime;
import static java.nio.file.StandardOpenOption.APPEND;
import static java.util.concurrent.Executors.newFixedThreadPool;
import static org.opensha2.util.TextUtils.NEWLINE;
@@ -24,11 +23,11 @@ import org.opensha2.calc.Hazard;
import org.opensha2.calc.Results;
import org.opensha2.calc.Site;
import org.opensha2.calc.Sites;
+import org.opensha2.calc.ThreadCount;
import org.opensha2.eq.model.HazardModel;
import org.opensha2.util.Logging;
import com.google.common.base.Optional;
-import com.google.common.base.StandardSystemProperty;
import com.google.common.base.Stopwatch;
import com.google.common.base.Throwables;
@@ -134,7 +133,8 @@ public class HazardCalc {
} catch (Exception e) {
throw new IllegalArgumentException(
"'sites' [" + arg + "] must either be a 3 to 7 argument, comma-delimited string " +
- "or specify a path to a *.csv or *.geojson file", e);
+ "or specify a path to a *.csv or *.geojson file",
+ e);
}
}
@@ -150,10 +150,15 @@ public class HazardCalc {
Iterable<Site> sites,
Logger log) throws IOException {
- ExecutorService execSvc = createExecutor();
- int threadCount = ((ThreadPoolExecutor) execSvc).getCorePoolSize();
- log.info("Threads: " + threadCount);
- Optional<Executor> executor = Optional.<Executor> of(execSvc);
+ ExecutorService execSvc = null;
+ ThreadCount threadCount = config.performance.threadCount;
+ if (threadCount != ThreadCount.ONE) {
+ execSvc = newFixedThreadPool(threadCount.value());
+ log.info("Threads: " + ((ThreadPoolExecutor) execSvc).getCorePoolSize());
+ } else {
+ log.info("Threads: Running on calling thread");
+ }
+ Optional<Executor> executor = Optional.<Executor> fromNullable(execSvc);
log.info(PROGRAM + ": calculating ...");
Stopwatch batchWatch = Stopwatch.createStarted();
@@ -184,13 +189,17 @@ public class HazardCalc {
}
log.info(PROGRAM + ": " + count + " complete " + totalWatch);
- execSvc.shutdown();
+ if (threadCount != ThreadCount.ONE) {
+ execSvc.shutdown();
+ }
}
/**
* Compute hazard curves at a {@code site} for a {@code model} and
* {@code config}. If an {@code executor} is supplied, it will be used to
- * distribute tasks; otherwise, one will be created.
+ * distribute tasks; otherwise, the calculation will run on the current
+ * thread. Be sure to shutdown any supplied executor after a calculation
+ * completes.
*
* <p><b>Note:</b> any model initialization settings in {@code config} will
* be ignored as the supplied model will already have been initialized.</p>
@@ -206,28 +215,14 @@ public class HazardCalc {
CalcConfig config,
Site site,
Optional<Executor> executor) {
-
- // TODO not sure why we're mandating an executor here.
- // legacy from refactoring?
- Optional<Executor> execLocal = executor.or(Optional.of(createExecutor()));
-
try {
- Hazard result = Calcs.hazard(model, config, site, execLocal);
- // Shut down the locally created executor if none was supplied
- if (!executor.isPresent()) {
- ((ExecutorService) execLocal.get()).shutdown();
- }
- return result;
+ return Calcs.hazard(model, config, site, executor);
} catch (ExecutionException | InterruptedException e) {
Throwables.propagate(e);
return null;
}
}
-
- private static ExecutorService createExecutor() {
- return newFixedThreadPool(getRuntime().availableProcessors());
- }
-
+
private static final String PROGRAM = HazardCalc.class.getSimpleName();
private static final String USAGE_COMMAND =
"java -cp nshmp-haz.jar org.opensha2.programs.HazardCalc model sites [config]";