Skip to content

Commit 4820b82

Browse files
johrstromjohrstrom
authored
Support for Ascend (#104)
Add support for the ascend cluster using a singularity container.
1 parent 5349225 commit 4820b82

File tree

4 files changed

+52
-5
lines changed

4 files changed

+52
-5
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
66

77
## [Unreleased]
88

9+
## [0.23.0] - 2020-10-20
10+
11+
- Added support for Ascend cluster in [104](https://github.com/OSC/bc_osc_rstudio_server/pull/104).
12+
913
## [0.22.0] - 2020-06-16
1014

1115
### Added
@@ -375,7 +379,8 @@ loads R_LIBS_SITE environment variable if it is set.
375379
### Added
376380
- Initial release!
377381

378-
[Unreleased]: https://github.com/OSC/bc_osc_rstudio_server/compare/v0.22.0...HEAD
382+
[Unreleased]: https://github.com/OSC/bc_osc_rstudio_server/compare/v0.23.0...HEAD
383+
[0.23.0]: https://github.com/OSC/bc_osc_rstudio_server/compare/v0.22.0...v0.23.0
379384
[0.22.0]: https://github.com/OSC/bc_osc_rstudio_server/compare/v0.21.9...v0.22.0
380385
[0.21.9]: https://github.com/OSC/bc_osc_rstudio_server/compare/v0.21.8...v0.21.9
381386
[0.20.1]: https://github.com/OSC/bc_osc_rstudio_server/compare/v0.20.0...v0.20.1

‎form.yml.erb

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
cluster:
88
- "owens"
99
- "pitzer"
10+
- "ascend"
1011
- "kubernetes"
1112
- "kubernetes-test"
1213
- "kubernetes-dev"
@@ -74,6 +75,7 @@ attributes:
7475
data-min-num-cores-for-cluster-pitzer: 1,
7576
data-max-num-cores-for-cluster-pitzer: 40,
7677
data-option-for-cluster-owens: false,
78+
data-option-for-cluster-ascend: false,
7779
data-option-for-cluster-kubernetes: false,
7880
data-option-for-cluster-kubernetes-test: false,
7981
data-option-for-cluster-kubernetes-dev: false
@@ -83,6 +85,7 @@ attributes:
8385
data-min-num-cores-for-cluster-pitzer: 1,
8486
data-max-num-cores-for-cluster-pitzer: 48,
8587
data-option-for-cluster-owens: false,
88+
data-option-for-cluster-ascend: false,
8689
data-option-for-cluster-kubernetes: false,
8790
data-option-for-cluster-kubernetes-test: false,
8891
data-option-for-cluster-kubernetes-dev: false
@@ -102,6 +105,7 @@ attributes:
102105
data-min-num-cores-for-cluster-pitzer: 1,
103106
data-max-num-cores-for-cluster-pitzer: 40,
104107
data-option-for-cluster-owens: false,
108+
data-option-for-cluster-ascend: false,
105109
data-option-for-cluster-kubernetes: false,
106110
data-option-for-cluster-kubernetes-test: false,
107111
data-option-for-cluster-kubernetes-dev: false
@@ -111,6 +115,7 @@ attributes:
111115
data-min-num-cores-for-cluster-pitzer: 1,
112116
data-max-num-cores-for-cluster-pitzer: 48,
113117
data-option-for-cluster-owens: false,
118+
data-option-for-cluster-ascend: false,
114119
data-option-for-cluster-kubernetes: false,
115120
data-option-for-cluster-kubernetes-test: false,
116121
data-option-for-cluster-kubernetes-dev: false
@@ -121,6 +126,7 @@ attributes:
121126
data-max-num-cores-for-cluster-owens: 48,
122127
data-min-num-cores-for-cluster-pitzer: 80,
123128
data-max-num-cores-for-cluster-pitzer: 80,
129+
data-option-for-cluster-ascend: false,
124130
data-option-for-cluster-kubernetes: false,
125131
data-option-for-cluster-kubernetes-test: false,
126132
data-option-for-cluster-kubernetes-dev: false
@@ -130,6 +136,7 @@ attributes:
130136
data-min-num-cores-for-cluster-pitzer: 48,
131137
data-max-num-cores-for-cluster-pitzer: 48,
132138
data-option-for-cluster-owens: false,
139+
data-option-for-cluster-ascend: false,
133140
data-option-for-cluster-pitzer: true,
134141
data-option-for-cluster-kubernetes: false,
135142
data-option-for-cluster-kubernetes-test: false,
@@ -143,6 +150,7 @@ attributes:
143150
data-max-num-cores-for-cluster-pitzer: 48,
144151
data-option-for-cluster-owens: true,
145152
data-option-for-cluster-pitzer: true,
153+
data-option-for-cluster-ascend: false,
146154
data-option-for-cluster-kubernetes: false,
147155
data-option-for-cluster-kubernetes-test: false,
148156
data-option-for-cluster-kubernetes-dev: false
@@ -157,6 +165,7 @@ attributes:
157165
data-max-num-cores-for-cluster-kubernetes-dev: 6,
158166
data-option-for-cluster-owens: false,
159167
data-option-for-cluster-pitzer: false,
168+
data-option-for-cluster-ascend: false,
160169
data-option-for-cluster-kubernetes: true,
161170
data-option-for-cluster-kubernetes-test: true,
162171
data-option-for-cluster-kubernetes-dev: true
@@ -171,6 +180,7 @@ attributes:
171180
data-max-num-cores-for-cluster-kubernetes-dev: 6,
172181
data-option-for-cluster-owens: false,
173182
data-option-for-cluster-pitzer: false,
183+
data-option-for-cluster-ascend: false,
174184
data-option-for-cluster-kubernetes: true,
175185
data-option-for-cluster-kubernetes-test: true,
176186
data-option-for-cluster-kubernetes-dev: true
@@ -185,6 +195,7 @@ attributes:
185195
data-max-num-cores-for-cluster-kubernetes-dev: 6,
186196
data-option-for-cluster-owens: false,
187197
data-option-for-cluster-pitzer: false,
198+
data-option-for-cluster-ascend: false,
188199
data-option-for-cluster-kubernetes: true,
189200
data-option-for-cluster-kubernetes-test: true,
190201
data-option-for-cluster-kubernetes-dev: true
@@ -199,6 +210,7 @@ attributes:
199210
data-max-num-cores-for-cluster-kubernetes-dev: 6,
200211
data-option-for-cluster-owens: false,
201212
data-option-for-cluster-pitzer: false,
213+
data-option-for-cluster-ascend: false,
202214
data-option-for-cluster-kubernetes: true,
203215
data-option-for-cluster-kubernetes-test: true,
204216
data-option-for-cluster-kubernetes-dev: true
@@ -208,69 +220,96 @@ attributes:
208220
label: "R version"
209221
help: "This defines the version of R you want to load."
210222
options:
223+
- [
224+
"R/4.2.1", "rstudio/2022.07.2 R/4.2.1",
225+
data-option-for-cluster-kubernetes: false,
226+
data-option-for-cluster-kubernetes-test: false,
227+
data-option-for-cluster-kubernetes-dev: false,
228+
data-option-for-cluster-owens: false,
229+
data-option-for-cluster-pitzer: false,
230+
]
231+
- [
232+
"R/4.2.1-gnu11.2", "rstudio/2022.07.2 R/4.2.1-gnu11.2",
233+
data-option-for-cluster-kubernetes: false,
234+
data-option-for-cluster-kubernetes-test: false,
235+
data-option-for-cluster-kubernetes-dev: false,
236+
data-option-for-cluster-owens: false,
237+
data-option-for-cluster-pitzer: false,
238+
]
211239
- [
212240
"4.1.0", "app_rstudio_server/4.1.0",
241+
data-option-for-cluster-ascend: false,
213242
data-option-for-cluster-kubernetes: false,
214243
data-option-for-cluster-kubernetes-test: false,
215244
data-option-for-cluster-kubernetes-dev: false
216245
]
217246
- [
218247
"4.0.2", "app_rstudio_server/4.0.2",
248+
data-option-for-cluster-ascend: false,
219249
]
220250
- [
221251
"3.6.3", "app_rstudio_server/3.6.3",
252+
data-option-for-cluster-ascend: false,
222253
]
223254
- [
224255
"3.6.1", "gnu/9.1.0 mkl/2019.0.3 R/3.6.1 rstudio/1.1.380_server texlive",
256+
data-option-for-cluster-ascend: false,
225257
data-option-for-cluster-pitzer: false,
226258
data-option-for-cluster-kubernetes: false,
227259
data-option-for-cluster-kubernetes-test: false,
228260
data-option-for-cluster-kubernetes-dev: false
229261
]
230262
- [
231263
"3.6.0", "gnu/7.3.0 mkl/2018.0.3 R/3.6.0 rstudio/1.1.380_server texlive",
264+
data-option-for-cluster-ascend: false,
232265
data-option-for-cluster-pitzer: false,
233266
data-option-for-cluster-kubernetes: false,
234267
data-option-for-cluster-kubernetes-test: false,
235268
data-option-for-cluster-kubernetes-dev: false
236269
]
237270
- [
238271
"3.6.0", "gnu/7.3.0 mkl/2018.0.3 R/3.6.0 rstudio/1.2.1335 texlive",
272+
data-option-for-cluster-ascend: false,
239273
data-option-for-cluster-owens: false,
240274
data-option-for-cluster-kubernetes: false,
241275
data-option-for-cluster-kubernetes-test: false,
242276
data-option-for-cluster-kubernetes-dev: false
243277
]
244278
- [
245279
"3.5.2", "intel/18.0.4 R/3.5.2 rstudio/1.1.456 texlive",
280+
data-option-for-cluster-ascend: false,
246281
data-option-for-cluster-owens: false,
247282
data-option-for-cluster-kubernetes: false,
248283
data-option-for-cluster-kubernetes-test: false,
249284
data-option-for-cluster-kubernetes-dev: false
250285
]
251286
- [
252287
"3.5.1", "intel/18.0.4 R/3.5.1 rstudio/1.1.456 texlive",
288+
data-option-for-cluster-ascend: false,
253289
data-option-for-cluster-owens: false,
254290
data-option-for-cluster-kubernetes: false,
255291
data-option-for-cluster-kubernetes-test: false,
256292
data-option-for-cluster-kubernetes-dev: false
257293
]
258294
- [
259295
"3.5.0", "intel/18.0.3 R/3.5.0 rstudio/1.1.380_server texlive",
296+
data-option-for-cluster-ascend: false,
260297
data-option-for-cluster-pitzer: false,
261298
data-option-for-cluster-kubernetes: false,
262299
data-option-for-cluster-kubernetes-test: false,
263300
data-option-for-cluster-kubernetes-dev: false
264301
]
265302
- [
266303
"3.4.2", "intel/16.0.3 R/3.4.2 rstudio/1.1.380_server texlive",
304+
data-option-for-cluster-ascend: false,
267305
data-option-for-cluster-pitzer: false,
268306
data-option-for-cluster-kubernetes: false,
269307
data-option-for-cluster-kubernetes-test: false,
270308
data-option-for-cluster-kubernetes-dev: false
271309
]
272310
- [
273311
"3.3.2", "intel/16.0.3 R/3.3.2 rstudio/1.0.136_server texlive",
312+
data-option-for-cluster-ascend: false,
274313
data-option-for-cluster-pitzer: false,
275314
data-option-for-cluster-kubernetes: false,
276315
data-option-for-cluster-kubernetes-test: false,

‎submit.yml.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ batch_connect:
3939
template: "basic"
4040
conn_params:
4141
- csrf_token
42-
<% if cluster =~ /owens|pitzer/ -%>
42+
<% if cluster =~ /owens|pitzer|ascend/ -%>
4343
script:
4444
accounting_id: "<%= account %>"
4545
<% if node_type =~ /gpu/ -%>

‎template/script.sh.erb

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
session_dir = session.staged_root
55
tutorial_dir = session.staged_root.join('ParallelR')
66

7-
match = /^app_rstudio_server\/(.+)$|.+ R\/(.+) .+/.match(context.version)
7+
match = /^app_rstudio_server\/(.+)$|.+ R\/(.+)/.match(context.version)
88
r_version = match[1] unless match[1].nil?
99
r_version = match[2] unless match[2].nil?
1010

@@ -24,8 +24,8 @@ setup_env () {
2424
# APPTAINER_BINDPATH is being used to bind all RStudio's requirements from
2525
# the host into the guest, and so those values may vary between sites.
2626

27-
module load xalt/latest ondemand
28-
<%- if context.cluster !~ /kubernetes/ -%>
27+
module load xalt/latest project/ondemand
28+
<%- if context.cluster !~ /kubernetes|ascend/ -%>
2929
module load rstudio_launcher/centos7
3030
<%- end -%>
3131
module load <%= context.version %>
@@ -134,6 +134,9 @@ echo "Starting up rserver... at $(date)"
134134
export APPTAINERENV_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
135135
export SINGULARITYENV_LD_LIBRARY_PATH="$APPTAINERENV_LD_LIBRARY_PATH"
136136

137+
export APPTAINERENV_PATH="$PATH:/usr/lib/rstudio-server/bin"
138+
export SINGULARITYENV_PATH="$PATH:/usr/lib/rstudio-server/bin"
139+
137140
<%- if context.cluster !~ /kubernetes/ -%>
138141
# --contain is used to override the bindpaths specified in OSC's
139142
# singularity.conf which would otherwise conflict in /etc

0 commit comments

Comments
 (0)