Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add memory #412

Merged
merged 2 commits into from
Sep 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion minsar/defaults/job_defaults.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ extract_stack_valid_region 0 00:01:00 4000 0
merge_reference_secondary_slc 00:02:45 0 4000 0 2
generate_burst_igram 0 00:00:30 4000 0 2
merge_burst_igram 0 00:00:10 4000 0 8 # for num_threads=4 got error with memory
filter_coherence 0 00:00:40 6000 0 8 # for num_threads=4 got error with memory
filter_coherence 0 00:00:40 6000 1000 8 # for num_threads=4 got error with memory
unwrap 0 00:01:00 5000 0 2
merge 00:02:45 0 4000 0 2

Expand Down
9 changes: 7 additions & 2 deletions minsar/job_submission.py
Original file line number Diff line number Diff line change
Expand Up @@ -440,10 +440,15 @@ def split_jobs(self, batch_file, tasks, number_of_nodes):
number_of_parallel_tasks = int(np.ceil(len(tasks) / number_of_jobs))
number_of_limited_memory_tasks = int(self.max_memory_per_node*number_of_nodes_per_job/self.default_memory)

while number_of_limited_memory_tasks < number_of_parallel_tasks:
if number_of_jobs < int(self.max_jobs_per_queue):
number_of_jobs += 1
number_of_parallel_tasks = int(np.ceil(len(tasks) / number_of_jobs))
else:
break

while number_of_limited_memory_tasks < number_of_parallel_tasks:
number_of_nodes_per_job = number_of_nodes_per_job + 1
number_of_jobs = np.ceil(number_of_nodes / number_of_nodes_per_job)
number_of_parallel_tasks = int(np.ceil(len(tasks) / number_of_jobs))
number_of_limited_memory_tasks = int(self.max_memory_per_node * number_of_nodes_per_job / self.default_memory)

if number_of_nodes_per_job > 1:
Expand Down