Skip to content

Commit 21219ef

Browse files
authored
use ood's dynamic js (#20)
* use ood's dynamic js * add changelog entry
1 parent 3df0c80 commit 21219ef

File tree

3 files changed

+21
-86
lines changed

3 files changed

+21
-86
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
## [0.7.0] - 2021-12-15
9+
10+
### Changed
11+
12+
- Use OnDemand's dynamic javascript capability in [20](https://github.com/OSC/bc_osc_jupyter_spark/pull/20)
13+
814
## [0.6.0] - 2021-08-13
915

1016
### Changed

form.js

Lines changed: 0 additions & 79 deletions
This file was deleted.

form.yml.erb

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ attributes:
3131
widget: "number_field"
3232
value: "1"
3333
min: "1"
34-
max: "48"
34+
max: "28"
3535
label: "Number of workers per node"
3636
help: |
3737
This describes how the cores and memory are divvied up on the node
@@ -48,8 +48,16 @@ attributes:
4848
available RAM as well as 48 cores, or a Pitzer node that has 3TB of available RAM as well as 80 cores.
4949
There are 16 of these nodes on Owens and 4 on Pitzer.
5050
options:
51-
- "any"
52-
- "hugemem"
51+
- [
52+
"any", "any",
53+
data-max-num-workers-for-cluster-owens: 28,
54+
data-max-num-workers-for-cluster-pitzer: 48,
55+
]
56+
- [
57+
"hugemem", "hugemem",
58+
data-max-num-workers-for-cluster-owens: 48,
59+
data-max-num-workers-for-cluster-pitzer: 80,
60+
]
5361
only_driver_on_root:
5462
widget: "check_box"
5563
label: Only launch the driver on the master node.
@@ -69,23 +77,23 @@ attributes:
6977
options:
7078
- [
7179
"2.3.0", "2.3.0",
72-
data-option-for-pitzer: false
80+
data-option-for-cluster-pitzer: false
7381
]
7482
- [
7583
"2.4.5", "2.4.5",
76-
data-option-for-owens: false,
84+
data-option-for-cluster-owens: false,
7785
]
7886
- [
7987
"3.0.1", "3.0.1",
80-
data-option-for-pitzer: false
88+
data-option-for-cluster-pitzer: false
8189
]
8290
version:
8391
widget: "select"
8492
label: "JupyterLab Version"
8593
options:
8694
- [
8795
"3.0", "app_jupyter/3.0.7",
88-
data-option-for-pitzer: false
96+
data-option-for-cluster-pitzer: false
8997
]
9098
- [
9199
"2.2", "app_jupyter/2.2.10",

0 commit comments

Comments
 (0)