Merge pull request #2420 from ASFHyP3/develop

Release v7.9.0
ASFHyP3 · Sep 12, 2024 · 7898d89 · 7898d89
2 parents 35eb668 + 695f19d
commit 7898d89
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 17 deletions.
diff --git a/.github/workflows/deploy-enterprise-test.yml b/.github/workflows/deploy-enterprise-test.yml
@@ -50,7 +50,7 @@ jobs:
               job_spec/ARIA_AUTORIFT.yml
               job_spec/ARIA_RAIDER.yml
               job_spec/INSAR_ISCE.yml
-            instance_types: c6id.xlarge,c6id.2xlarge,c6id.4xlarge,c6id.8xlarge
+            instance_types: m6id.xlarge,m6id.2xlarge,m6id.4xlarge,m6id.8xlarge,m6idn.xlarge,m6idn.2xlarge,m6idn.4xlarge,m6idn.8xlarge
             default_max_vcpus: 640
             expanded_max_vcpus: 640
             required_surplus: 0
@@ -69,7 +69,7 @@ jobs:
             job_files: >-
               job_spec/AUTORIFT_ITS_LIVE.yml
               job_spec/S1_CORRECTION_ITS_LIVE.yml
-            instance_types: r6id.xlarge,r6idn.xlarge,r5dn.xlarge,r5d.xlarge
+            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
             required_surplus: 0

diff --git a/.github/workflows/deploy-enterprise.yml b/.github/workflows/deploy-enterprise.yml
@@ -45,7 +45,7 @@ jobs:
               job_spec/ARIA_AUTORIFT.yml
               job_spec/ARIA_RAIDER.yml
               job_spec/INSAR_ISCE.yml
-            instance_types: c6id.xlarge,c6id.2xlarge,c6id.4xlarge,c6id.8xlarge
+            instance_types: m6id.xlarge,m6id.2xlarge,m6id.4xlarge,m6id.8xlarge,m6idn.xlarge,m6idn.2xlarge,m6idn.4xlarge,m6idn.8xlarge
             default_max_vcpus: 4000  # Max: 13000
             expanded_max_vcpus: 4000  # Max: 13000
             required_surplus: 0
@@ -65,7 +65,7 @@ jobs:
               job_spec/ARIA_AUTORIFT.yml
               job_spec/ARIA_RAIDER.yml
               job_spec/INSAR_ISCE.yml
-            instance_types: c6id.xlarge,c6id.2xlarge,c6id.4xlarge,c6id.8xlarge
+            instance_types: m6id.xlarge,m6id.2xlarge,m6id.4xlarge,m6id.8xlarge,m6idn.xlarge,m6idn.2xlarge,m6idn.4xlarge,m6idn.8xlarge
             default_max_vcpus: 1000  # Max: 10316
             expanded_max_vcpus: 1000  # Max: 10316
             required_surplus: 0
@@ -85,7 +85,7 @@ jobs:
               job_spec/ARIA_AUTORIFT.yml
               job_spec/ARIA_RAIDER.yml
               job_spec/INSAR_ISCE.yml
-            instance_types: c6id.xlarge,c6id.2xlarge,c6id.4xlarge,c6id.8xlarge
+            instance_types: m6id.xlarge,m6id.2xlarge,m6id.4xlarge,m6id.8xlarge,m6idn.xlarge,m6idn.2xlarge,m6idn.4xlarge,m6idn.8xlarge
             default_max_vcpus: 1600  # Max 1652
             expanded_max_vcpus: 1600  # Max 1652
             required_surplus: 0

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [7.9.0]
+
+### Changed
+- The `ARIA_AUTORIFT.yml` job spec now specifies the optimum number of OpenMP threads and uses a dedicated compute environment with `r6id[n]` spot instances.
+- The `AUTORIFT_ITS_LIVE.yml` job spec now specifies the optimum number of OpenMP threads.
+- The `INSAR_ISCE.yml` job spec now reserved 16 GB memory for running the DockerizedTopsApp task.
+- The `hyp3-a19-jpl-test`, `hyp3-a19-jpl`, `hyp3-tibet-jpl`, and `hyp3-nisar-jpl` ARIA deployments now uses on-demand `m6id[n]` instances.
+- The `hyp3-its-live-test` deployment now uses a greater variety of `r6id[n]` instances.
+
 ## [7.8.1]
 
 ### Fixed

