-
Notifications
You must be signed in to change notification settings - Fork 0
/
run_on_discover_non-admin.patch
198 lines (187 loc) · 6.25 KB
/
run_on_discover_non-admin.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
diff --git a/batch_check_setsm.py b/batch_check_setsm.py
index a3f072b..6fb0b7b 100644
--- a/batch_check_setsm.py
+++ b/batch_check_setsm.py
@@ -315,9 +315,9 @@ JOBSCRIPT_INIT = os.path.join(JOBSCRIPT_DIR, 'init.sh')
JOB_ABBREV = 'Check'
# BATCH_ARGDEF_WD = '/local' if RUNNING_AT_PGC else None
BATCH_ARGDEF_WD = None
-JOB_WALLTIME_HR = 72
-JOB_MEMORY_GB = 40
-JOB_NCORES = 4
+JOB_WALLTIME_HR = None
+JOB_MEMORY_GB = None
+JOB_NCORES = None
JOB_NODE = None
##############################
diff --git a/batch_mask.py b/batch_mask.py
index f9a7b21..8e464b6 100644
--- a/batch_mask.py
+++ b/batch_mask.py
@@ -106,9 +106,9 @@ ARGGRP_FILTER_COMP = [ARGSTR_EDGE, ARGSTR_WATER, ARGSTR_CLOUD]
JOBSCRIPT_DIR = os.path.join(SCRIPT_DIR, 'jobscripts')
JOBSCRIPT_INIT = os.path.join(JOBSCRIPT_DIR, 'init.sh')
JOB_ABBREV = 'Mask'
-JOB_WALLTIME_HR = 30
-JOB_MEMORY_GB = 20
-JOB_NCORES = 4
+JOB_WALLTIME_HR = None
+JOB_MEMORY_GB = None
+JOB_NCORES = None
JOB_NODE = None
##############################
diff --git a/batch_scenes2strips.py b/batch_scenes2strips.py
index 0b39819..3e00318 100644
--- a/batch_scenes2strips.py
+++ b/batch_scenes2strips.py
@@ -158,9 +158,9 @@ ARGGRP_SINGLE_SCENE_STRIPS = [ARGSTR_USE_OLD_MASKS, ARGSTR_NOFILTER_COREG, (ARGS
JOBSCRIPT_DIR = os.path.join(SCRIPT_DIR, 'jobscripts')
JOBSCRIPT_INIT = os.path.join(JOBSCRIPT_DIR, 'init.sh')
JOB_ABBREV = 's2s'
-JOB_WALLTIME_HR = 3
-JOB_MEMORY_GB = 60
-JOB_NCORES = 12
+JOB_WALLTIME_HR = None
+JOB_MEMORY_GB = None
+JOB_NCORES = None
JOB_NODE = None
##############################
diff --git a/jobscripts/head_slurm.sh b/jobscripts/head_slurm.sh
index 079f4bf..f79709a 100755
--- a/jobscripts/head_slurm.sh
+++ b/jobscripts/head_slurm.sh
@@ -1,12 +1,19 @@
#!/bin/bash
-#SBATCH --time 1:00:00
+#SBATCH --time 24:00:00
#SBATCH --nodes 1
-#SBATCH --ntasks 2
-#SBATCH --mem=5G
+#SBATCH --ntasks 8
+#SBATCH --mem=40G
#SBATCH -o %x.o%j
+#SBATCH -A s2202
+##SBATCH --partition=single
+##SBATCH --constraint=sky
+##SBATCH --qos=abv_arc_b1016
+##SBATCH --nice=370
+#SBATCH --qos=long
+
## NOTE: Look to 'body.sh' script for expected environment variable arguments
diff --git a/jobscripts/init.sh b/jobscripts/init.sh
index 42f0533..1790e0b 100755
--- a/jobscripts/init.sh
+++ b/jobscripts/init.sh
@@ -17,7 +17,7 @@ env_load_cmd=''
## Modify the two code blocks below to set default and per-script environment load commands
# Set default environment load command for all batch scripts (fallback if no specific script setting)
-#default_env_load_cmd="source /home/husby036/installed/build/miniconda3_rookery2/bin/activate /home/husby036/installed/build/miniconda3_rookery2/envs/s2s"
+default_env_load_cmd="set +u; source /discover/swdev/sacs/sw/etc/sacs-v3.4.3b.sh; set -u"
# Set environment load commands specific to batch scripts
if [ "$job_class" == "s2s" ]; then
diff --git a/reproject_setsm.py b/reproject_setsm.py
index 6cbe63a..37bd339 100644
--- a/reproject_setsm.py
+++ b/reproject_setsm.py
@@ -87,9 +87,9 @@ ARGGRP_BATCH = [ARGSTR_SCHEDULER, ARGSTR_JOBSCRIPT, ARGSTR_TASKS_PER_JOB, ARGSTR
JOBSCRIPT_DIR = os.path.join(SCRIPT_DIR, 'jobscripts')
JOBSCRIPT_INIT = os.path.join(JOBSCRIPT_DIR, 'init.sh')
JOB_ABBREV = 'Reproj'
-JOB_WALLTIME_HR = 30
-JOB_MEMORY_GB = 20
-JOB_NCORES = 4
+JOB_WALLTIME_HR = None
+JOB_MEMORY_GB = None
+JOB_NCORES = None
JOB_NODE = None
##############################
-diff --git a/batch_mask.py b/batch_mask.py
-index 779d5d0..c6bd3cd 100644
---- a/batch_mask.py
-+++ b/batch_mask.py
-@@ -106,9 +106,9 @@ ARGGRP_FILTER_COMP = [ARGSTR_EDGE, ARGSTR_WATER, ARGSTR_CLOUD]
- JOBSCRIPT_DIR = os.path.join(SCRIPT_DIR, 'jobscripts')
- JOBSCRIPT_INIT = os.path.join(JOBSCRIPT_DIR, 'init.sh')
- JOB_ABBREV = 'Mask'
--JOB_WALLTIME_HR = 30
--JOB_MEMORY_GB = 20
--JOB_NCORES = 4
-+JOB_WALLTIME_HR = None
-+JOB_MEMORY_GB = None
-+JOB_NCORES = None
- JOB_NODE = None
-
- ##############################
-diff --git a/batch_scenes2strips.py b/batch_scenes2strips.py
-index 73682c6..4d40b32 100644
---- a/batch_scenes2strips.py
-+++ b/batch_scenes2strips.py
-@@ -151,9 +151,9 @@ ARGGRP_UNFILTERED = [ARGSTR_NOWATER, ARGSTR_NOCLOUD]
- JOBSCRIPT_DIR = os.path.join(SCRIPT_DIR, 'jobscripts')
- JOBSCRIPT_INIT = os.path.join(JOBSCRIPT_DIR, 'init.sh')
- JOB_ABBREV = 's2s'
--JOB_WALLTIME_HR = 3
--JOB_MEMORY_GB = 40
--JOB_NCORES = 4
-+JOB_WALLTIME_HR = None
-+JOB_MEMORY_GB = None
-+JOB_NCORES = None
- JOB_NODE = None
-
- ##############################
-diff --git a/jobscripts/head_slurm.sh b/jobscripts/head_slurm.sh
-index 079f4bf..93b3518 100755
---- a/jobscripts/head_slurm.sh
-+++ b/jobscripts/head_slurm.sh
-@@ -1,12 +1,19 @@
- #!/bin/bash
-
--#SBATCH --time 1:00:00
-+#SBATCH --time 24:00:00
- #SBATCH --nodes 1
--#SBATCH --ntasks 2
--#SBATCH --mem=5G
-+#SBATCH --ntasks 8
-+#SBATCH --mem=40G
-
- #SBATCH -o %x.o%j
-
-+#SBATCH -A s2202
-+##SBATCH --partition=single
-+##SBATCH --constraint=sky
-+##SBATCH --qos=abv_arc_b1016
-+##SBATCH --nice=370
-+#SBATCH --qos=long
-+
-
- ## NOTE: Look to 'body.sh' script for expected environment variable arguments
-
-diff --git a/jobscripts/init.sh b/jobscripts/init.sh
-index f29836b..2b31607 100755
---- a/jobscripts/init.sh
-+++ b/jobscripts/init.sh
-@@ -19,6 +19,7 @@ env_load_cmd=''
- # Set default environment load command for all batch scripts (fallback if no specific script setting)
- #default_env_load_cmd="source /mnt/pgc/data/scratch/erik/installed/build/miniconda3/bin/activate /mnt/pgc/data/scratch/erik/installed/build/miniconda3/envs/s2s"
- #default_env_load_cmd="source /home/husby036/installed/build/miniconda3/bin/activate /home/husby036/installed/build/miniconda3/envs/s2s"
-+default_env_load_cmd="set +u; source /discover/swdev/sacs/sw/etc/sacs-v3.4.3b.sh; set -u"
-
- # Set environment load commands specific to batch scripts
- if [ "$job_class" == "s2s" ]; then
-diff --git a/reproject_setsm.py b/reproject_setsm.py
-index 02f9bb5..50f2aab 100644
---- a/reproject_setsm.py
-+++ b/reproject_setsm.py
-@@ -87,9 +87,9 @@ ARGGRP_BATCH = [ARGSTR_SCHEDULER, ARGSTR_JOBSCRIPT, ARGSTR_TASKS_PER_JOB, ARGSTR
- JOBSCRIPT_DIR = os.path.join(SCRIPT_DIR, 'jobscripts')
- JOBSCRIPT_INIT = os.path.join(JOBSCRIPT_DIR, 'init.sh')
- JOB_ABBREV = 'Reproj'
--JOB_WALLTIME_HR = 30
--JOB_MEMORY_GB = 20
--JOB_NCORES = 4
-+JOB_WALLTIME_HR = None
-+JOB_MEMORY_GB = None
-+JOB_NCORES = None
- JOB_NODE = None
-
- ##############################