Commit 86ce702e authored by Ambra Di Piano's avatar Ambra Di Piano
Browse files

rename back make_configuration

parent 8f5350e0

astrort/configure/slurmjobs.py

+3 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ from yaml import dump 
from os import system

from os.path import join, dirname, abspath



def make_simulator_conf(jobname_conf, configuration, node_number):

def make_configuration(jobname_conf, configuration, node_number):

    # simulator

    configuration['simulator']['seed'] = node_number*configuration['simulator']['samples'] + 1

    # logging
@@ -44,7 +44,7 @@ def make_simulator_sbatch(jobname, configuration, node_number): 
    jobname_sh = join(output, f"{jobname}_simulator.sh")

    jobname_log = join(output, f"{jobname}_simulator.slurm")

    jobname_conf = join(output, f"{jobname}_simulator.yml")

    make_simulator_conf(jobname_conf, configuration, node_number, mode='simulator')

    make_configuration(jobname_conf, configuration, node_number, mode='simulator')

    make_sh(jobname, configuration['slurm'], jobname_conf, jobname_sh, jobname_log)

    system(f"sbatch {jobname_sh}")
@@ -56,7 +56,7 @@ def make_mapper_sbatch(jobname, configuration, node_number): 
    jobname_sh = join(output, f"{jobname}_simulator.sh")

    jobname_log = join(output, f"{jobname}_simulator.slurm")

    jobname_conf = join(output, f"{jobname}_simulator.yml")

    make_simulator_conf(jobname_conf, configuration, node_number, mode='simulator')

    make_configuration(jobname_conf, configuration, node_number, mode='simulator')

    make_sh(jobname, configuration['slurm'], jobname_conf, jobname_sh, jobname_log)

    system(f"sbatch {jobname_sh}")

    return
 
 No newline at end of file

astrort/testing/test_configure/test_slurmjobs.py

+3 −3
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ import pytest 
from shutil import rmtree

from os import listdir, makedirs

from os.path import isfile, join

from astrort.configure.slurmjobs import make_simulator_conf, make_sh, make_simulator_sbatch

from astrort.configure.slurmjobs import make_configuration, make_sh, make_simulator_sbatch

from astrort.utils.wrap import load_yaml_conf



@pytest.mark.test_conf_file

def test_make_simulator_conf(test_conf_file):

def test_make_configuration(test_conf_file):



    # clean output

    conf = load_yaml_conf(test_conf_file)
@@ -26,7 +26,7 @@ def test_make_simulator_conf(test_conf_file): 
        node_number += 1

        jobname = f"{conf['slurm']['name']}_{node_number}"       

        jobname_conf = join(conf['simulator']['output'], f"job_{jobname}.yml")

        make_simulator_conf(jobname_conf, conf, node_number)

        make_configuration(jobname_conf, conf, node_number)

    

    # check output

    expected_configurations = conf['slurm']['nodes']