diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java index 25da9cf239c7734ac588d5908df20239d248103d..26c2f77126cdf4fc248dfc3b937ef27bd13c20cd 100644 --- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java +++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java @@ -1,6 +1,5 @@ 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.FUSION_SWITCH; import static cz.it4i.fiji.haas_spim_benchmark.core.Constants.HAAS_UPDATE_TIMEOUT; @@ -151,13 +150,6 @@ public class BenchmarkJobManager implements Closeable { 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() { return job.getId(); } @@ -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() { return name -> { Path path = getPathSafely(name); diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java index 9343060608eb3fa0247eb5434de99c22e9adab79..75af41aa70f0508fa426b89efe48cf0127f5a784 100644 --- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java +++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java @@ -9,7 +9,7 @@ public interface Constants { short UI_TO_HAAS_FREQUENCY_UPDATE_RATIO = 10; String HAAS_JOB_NAME = "HaaSSPIMBenchmark"; int HAAS_CLUSTER_NODE_TYPE = 6; - int HAAS_TEMPLATE_ID = 4; + int HAAS_TEMPLATE_ID = 2; String HAAS_PROJECT_ID = "OPEN-12-20"; int HAAS_TIMEOUT = 9600; //Walltime in seconds @@ -19,7 +19,6 @@ public interface Constants { String SPIM_OUTPUT_FILENAME_PATTERN = "spim.outputFilenamePattern"; String CONFIG_YAML = "config.yaml"; - String BENCHMARK_RESULT_FILE = "benchmark_result.csv"; String HDF5_XML_FILENAME = "hdf5_xml_filename"; String FUSION_SWITCH = "fusion_switch"; diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java index c7b00f726ec881853fcf1c7d7ecd2ee0c1d38306..949e68fc749be194ca1239e71954a7f245d2b2f9 100644 --- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java +++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java @@ -163,10 +163,6 @@ public class BenchmarkSPIMControl extends BorderPane implements CloseableControl .contains(j.getState()) && j.canBeDownloaded()), 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(), job -> JavaFXRoutines.notNullValue(job, j -> j.getState().equals(JobState.Failed)));