Commit 50387048 authored by jay's avatar jay
Browse files

Updates for comments

parent a686cf30

autocnet/spatial/overlap.py

+0 −13
Original line number Diff line number Diff line
@@ -102,19 +102,6 @@ def cluster_place_points_in_overlaps(size_threshold=0.0007, 
               'walltime' : walltime,

               'cam_type': cam_type}

        rqueue.rpush(queuename, json.dumps(msg, cls=JsonEncoder))

        if (i > 0) and i % 10000 == 0:

            job_counter = i - past + 1

            past = i

            # Submit the jobs

            submitter = Slurm('acn_overlaps',

                        mem_per_cpu=config['cluster']['processing_memory'],

                        time=walltime,

                        partition=config['cluster']['queue'],

                        output=config['cluster']['cluster_log_dir']+'/autocnet.place_points-%j')

            submitter.submit(array='1-{}'.format(job_counter))



    job_counter = i - past + 1



    # Submit the jobs

    submitter = Slurm('acn_overlaps',

                 mem_per_cpu=config['cluster']['processing_memory'],

config_parser.py

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ def parse_config(name='autocnet_config'): 
    

    filepath = os.environ[name]

    if not os.path.exists(filepath):

        return {}

        raise OSError(f'Specified config file does not exist. Currently set to {filepath}.')



    # Not wrapping in a try/except so that we get the 

    # yaml library to raise any issues on parsing
@@ -17,7 +17,7 @@ def parse_config(name='autocnet_config'): 
    spatial = config.get('spatial', None)

    if spatial == None:

        raise KeyError('Config is missing the root "spatial" key.')

    for k in ['latitudinal_srid']:

    for k in ['latitudinal_srid', 'dem']:

        if k not in spatial.keys():

            raise KeyError(f'Missing key: {k} in the spatial section of the config.')