diff --git a/job_spec/ARIA_AUTORIFT.yml b/job_spec/ARIA_AUTORIFT.yml
@@ -43,11 +43,14 @@ AUTORIFT:
       cost: 1.0
   validators: []
   compute_environment:
-    name: 'Default'
+    name: 'AriaAutorift'
+    instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge
   tasks:
     - name: ''
       image: ghcr.io/asfhyp3/hyp3-autorift
       command:
+        - ++omp-num-threads
+        - '4'  # 4 vCPUs per 32 GB RAM for the R instance family
         - --bucket
         - '!Ref Bucket'
         - --bucket-prefix

diff --git a/job_spec/AUTORIFT.yml b/job_spec/AUTORIFT.yml
@@ -46,7 +46,7 @@ AUTORIFT:
       image: ghcr.io/asfhyp3/hyp3-autorift
       command:
         - ++omp-num-threads
-        - '4'
+        - '4'  # 4 vCPUs per 32 GB RAM for the R instance family
         - --bucket
         - '!Ref Bucket'
         - --bucket-prefix

diff --git a/job_spec/AUTORIFT_ITS_LIVE.yml b/job_spec/AUTORIFT_ITS_LIVE.yml
@@ -57,6 +57,8 @@ AUTORIFT:
     - name: ''
       image: ghcr.io/asfhyp3/hyp3-autorift
       command:
+        - ++omp-num-threads
+        - '4'  # 4 vCPUs per 32 GB RAM for the R instance family
         - --bucket
         - '!Ref Bucket'
         - --bucket-prefix

diff --git a/job_spec/INSAR_ISCE.yml b/job_spec/INSAR_ISCE.yml
@@ -101,7 +101,7 @@ INSAR_ISCE:
       image: ghcr.io/access-cloud-based-insar/dockerizedtopsapp
       command:
         - ++omp-num-threads
-        - '4'  # 2 for the m instance family; 4 for the c
+        - '4'  # 8 vCPUs per 16 GB RAM for the C instance family; 4 for M; 2 for R
         - --bucket
         - '!Ref Bucket'
         - --bucket-prefix
@@ -128,7 +128,7 @@ INSAR_ISCE:
         - Ref::unfiltered_coherence
       timeout: 21600
       vcpu: 1
-      memory: 7500
+      memory: 15500
       secrets:
         - EARTHDATA_USERNAME
         - EARTHDATA_PASSWORD

diff --git a/requirements-all.txt b/requirements-all.txt
@@ -5,16 +5,16 @@
 -r requirements-apps-start-execution-worker.txt
 -r requirements-apps-disable-private-dns.txt
 -r requirements-apps-update-db.txt
-boto3==1.35.10
+boto3==1.35.15
 jinja2==3.1.4
-moto[dynamodb]==5.0.12
+moto[dynamodb]==5.0.14
 pytest==8.3.2
 PyYAML==6.0.2
 responses==0.25.3
 flake8==7.1.1
 flake8-import-order==0.18.2
 flake8-blind-except==0.2.1
 flake8-builtins==2.5.0
-setuptools==74.1.0
+setuptools==74.1.2
 openapi-spec-validator==0.7.1
-cfn-lint==1.11.1
+cfn-lint==1.12.4
diff --git a/requirements-apps-api-binary.txt b/requirements-apps-api-binary.txt
@@ -1 +1 @@
-cryptography==43.0.0
+cryptography==43.0.1
diff --git a/requirements-apps-disable-private-dns.txt b/requirements-apps-disable-private-dns.txt
@@ -1 +1 @@
-boto3==1.35.10
+boto3==1.35.15
diff --git a/requirements-apps-start-execution-manager.txt b/requirements-apps-start-execution-manager.txt
@@ -1,3 +1,3 @@
-boto3==1.35.10
+boto3==1.35.15
 ./lib/dynamo/
 ./lib/lambda_logging/
diff --git a/requirements-apps-start-execution-worker.txt b/requirements-apps-start-execution-worker.txt
@@ -1,2 +1,2 @@
-boto3==1.35.10
+boto3==1.35.15
 ./lib/lambda_logging/