Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.15 bugfixes #49

Merged
merged 4 commits into from
Sep 21, 2020
Merged

0.15 bugfixes #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fb03e9
fix broken links in help message
johrstrom Sep 21, 2020
c7d161a
show version in production deployments
johrstrom Sep 21, 2020
8fbc68c
change ppn variable to cores
johrstrom Sep 21, 2020
4164677
fix owens hugemem
johrstrom Sep 21, 2020
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
6 changes: 4 additions & 2 deletions form.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ attributes:
with 48 cores and 1.5 TB of RAM. Pitzer has 4 with 3 TB of RAM and 80 cores.
Pitzer also has 12 Largmem nodes have 48 cores with 768 GB of RAM.

[NVIDIA Tesla P100 GPU]: http://www.nvidia.com/object/tesla-p100.html
[NVIDIA Tesla V100 GPUs]: https://www.nvidia.com/en-us/data-center/v100/
options:
- [
"any", "any",
Expand Down Expand Up @@ -96,8 +98,8 @@ attributes:
]
- [
"hugemem", "hugemem",
data-min-ppn-owens: 40,
data-max-ppn-owens: 40,
data-min-ppn-owens: 48,
data-max-ppn-owens: 48,
data-min-ppn-pitzer: 80,
data-max-ppn-pitzer: 80,
data-option-for-owens: true,
Expand Down
2 changes: 1 addition & 1 deletion packaging/ondemand-bc_osc_rstudio_server.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ DESCRIPTION
%install
%__mkdir_p %{buildroot}%{_localstatedir}/www/ood/apps/sys/%{app_name}
%__cp -a ./. %{buildroot}%{_localstatedir}/www/ood/apps/sys/%{app_name}/

echo v%{version} > %{buildroot}%{_localstatedir}/www/ood/apps/sys/%{app_name}/VERSION

%files
%defattr(-,root,root)
Expand Down
3 changes: 2 additions & 1 deletion submit.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
when "gpu"
":ppn=#{cores}:gpus=1"
when "hugemem"
ppn == 80 ? ":ppn=#{cores},mem=2989GB" : ":ppn=#{cores}"
# disregard what num_cores was submitted (0 or 48 are the only valid options)
":ppn=48"
else
":ppn=#{cores}"
end
Expand Down