diff --git a/.github/workflows/deploy-multi-burst-sandbox.yml b/.github/workflows/deploy-multi-burst-sandbox.yml index 5ff4890bc..d31a099fe 100644 --- a/.github/workflows/deploy-multi-burst-sandbox.yml +++ b/.github/workflows/deploy-multi-burst-sandbox.yml @@ -26,7 +26,6 @@ jobs: job_files: >- job_spec/INSAR_ISCE_BURST.yml job_spec/INSAR_ISCE_MULTI_BURST.yml - job_spec/INSAR_ISCE_MULTI_BURST_SPOT.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 diff --git a/apps/set-batch-overrides/src/set_batch_overrides.py b/apps/set-batch-overrides/src/set_batch_overrides.py index cc839f034..c15e1f79e 100644 --- a/apps/set-batch-overrides/src/set_batch_overrides.py +++ b/apps/set-batch-overrides/src/set_batch_overrides.py @@ -65,9 +65,7 @@ def get_insar_isce_burst_memory(job_parameters: dict) -> str: def lambda_handler(event: dict, _) -> dict: job_type, job_parameters = event['job_type'], event['job_parameters'] - # TODO revert - #if job_type == 'INSAR_ISCE_MULTI_BURST': - if job_type in ('INSAR_ISCE_MULTI_BURST', 'INSAR_ISCE_MULTI_BURST_SPOT'): + if job_type == 'INSAR_ISCE_MULTI_BURST': memory = get_insar_isce_burst_memory(job_parameters) omp_num_threads = INSAR_ISCE_BURST_OMP_NUM_THREADS[memory] return get_container_overrides(memory, omp_num_threads) diff --git a/job_spec/INSAR_ISCE_MULTI_BURST.yml b/job_spec/INSAR_ISCE_MULTI_BURST.yml index 3ac11120f..31f223d15 100644 --- a/job_spec/INSAR_ISCE_MULTI_BURST.yml +++ b/job_spec/INSAR_ISCE_MULTI_BURST.yml @@ -7,7 +7,7 @@ INSAR_ISCE_MULTI_BURST: api_schema: type: array minItems: 1 - maxItems: 30 # TODO limit based on Spot failure rate? + maxItems: 15 # TODO: provide an example with multiple bursts example: - S1_136231_IW2_20200604T022312_VV_7C85-BURST @@ -22,7 +22,7 @@ INSAR_ISCE_MULTI_BURST: api_schema: type: array minItems: 1 - maxItems: 30 # TODO limit based on Spot failure rate? + maxItems: 15 example: - S1_136231_IW2_20200616T022313_VV_5D11-BURST items: @@ -75,7 +75,7 @@ INSAR_ISCE_MULTI_BURST: - --secondary - Ref::secondary timeout: 126000 # 35 hours - compute_environment: InsarIsceMultiBurst + compute_environment: Default vcpu: 1 memory: 4 # Memory is always overridden by the step function secrets: diff --git a/job_spec/INSAR_ISCE_MULTI_BURST_SPOT.yml b/job_spec/INSAR_ISCE_MULTI_BURST_SPOT.yml deleted file mode 100644 index 6d1b85cdb..000000000 --- a/job_spec/INSAR_ISCE_MULTI_BURST_SPOT.yml +++ /dev/null @@ -1,83 +0,0 @@ -INSAR_ISCE_MULTI_BURST_SPOT: - required_parameters: - - reference - - secondary - parameters: - reference: - api_schema: - type: array - minItems: 1 - maxItems: 30 # TODO limit based on Spot failure rate? - # TODO: provide an example with multiple bursts - example: - - S1_136231_IW2_20200604T022312_VV_7C85-BURST - items: - description: Name of the reference Sentinel-1 SLC IW burst granule to process - type: string - pattern: '^S1_\d{6}_IW\d_\d{8}T\d{6}_[VH]{2}_([\dA-F]){4}-BURST$' - minLength: 43 - maxLength: 43 - example: S1_136231_IW2_20200604T022312_VV_7C85-BURST - secondary: - api_schema: - type: array - minItems: 1 - maxItems: 30 # TODO limit based on Spot failure rate? - example: - - S1_136231_IW2_20200616T022313_VV_5D11-BURST - items: - description: Name of the secondary Sentinel-1 SLC IW burst granule to process - type: string - pattern: '^S1_\d{6}_IW\d_\d{8}T\d{6}_[VH]{2}_([\dA-F]){4}-BURST$' - minLength: 43 - maxLength: 43 - example: S1_136231_IW2_20200616T022313_VV_5D11-BURST - apply_water_mask: - api_schema: - description: Sets pixels over coastal and large inland waterbodies as invalid for phase unwrapping. - default: false - type: boolean - looks: - api_schema: - description: Number of looks to take in range and azimuth - type: string - default: 20x4 - enum: - - 20x4 - - 10x2 - - 5x1 - cost_profiles: - EDC: - cost: 1.0 - DEFAULT: - cost: 1.0 - validators: - - check_dem_coverage - - check_valid_polarizations - - check_same_burst_ids - - check_not_antimeridian - steps: - - name: '' - image: ghcr.io/asfhyp3/hyp3-isce2 - command: - - ++process - - insar_tops_burst - - --bucket - - '!Ref Bucket' - - --bucket-prefix - - Ref::bucket_prefix - - --apply-water-mask - - Ref::apply_water_mask - - --looks - - Ref::looks - - --reference - - Ref::reference - - --secondary - - Ref::secondary - timeout: 126000 # 35 hours - compute_environment: Default - vcpu: 1 - memory: 4 # Memory is always overridden by the step function - secrets: - - EARTHDATA_USERNAME - - EARTHDATA_PASSWORD diff --git a/job_spec/config/compute_environments.yml b/job_spec/config/compute_environments.yml index 9ad8cef96..01de096b7 100644 --- a/job_spec/config/compute_environments.yml +++ b/job_spec/config/compute_environments.yml @@ -12,6 +12,3 @@ compute_environments: InsarIsceAria: allocation_type: EC2 allocation_strategy: BEST_FIT_PROGRESSIVE - InsarIsceMultiBurst: - allocation_type: EC2 - allocation_strategy: BEST_FIT_PROGRESSIVE