Skip to content
Snippets Groups Projects
Commit 591ae0f3 authored by Jan Kožusznik's avatar Jan Kožusznik
Browse files

feature: remove support for statistics creation

parent 1918f7a7
No related branches found
No related tags found
No related merge requests found
package cz.it4i.fiji.haas_spim_benchmark.core; package cz.it4i.fiji.haas_spim_benchmark.core;
import static cz.it4i.fiji.haas_spim_benchmark.core.Constants.BENCHMARK_RESULT_FILE;
import static cz.it4i.fiji.haas_spim_benchmark.core.Constants.BENCHMARK_TASK_NAME_MAP; import static cz.it4i.fiji.haas_spim_benchmark.core.Constants.BENCHMARK_TASK_NAME_MAP;
import static cz.it4i.fiji.haas_spim_benchmark.core.Constants.FUSION_SWITCH; import static cz.it4i.fiji.haas_spim_benchmark.core.Constants.FUSION_SWITCH;
import static cz.it4i.fiji.haas_spim_benchmark.core.Constants.HAAS_UPDATE_TIMEOUT; import static cz.it4i.fiji.haas_spim_benchmark.core.Constants.HAAS_UPDATE_TIMEOUT;
...@@ -151,13 +150,6 @@ public class BenchmarkJobManager implements Closeable { ...@@ -151,13 +150,6 @@ public class BenchmarkJobManager implements Closeable {
return job.canBeDownloaded(); return job.canBeDownloaded();
} }
public void downloadStatistics(Progress progress) throws IOException {
job.download(BenchmarkJobManager.downloadStatistics(), new ProgressNotifierAdapter(progress));
Path resultFile = job.getDirectory().resolve(BENCHMARK_RESULT_FILE);
if (resultFile != null)
BenchmarkJobManager.formatResultFile(resultFile);
}
public long getId() { public long getId() {
return job.getId(); return job.getId();
} }
...@@ -672,17 +664,6 @@ public class BenchmarkJobManager implements Closeable { ...@@ -672,17 +664,6 @@ public class BenchmarkJobManager implements Closeable {
}; };
} }
private static Predicate<String> downloadStatistics() {
return name -> {
Path path = getPathSafely(name);
if (path == null)
return false;
String fileName = path.getFileName().toString();
return fileName.equals(Constants.BENCHMARK_RESULT_FILE);
};
}
private static Predicate<String> downloadFailedData() { private static Predicate<String> downloadFailedData() {
return name -> { return name -> {
Path path = getPathSafely(name); Path path = getPathSafely(name);
......
...@@ -9,7 +9,7 @@ public interface Constants { ...@@ -9,7 +9,7 @@ public interface Constants {
short UI_TO_HAAS_FREQUENCY_UPDATE_RATIO = 10; short UI_TO_HAAS_FREQUENCY_UPDATE_RATIO = 10;
String HAAS_JOB_NAME = "HaaSSPIMBenchmark"; String HAAS_JOB_NAME = "HaaSSPIMBenchmark";
int HAAS_CLUSTER_NODE_TYPE = 6; int HAAS_CLUSTER_NODE_TYPE = 6;
int HAAS_TEMPLATE_ID = 4; int HAAS_TEMPLATE_ID = 2;
String HAAS_PROJECT_ID = "OPEN-12-20"; String HAAS_PROJECT_ID = "OPEN-12-20";
int HAAS_TIMEOUT = 9600; //Walltime in seconds int HAAS_TIMEOUT = 9600; //Walltime in seconds
...@@ -19,7 +19,6 @@ public interface Constants { ...@@ -19,7 +19,6 @@ public interface Constants {
String SPIM_OUTPUT_FILENAME_PATTERN = "spim.outputFilenamePattern"; String SPIM_OUTPUT_FILENAME_PATTERN = "spim.outputFilenamePattern";
String CONFIG_YAML = "config.yaml"; String CONFIG_YAML = "config.yaml";
String BENCHMARK_RESULT_FILE = "benchmark_result.csv";
String HDF5_XML_FILENAME = "hdf5_xml_filename"; String HDF5_XML_FILENAME = "hdf5_xml_filename";
String FUSION_SWITCH = "fusion_switch"; String FUSION_SWITCH = "fusion_switch";
......
...@@ -163,10 +163,6 @@ public class BenchmarkSPIMControl extends BorderPane implements CloseableControl ...@@ -163,10 +163,6 @@ public class BenchmarkSPIMControl extends BorderPane implements CloseableControl
.contains(j.getState()) && j.canBeDownloaded()), .contains(j.getState()) && j.canBeDownloaded()),
job -> job != null && job.getDownloadProgress().isWorking()); job -> job != null && job.getDownloadProgress().isWorking());
menu.addItem("Download statistics",
job -> executeWSCallAsync("Downloading data", p -> job.getValue().downloadStatistics(p)),
job -> JavaFXRoutines.notNullValue(job, j -> j.getState() == JobState.Finished));
menu.addItem("Explore errors", job -> job.getValue().exploreErrors(), menu.addItem("Explore errors", job -> job.getValue().exploreErrors(),
job -> JavaFXRoutines.notNullValue(job, j -> j.getState().equals(JobState.Failed))); job -> JavaFXRoutines.notNullValue(job, j -> j.getState().equals(JobState.Failed)));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment