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

👌 IMPROVE: add siesta_build_cpus #14

Merged
merged 8 commits into from
Dec 6, 2020
Merged

👌 IMPROVE: add siesta_build_cpus #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
91b7e51
👌 IMPROVE: add `siesta_build_cpus`
chrisjsewell Dec 6, 2020
2168256
Update siesta.yml
chrisjsewell Dec 6, 2020
0c79aa4
Update tests.yml
chrisjsewell Dec 6, 2020
f9559e4
Update gridxc-multi.yml
chrisjsewell Dec 6, 2020
ec245f6
Update libpsml.yml
chrisjsewell Dec 6, 2020
5b6c60d
Apply suggestions from code review
chrisjsewell Dec 6, 2020
500e67b
Update molecule.yml
chrisjsewell Dec 6, 2020
30a43d8
remove hardcoded `libxc_build_cpus`
chrisjsewell Dec 6, 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
1 change: 1 addition & 0 deletions defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ siesta_enable_ncdf: "1"
siesta_enable_flook: "1"

#
siesta_build_cpus: 2
run_tests: true
#--------------------------
#
Expand Down
2 changes: 2 additions & 0 deletions molecule/default/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,5 @@ provisioner:
vars:
ansible_python_interpreter: /usr/bin/python3
run_tests: true
libxc_build_cpus: 2
siesta_build_cpus: 2
4 changes: 2 additions & 2 deletions tasks/gridxc-multi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
creates: "{{ siesta_libgridxc_topdir }}/build_dp/Makefile"

- name: Make libgridxc dp
shell: "make"
shell: "make -j{{ siesta_build_cpus }}"
args:
chdir: "{{ siesta_libgridxc_topdir }}/build_dp"
creates: "{{ siesta_libgridxc_topdir }}/build_dp/src/libgridxc_dp.la"
Expand All @@ -70,7 +70,7 @@
creates: "{{ siesta_libgridxc_topdir }}/build_mpi_dp/Makefile"

- name: Make libgridxc mpi_dp
shell: "make"
shell: "make -j{{ siesta_build_cpus }}"
args:
chdir: "{{ siesta_libgridxc_topdir }}/build_mpi_dp"
creates: "{{ siesta_libgridxc_topdir }}/build_mpi_dp/src/libgridxc_dp_mpi.la"
Expand Down
2 changes: 1 addition & 1 deletion tasks/libpsml.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@


- name: Make libpsml
command: make
command: make -j{{ siesta_build_cpus }}
args:
chdir: "{{ siesta_libpsml_topdir }}"
creates: "{{ siesta_libpsml_topdir }}/src/libpsml.la"
Expand Down
1 change: 0 additions & 1 deletion tasks/libxc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
name: marvel-nccr.libxc
vars:
libxc_version: "{{ siesta_libxc_version }}"
libxc_build_cpus: 1
when: not libxc_installation.stat.exists

# Here we disable shared libraries because the current libxc role does not build them,
Expand Down
2 changes: 1 addition & 1 deletion tasks/siesta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
dest: "{{ siesta_topdir }}/Obj/arch.make"

- name: Make siesta executable
command: make
command: make -j{{ siesta_build_cpus }}
args:
chdir: "{{ siesta_topdir }}/Obj"
creates: "{{ siesta_topdir }}/Obj/siesta"
Expand Down
2 changes: 1 addition & 1 deletion tasks/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
when: siesta_enable_flook | bool

- name: run siesta tests
shell: make clean; make MPI='mpirun --oversubscribe -np 2' check
shell: make clean; make MPI='mpirun --oversubscribe -np {{ siesta_build_cpus }}' check
args:
chdir: "{{ siesta_topdir }}/Obj/Tests/{{ item }}"
with_items: "{{ siesta_all_tests }}"
Expand Down