From 16aa8c22b7d51c11e8d52530b219f7d896bbf6fc Mon Sep 17 00:00:00 2001 From: jasperalbers Date: Tue, 25 Jul 2023 16:16:13 +0200 Subject: [PATCH] remove redundant multi-area-model config and benchmarking files --- ...rea-model_3.yaml => multi-area-model.yaml} | 4 +- benchmarks/multi-area-model_2.yaml | 117 ------------------ .../multi-area-model_2_config_template.yaml | 47 ------- ... => multi-area-model_config_template.yaml} | 0 4 files changed, 2 insertions(+), 166 deletions(-) rename benchmarks/{multi-area-model_3.yaml => multi-area-model.yaml} (97%) delete mode 100644 benchmarks/multi-area-model_2.yaml delete mode 100644 config/templates/multi-area-model_2_config_template.yaml rename config/templates/{multi-area-model_3_config_template.yaml => multi-area-model_config_template.yaml} (100%) diff --git a/benchmarks/multi-area-model_3.yaml b/benchmarks/multi-area-model.yaml similarity index 97% rename from benchmarks/multi-area-model_3.yaml rename to benchmarks/multi-area-model.yaml index dc50606..d841d46 100644 --- a/benchmarks/multi-area-model_3.yaml +++ b/benchmarks/multi-area-model.yaml @@ -43,7 +43,7 @@ step: use: - from: user_config.yaml _: user_config - - from: multi-area-model_3_config.yaml + - from: multi-area-model_config.yaml _: file_paths,model_parameters,software_parameters - from: helpers.yaml _: slurm_build,run_build,files,sub_build_job @@ -57,7 +57,7 @@ step: - model_commands - from: user_config.yaml _: user_config - - from: multi-area-model_3_config.yaml + - from: multi-area-model_config.yaml _: file_paths,model_parameters,machine_parameters,software_parameters - from: helpers.yaml _: slurm_bench,run_benchmark,files,sub_bench_job,scaling_experiment diff --git a/benchmarks/multi-area-model_2.yaml b/benchmarks/multi-area-model_2.yaml deleted file mode 100644 index 1746da2..0000000 --- a/benchmarks/multi-area-model_2.yaml +++ /dev/null @@ -1,117 +0,0 @@ -# beNNch - Unified execution, collection, analysis and -# comparison of neural network simulation benchmarks. -# Copyright (C) 2021 Forschungszentrum Juelich GmbH, INM-6 - -# This program is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation, either version 3 of the License, or (at your option) any later -# version. -# This program is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more details. -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -# SPDX-License-Identifier: GPL-3.0-or-later - -include-path: - - ../helpers/ - - ../config/ - -# model-specific name and output path -name: MAM -outpath: ../../benchmark_results/MAM -# model configuration -parameterset: - name: model_commands - parameter: - - {name: run_file, type: string, _: $model_path/run_benchmark.py} - - {name: run_args, type: string, _: "${data_path} ${data_folder_hash} ${network_state}"} - - - name: optional_run_command - _: - data_folder_hash=`uuidgen` - - srun -n 1 --nodes 1 python ${model_path}/run_benchmark_createParams.py ${scale} ${num_vps} ${model_time_sim} ${scale_K} ${data_path} ${data_folder_hash} ${network_state} ${rng_seed} ${model_time_presim} ${record_spikes} - - - {name: log_path, type: string, _: "${data_path}/${data_folder_hash}/recordings"} - -step: -# build step - - name: build - export: true - use: - - from: user_config.yaml - _: user_config - - from: multi-area-model_2_config.yaml - _: file_paths,model_parameters,software_parameters - - from: helpers.yaml - _: slurm_build,run_build,files,sub_build_job - do: - - build --get --silent ${simulator} ${version} ${variant} ${suffix} && export DEP=`$submit_cmd --parsable $job_file` - -# benchmark step - - name: bench - depend: build - use: - - model_commands - - from: user_config.yaml - _: user_config - - from: multi-area-model_2_config.yaml - _: file_paths,model_parameters,machine_parameters,software_parameters - - from: helpers.yaml - _: slurm_bench,run_benchmark,files,sub_bench_job,scaling_experiment - do: - done_file: $ready_file - _: $submit_cmd --dependency=afterok:$$DEP $job_file -# analysis step -analyser: - name: analyse - use: - - from: helpers.yaml - _: timer_pattern - analyse: - step: bench - file: timer_data.txt - # result step -result: - name: result - use: analyse - table: - name: result_table - style: csv - sort: number - column: - - rng_seed - - num_nodes - - threads_per_task - - tasks_per_node - - model_time_sim - - wall_time_create - - wall_time_connect - - wall_time_sim - - wall_time_phase_collocate - - wall_time_phase_communicate - - wall_time_phase_deliver - - wall_time_phase_update - - wall_time_communicate_target_data - - wall_time_gather_spike_data - - wall_time_gather_target_data - - wall_time_communicate_prepare - - py_time_kernel_prepare - - py_time_network_local - - py_time_network_global - - py_time_simulate - - py_time_presimulate - - py_time_network_prepare - - py_time_create - - py_time_connect_area - - py_time_connect_cc - - py_time_connect - - base_memory - - network_memory - - init_memory - - total_memory - - num_connections - - local_spike_counter - - e_counter diff --git a/config/templates/multi-area-model_2_config_template.yaml b/config/templates/multi-area-model_2_config_template.yaml deleted file mode 100644 index f90d761..0000000 --- a/config/templates/multi-area-model_2_config_template.yaml +++ /dev/null @@ -1,47 +0,0 @@ -# beNNch - Unified execution, collection, analysis and -# comparison of neural network simulation benchmarks. -# Copyright (C) 2021 Forschungszentrum Juelich GmbH, INM-6 - -# This program is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation, either version 3 of the License, or (at your option) any later -# version. -# This program is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more details. -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -# SPDX-License-Identifier: GPL-3.0-or-later - -parameterset: - - name: file_paths - parameter: - - {name: base_path, type: string, _: BASE_PATH} # path where main repository is stored - - {name: model_path, type: string, _: MODEL_PATH} # path where the multi-area model is stored - - {name: data_path, type: string, _: DATA_PATH} # path where the simulation files are copied and the simulation output is stored - - - name: model_parameters - parameter: - - {name: model_name, type: string, _: "multi-area-model"} # for identifying the model, can be any unique string - - {name: network_state, type: string, _: "metastable"} # can be either "metastable" or "ground" - - {name: record_spikes, type: string, _: "False"} # whether to write spiking output to file, either True or False - - {name: model_time_sim, type: float, _: "1000."} # biological time to be simulated in ms - - {name: scale_N, type: float, _: "1."} # scaling the number of neurons, 1. -> original model - - {name: scale_K, type: float, _: "1."} # scaling the indegree, 1. -> original model - - {name: scaling_type, _: "strong"} # can be either weak or strong - - - name: machine_parameters - parameter: - - {name: num_nodes, type: int, _: "NUM_NODES"} # number of nodes, accepts a list in the format a,b,c,... for generating multiple runs - - {name: tasks_per_node, type: int, _: "TASKS_PER_NODE"} # number of (MPI) tasks per node, accepts a list in the format a,b,c,... for generating multiple runs - - {name: threads_per_task, type: int, _: "THREADS_PER_TASK"} # number of threads per task, accepts a list in the format a,b,c,... for generating multiple runs - - {name: walltime, type: string, _: "WALLTIME"} # wall time for the job in format hh:mm:ss - - {name: affinity, type: string, separator: ";", _: "--cpu-bind=verbose,threads --distribution=block:cyclic:fcyclic --threads-per-core=1"} # processor affinity/pinning - - name: software_parameters - parameter: - - {name: simulator, _: "nest-simulator"} # simulator to be installed (plan file must be provided) - - {name: version, _: "VERSION"} # simulator version - - {name: variant, _: "default"} # version variant - - {name: suffix, _: ""} # custom suffix for identification of simulator installation - - {name: buildermod, _: ""} # absolute path to Builder modules folder diff --git a/config/templates/multi-area-model_3_config_template.yaml b/config/templates/multi-area-model_config_template.yaml similarity index 100% rename from config/templates/multi-area-model_3_config_template.yaml rename to config/templates/multi-area-model_config_template.yaml