Commit f7ae8ce4 authored by caminha's avatar caminha
Browse files

Merge branch 'ndnSIM-ns-3.29' of...

Merge branch 'ndnSIM-ns-3.29' of icube-forge.unistra.fr:rcaminha/nanoas-proof-of-work into ndnSIM-ns-3.29
parents 304309e8 63a2a964
......@@ -16,4 +16,4 @@ NAME="dsubs.$SLURM_JOB_ID"
[[ -v SLURM_ARRAY_JOB_ID ]] && NAME="$NAME.aid$SLURM_ARRAY_JOB_ID"
[[ -v SLURM_RESTART_COUNT ]] && NAME=$NAME.r$SLURM_RESTART_COUNT
python3 scripts/run_multiple.py -g lcn-simulations --nruns=$NRUNS random-domain-streams $NAME --appScenario=DirectSubscriptions --nConsumers='100 175 250 325 400 475 550'
python3 scripts/run_multiple.py -g lcn-simulations --nruns=$NRUNS $NAME random-domain-streams --appScenario=DirectSubscriptions --nConsumers='100 175 250 325 400 475 550'
......@@ -45,7 +45,7 @@ parser.add_argument('sim_params', metavar='Others', type=str, nargs=argparse.REM
params = parser.parse_args()
outDir = path.join(params.experiment_folder, 'experiments', params.name)
outDir = path.join('experiments', params.experiment_folder, params.name)
logger = nas_utils.setup_logger("RunMultiple", params.loglevel, params.log_to_file, outDir)
if not params.slurm:
chdir(path.join(path.dirname(path.realpath(__file__)), '..'))
......@@ -70,8 +70,8 @@ progressCounter = Value('d', 0.0)
if params.singlecpu:
runners = Pool(1, initializer=nas_utils.runSimulationWorkerInitializer, initargs=(progressCounter,))
else:
runners = Pool(initializer=nas_utils.runSimulationWorkerInitializer, initargs=(progressCounter,))
#runners = Pool(int(mp.cpu_count()/2), initializer=nas_utils.runSimulationWorkerInitializer, initargs=(progressCounter,))
#runners = Pool(initializer=nas_utils.runSimulationWorkerInitializer, initargs=(progressCounter,))
runners = Pool(int(mp.cpu_count()/2), initializer=nas_utils.runSimulationWorkerInitializer, initargs=(progressCounter,))
params.expanded_sim_params = nas_utils.expand_sim_parameters(params.sim_params)
totalRuns = len(params.expanded_sim_params) * params.runs_per_scenario
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment