Commit 4ccf6bbc authored by jay's avatar jay
Browse files

Add chunksize to cluster jobs

parent ed6e45f3

autocnet/matcher/subpixel.py

+3 −2
Original line number Diff line number Diff line
@@ -496,7 +496,8 @@ def cluster_subpixel_register_points(iterative_phase_kwargs={'size': 71}, 
                                     subpixel_template_kwargs={'image_size':(121,121)},

                                     cost_func=lambda x,y: 1/x**2 * y,

                                     threshold=0.005,

                                     walltime='00:10:00'):

                                     walltime='00:10:00',

                                     chunksize=1000):

    """

    Distributed subpixel registration of all of the points in a given DB table.
@@ -549,5 +550,5 @@ def cluster_subpixel_register_points(iterative_phase_kwargs={'size': 71}, 
                 time=walltime,

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

                 output=config['cluster']['cluster_log_dir']+'/slurm-%A_%a.out')

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

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

    return job_counter

autocnet/spatial/overlap.py

+6 −3
Original line number Diff line number Diff line
@@ -67,7 +67,9 @@ def place_points_in_overlaps(nodes, size_threshold=0.0007, 


def cluster_place_points_in_overlaps(size_threshold=0.0007,

                                     distribute_points_kwargs={},

                                     walltime='00:10:00', cam_type="csm"):

                                     walltime='00:10:00', 

                                     chunksize=1000,

                                     cam_type="csm"):

    """

    Place points in all of the overlap geometries by back-projecing using

    sensor models. This method uses the cluster to process all of the overlaps
@@ -108,8 +110,9 @@ def cluster_place_points_in_overlaps(size_threshold=0.0007, 
                 time=walltime,

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

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

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

    return i + 1

    job_counter = i+1

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

    return job_counter



def place_points_in_overlap(nodes, geom, cam_type="csm",

                            distribute_points_kwargs={}):