Skip to content

Commit 5f87e7d

Browse files
committed
fixes for slurm scheduler
can now submit jobs but for some reason they don't start Reason: Resources
1 parent 89604e0 commit 5f87e7d

File tree

5 files changed

+20
-16
lines changed

5 files changed

+20
-16
lines changed

CHANGELOG.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
# Changelog
22

3-
## Quantum Mobile v18.09.0
3+
## Quantum Mobile v18.10.0
4+
5+
### Improvements
6+
* add link to FAQ on desktop
7+
* switch from torque to slurm scheduler
48

59
### Software updates
610
* Ubuntu 18.04 LTS
711
* Quantum Espresso v6.3
812
* cp2k v6.1
913
* yambo v4.2.4
14+
* fleur 0.27 MaXR3
1015
* siesta v4.0.2
1116
* aiida-core v0.12.2
1217
* aiidalab v18.09.0
13-
14-
15-
### Improvements
16-
* add link to FAQ on desktop
18+
* aiida-fleur v0.6.2
1719

1820
### Build process
1921
* Vagrant v2.1.6

globalconfig.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# Caution: This file is read by vagrant, ansible and bash
3-
vm_version: "18.08.0"
3+
vm_version: "18.10.0"
44
vm_name: "Quantum Mobile"
55
vm_description: "A Virtual Machine for Computational Materials Science"
66
vm_url: "https://github.com/marvel-nccr/marvel-virtualmachine"

playbook.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
add_user_password: "{{ vm_password }}"
2828
add_user_sudo: True
2929

30-
# Note: it is important to pass variables to roles within a 'vars' group
31-
# If they are passed on the same indentation level as the role, the variable is
30+
# Note: it is important to pass variables to roles using the 'vars' dictionary.
31+
# If variables are passed on the same indentation level as the role, the variable is
3232
# set correctly inside the role, but following roles will read the *default*
3333
# value of the variable (as defined inside the role).
3434
- name: set up the VM
@@ -78,14 +78,13 @@
7878
tags: slurm
7979
vars:
8080
slurm_hostname: "{{ vm_hostname }}"
81-
slurm_user: "{{ vm_user }}"
8281
slurm_cpus: "{{ vm_cpus }}"
8382
slurm_memory: "{{ vm_memory }}"
84-
# - role: marvel-nccr.torque
85-
# tags: torque
86-
# vars:
87-
# torque_hostname: "{{ vm_hostname }}"
88-
# torque_cpus: "{{ vm_cpus }}"
83+
- role: marvel-nccr.torque
84+
tags: torque
85+
vars:
86+
torque_hostname: "{{ vm_hostname }}"
87+
torque_cpus: "{{ vm_cpus }}"
8988
- role: marvel-nccr.quantum-espresso
9089
tags: quantum_espresso
9190
vars:

requirements.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
ansible>=2.6
1+
ansible>=2.7
22
passlib
33
sphinx>=1.5
44
paramiko
5+
# for testing
6+
molecule
7+
docker

requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
version: master
2626
- src: marvel-nccr.add-user
2727
version: master
28-
- src: marvel-nccr.torque
28+
- src: marvel-nccr.slurm
2929
version: master
3030
- src: marvel-nccr.aiida
3131
version: master

0 commit comments

Comments
 (0)