Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ transform:
ERR_PATH: /pfs/out/errored_datums
RELATIVE_PATH_INDEX: "3"
LINK_TYPE: COPY
PARALLELIZATION_INTERNAL: '5'
PARALLELIZATION_INTERNAL: '2'
# Environment variables for filter-joiner
CONFIG: |
---
Expand Down Expand Up @@ -148,14 +148,15 @@ input:
joinOn: $1/$2/$3
empty_files: false
parallelism_spec:
constant: 8
constant: 20
autoscaling: true
resource_requests:
memory: 8G
cpu: 8.5
memory: 5G
cpu: 2.5
disk: 4G
resource_limits:
memory: 10G
cpu: 10
memory: 6G
cpu: 4
sidecar_resource_requests:
memory: 3G
cpu: 0.3
Expand Down
3 changes: 2 additions & 1 deletion pipe/concH2oSoilSalinity/concH2oSoilSalinity_group_path.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,12 @@ input:
glob: /(*/*/*)
joinOn: $1
parallelism_spec:
constant: 5
constant: 12
autoscaling: true
resource_requests:
memory: 2G
cpu: 0.6
disk: 2G
resource_limits:
memory: 2.5G
cpu: 1.2
Expand Down
8 changes: 4 additions & 4 deletions pipe/concH2oSoilSalinity/concH2oSoilSalinity_group_split.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ transform:
GROUP_FOCUS_MONTH_INDEX: '4'
GROUP_FOCUS_DAY_INDEX: '5'
GROUP_FOCUS_GROUP_INDEX: '8'
PARALLELIZATION_INTERNAL: '5'
PARALLELIZATION_INTERNAL: '2'
input:
cross:
- pfs:
Expand All @@ -91,14 +91,14 @@ input:
glob: /(*/*/*)
joinOn: $1
parallelism_spec:
constant: 8
constant: 16
autoscaling: true
resource_requests:
memory: 4G
cpu: 7
cpu: 2
resource_limits:
memory: 5G
cpu: 8
cpu: 2.5
sidecar_resource_requests:
memory: 3G
cpu: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ transform:

# Environment variables for pub table and srf module
PUB_WORKBOOKS: /tmp/pub_workbooks
PARALLELIZATION_INTERNAL: '5'
PARALLELIZATION_INTERNAL: '2'

# Environment variables for the L1 archiver
GROUP_PREFIX: conc-h2o-soil-salinity-split # no ending "_"
Expand Down Expand Up @@ -162,14 +162,15 @@ input:
joinOn: $1
empty_files: false # Make sure this is false for LINK_TYPE=COPY
parallelism_spec:
constant: 8
constant: 16
autoscaling: true
resource_requests:
memory: 4G
cpu: 7
cpu: 2
disk: 4G
resource_limits:
memory: 5G
cpu: 8
cpu: 2.5
sidecar_resource_requests:
memory: 4G
cpu: 1.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ transform:
LOG_LEVEL: INFO
RELATIVE_PATH_INDEX: "3"
LINK_TYPE: COPY
PARALLELIZATION_INTERNAL: '3'
PARALLELIZATION_INTERNAL: '2'
input:
cross:
- pfs:
Expand All @@ -190,14 +190,15 @@ input:
joinOn: $1
empty_files: false
parallelism_spec:
constant: 5
constant: 12
autoscaling: true
resource_requests:
memory: 2G
cpu: 4
cpu: 2
disk: 3G
resource_limits:
memory: 3G
cpu: 5
cpu: 2.5
sidecar_resource_requests:
memory: 3G
cpu: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ transform:
RELATIVE_PATH_INDEX: "3"
LINK_TYPE: COPY # options are COPY or SYMLINK. Use COPY for combined module.
# Environment variables for calibration module
PARALLELIZATION_INTERNAL: '5' # Option for stats module
PARALLELIZATION_INTERNAL: '2' # Option for stats module
input:
cross:
- pfs:
Expand All @@ -102,13 +102,14 @@ input:
joinOn: $1
empty_files: false # Make sure this is false for LINK_TYPE=COPY
parallelism_spec:
constant: 5
resource_requests:
constant: 14
resource_requests:
memory: 1.8G
cpu: 6
cpu: 2
disk: 3G
resource_limits:
memory: 3G
cpu: 7
cpu: 2.5
sidecar_resource_requests:
memory: 3G
cpu: 0.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ transform:
PAD_DIR: data
COPY_DIR: location,uncertainty_coef,uncertainty_data # Can be multiple, separated by commas without spaces. Directories other than the pad directory to copy to the output
RELATIVE_PATH_INDEX: '3'
PARALLELIZATION_INTERNAL: '5' # For threshold select module
PARALLELIZATION_INTERNAL: '2' # For threshold select module
output_branch: master
input:
cross:
Expand All @@ -100,14 +100,14 @@ input:
repo: concH2oSoilSalinity_threshold
glob: /thresholds.json
parallelism_spec:
constant: 5
constant: 14
autoscaling: true
resource_requests:
memory: 2.5G
cpu: 5.5
cpu: 2
resource_limits:
memory: 4G
cpu: 6.5
cpu: 2.5
sidecar_resource_requests:
memory: 4G
cpu: 1
Expand Down
12 changes: 6 additions & 6 deletions pipe/enviroscan/enviroscan_array_parser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,17 +128,17 @@ input:
repo: enviroscan_data_source_gcs
glob: "/enviroscan/*/*/*"
parallelism_spec:
constant: 3
constant: 16
autoscaling: true
resource_requests:
memory: 300M
cpu: 1.6
memory: 600M
cpu: 1.2
resource_limits:
memory: 1.5G
memory: 2G
cpu: 2
sidecar_resource_requests:
memory: 2G
cpu: 0.5
memory: 2.5G
cpu: 0.1
datum_set_spec:
number: 1
scheduling_spec:
Expand Down
2 changes: 1 addition & 1 deletion pipe/enviroscan/enviroscan_calibration_assignment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ input:
repo: enviroscan_cron_daily_and_date_control
glob: /data_year*.txt
parallelism_spec:
constant: 5
constant: 10
autoscaling: true
resource_requests:
memory: 500M
Expand Down
8 changes: 4 additions & 4 deletions pipe/enviroscan/enviroscan_calibration_group_and_convert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ transform:
OUT_PATH_ARRAY_PARSER: /tmp/pfs/array_parsed # R modules must have pfs in the repo structure

# Environment variables for calibration module
PARALLELIZATION_INTERNAL: '3' # Option for calibration conversion module
PARALLELIZATION_INTERNAL: '2' # Option for calibration conversion module
input:
cross:
# - pfs:
Expand Down Expand Up @@ -164,14 +164,14 @@ input:
outer_join: true
empty_files: false # Make sure to use false if LINK_TYPE=COPY. Can also be set to false for LINK_TYPE=SYMLINK.
parallelism_spec:
constant: 4
constant: 12
autoscaling: true
resource_requests:
memory: 2.5G
cpu: 5
cpu: 2
resource_limits:
memory: 4G
cpu: 6.5
cpu: 2.5
sidecar_resource_requests:
memory: 4G
cpu: 1
Expand Down
2 changes: 1 addition & 1 deletion pipe/enviroscan/enviroscan_data_source_gcs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ input:
branch: master
output_branch: master
parallelism_spec:
constant: 5
constant: 15
autoscaling: true
resource_requests:
memory: 400M
Expand Down
8 changes: 4 additions & 4 deletions pipe/enviroscan/enviroscan_fill_date_gaps_and_regularize.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ transform:
EMPTY_FILE_TYPE_INDEX: '4'
LINK_TYPE: COPY # options are COPY or SYMLINK. Use COPY for combined modules.
# Environment variables for regularizer
PARALLELIZATION_INTERNAL: '3' # Parallelization within R. If increased, adjust resource requests appropriately.
PARALLELIZATION_INTERNAL: '2' # Parallelization within R. If increased, adjust resource requests appropriately.
input:
cross:
- pfs:
Expand Down Expand Up @@ -89,14 +89,14 @@ input:
group_by: $1
empty_files: true # This can remain true even if LINK_TYPE=COPY
parallelism_spec:
constant: 5
constant: 12
autoscaling: true
resource_requests:
memory: 2G
cpu: 3.3
cpu: 2
resource_limits:
memory: 3G
cpu: 4.5
cpu: 2.5
sidecar_resource_requests:
memory: 3G
cpu: 0.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ input:
repo: enviroscan_cron_daily_and_date_control
glob: /data_year*.txt
parallelism_spec:
constant: 2
constant: 8
autoscaling: true
resource_requests:
memory: 210M
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ input:
empty_files: false # Make sure to use false if LINK_TYPE=COPY. Can also be set to false for LINK_TYPE=SYMLINK.

parallelism_spec:
constant: 5
constant: 12
autoscaling: true
resource_requests:
memory: 2.2G
cpu: 3.3
cpu: 1.5
resource_limits:
memory: 4G
cpu: 4.5
cpu: 2.5
sidecar_resource_requests:
memory: 3G
cpu: 0.5
Expand Down
3 changes: 2 additions & 1 deletion pipe/prt/prt_calibration_assignment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ input:
repo: prt_cron_daily_and_date_control
glob: /data_year*.txt
parallelism_spec:
constant: 5
constant: 10
autoscaling: true
resource_requests:
memory: 300M
cpu: 1.5
disk: 2G
resource_limits:
memory: 1G
cpu: 2
Expand Down
9 changes: 5 additions & 4 deletions pipe/prt/prt_calibration_group_and_convert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ transform:
RELATIVE_PATH_INDEX: "3" # Must be consistent across inputs
LINK_TYPE: COPY # options are COPY or SYMLINK. MUST BE SIMLINK IF USING COMBINED MODULE.
# Environment variables for calibration module
PARALLELIZATION_INTERNAL: '5' # Option for calibration conversion module
PARALLELIZATION_INTERNAL: '2' # Option for calibration conversion module
input:
cross:
- pfs:
Expand Down Expand Up @@ -120,14 +120,15 @@ input:
# outer_join: true
# empty_files: false # Make sure to use false if LINK_TYPE=COPY. Can also be set to false for LINK_TYPE=SYMLINK.
parallelism_spec:
constant: 10
constant: 16
autoscaling: true
resource_requests:
memory: 4G
cpu: 6.5
cpu: 2
disk: 2G
resource_limits:
memory: 5G
cpu: 7.5
cpu: 2.5
sidecar_resource_requests:
memory: 4G
cpu: 1.2
Expand Down
1 change: 1 addition & 0 deletions pipe/prt/prt_calibration_list_files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ autoscaling: true
resource_requests:
memory: 800M
cpu: 0.4
disk: 2G
resource_limits:
memory: 1.2G
cpu: 1.5
Expand Down
1 change: 1 addition & 0 deletions pipe/prt/prt_calibration_loader.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ autoscaling: true
resource_requests:
memory: 500M
cpu: 0.5
disk: 2G
resource_limits:
memory: 1G
cpu: 1.5
Expand Down
11 changes: 6 additions & 5 deletions pipe/prt/prt_data_source_gcs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,17 @@ input:
branch: master
output_branch: master
parallelism_spec:
constant: 5
constant: 20
autoscaling: true
resource_requests:
memory: 600M
cpu: 0.5
resource_limits:
memory: 1G
cpu: 0.35
disk: 2G
resource_limits:
memory: 3G
cpu: 1.5
sidecar_resource_requests:
memory: 2.8G
memory: 3.5G
cpu: 0.5
datum_set_spec:
number: 1
Expand Down
Loading
Loading