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

Multi burst sandbox #2522

Draft
wants to merge 10 commits into
base: develop
Choose a base branch
from
4 changes: 0 additions & 4 deletions .github/workflows/deploy-multi-burst-sandbox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ jobs:
job_files: >-
job_spec/INSAR_ISCE_BURST.yml
job_spec/INSAR_ISCE_MULTI_BURST.yml
job_spec/AUTORIFT.yml
job_spec/RTC_GAMMA.yml
job_spec/WATER_MAP.yml
job_spec/WATER_MAP_EQ.yml
instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge
default_max_vcpus: 640
expanded_max_vcpus: 640
Expand Down
2 changes: 1 addition & 1 deletion apps/set-batch-overrides/src/set_batch_overrides.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def get_insar_isce_burst_memory(job_parameters: dict) -> str:
if bursts < 31:
return INSAR_ISCE_BURST_MEMORY_32G
if looks == '20x4':
if bursts < 23:
if bursts < 16:
return INSAR_ISCE_BURST_MEMORY_8G
if bursts < 31:
return INSAR_ISCE_BURST_MEMORY_16G
Expand Down
4 changes: 2 additions & 2 deletions job_spec/INSAR_ISCE_MULTI_BURST.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ INSAR_ISCE_MULTI_BURST:
api_schema:
type: array
minItems: 1
maxItems: 30
maxItems: 15
# TODO: provide an example with multiple bursts
example:
- S1_136231_IW2_20200604T022312_VV_7C85-BURST
Expand All @@ -22,7 +22,7 @@ INSAR_ISCE_MULTI_BURST:
api_schema:
type: array
minItems: 1
maxItems: 30
maxItems: 15
example:
- S1_136231_IW2_20200616T022313_VV_5D11-BURST
items:
Expand Down
4 changes: 2 additions & 2 deletions tests/test_set_batch_overrides.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def test_set_batch_overrides_insar_isce_burst_10x2():


def test_set_batch_overrides_insar_isce_burst_20x4():
for n in range(1, 23):
for n in range(1, 16):
assert lambda_handler(mock_insar_isce_burst_job('20x4', bursts=n), None) == {
'ResourceRequirements': [
{
Expand All @@ -130,7 +130,7 @@ def test_set_batch_overrides_insar_isce_burst_20x4():
],
'Environment': [{'Name': 'OMP_NUM_THREADS', 'Value': '1'}],
}
for n in range(23, 31):
for n in range(16, 31):
assert lambda_handler(mock_insar_isce_burst_job('20x4', bursts=n), None) == {
'ResourceRequirements': [
{
Expand Down
Loading