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.
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
lammps: update, hoomd-blue, dl_poly: init #46667
Conversation
a696517
to
15a1c6a
Compare
15a1c6a
to
e37b316
Compare
pkgs/applications/science/molecular-dynamics/hoomd-blue/default.nix
Outdated
Show resolved
Hide resolved
inherit components mpi; | ||
}; | ||
|
||
buildInputs = [ cmake stdenv pkgconfig ] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pkgconfig
and cmake
should be in nativeBuildInputs
. No need to put stdenv
to build inputs.
The line should then read nativeBuildInputs = [ cmake pkgconfig ];
mpi goes into buildInputs
.
pkgs/applications/science/molecular-dynamics/hoomd-blue/default.nix
Outdated
Show resolved
Hide resolved
platforms = stdenv.lib.platforms.linux; | ||
maintainers = with lib.maintainers; [ costrouc ]; | ||
license = licenses.gpl2; | ||
platforms = [ "x86_64-linux" ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The previous version actual did build on aarch64
. I guess we could leave it as platforms.linux
and see if it builds on arm.
|
||
installPhase = '' | ||
mkdir -p $out/bin |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A single mkdir
line should also work here: mkdir -p $out/bin $out/include $out/lib
.
As general comment (for the future): One could break that PR up into two or three PRs (at least the update as separate PR). |
e37b316
to
268b7ac
Compare
@markuskowa the changes have been made. The reason why I am responding to the conversations on the code review in a single comment. Is that when I rebase with git (to keep it to only a few commits). Github completely looses track of where you made the comment. Is there a way around this?
Components in hoomd-blue are a set of features to include with the installation. The components are included within the git repository. Here is the documenation for one of the componenets https://hoomd-blue.readthedocs.io/en/stable/package-hpmc.html. |
@GrahamcOfBorg build lammps lammps-mpi dl-poly-classic-mpi pythonPackages36.hoomd-blue pythonPackages36.hoomd-blue-mpi |
pkgs/top-level/all-packages.nix
Outdated
mpi = openmpi; | ||
}; | ||
|
||
# hoomd-blue in python-packages.nix |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That line can be deleted?
Thanks for the explanation. I think I understand what the purpose of the |
Success on x86_64-linux (full log) Attempted: lammps, lammps-mpi, dl-poly-classic-mpi The following builds were skipped because they don't evaluate on x86_64-linux: pythonPackages36.hoomd-blue, pythonPackages36.hoomd-blue-mpi Partial log (click to expand)
|
Success on aarch64-linux (full log) Attempted: lammps The following builds were skipped because they don't evaluate on aarch64-linux: lammps-mpi, dl-poly-classic-mpi, pythonPackages36.hoomd-blue, pythonPackages36.hoomd-blue-mpi Partial log (click to expand)
|
@GrahamcOfBorg build python36Packages.hoomd-blue, python36Packages.hoomd-blue-mpi |
No attempt on aarch64-linux (full log) The following builds were skipped because they don't evaluate on aarch64-linux: python36Packages.hoomd-blue,, python36Packages.hoomd-blue-mpi Partial log (click to expand)
|
Failure on x86_64-linux (full log) Attempted: python36Packages.hoomd-blue-mpi The following builds were skipped because they don't evaluate on x86_64-linux: python36Packages.hoomd-blue, Partial log (click to expand)
|
pkgs/applications/science/molecular-dynamics/hoomd-blue/default.nix
Outdated
Show resolved
Hide resolved
pkgs/applications/science/molecular-dynamics/hoomd-blue/default.nix
Outdated
Show resolved
Hide resolved
pkgs/applications/science/molecular-dynamics/hoomd-blue/default.nix
Outdated
Show resolved
Hide resolved
pkgs/top-level/python-packages.nix
Outdated
@@ -322,6 +322,12 @@ in { | |||
|
|||
habanero = callPackage ../development/python-modules/habanero { }; | |||
|
|||
hoomd-blue = callPackage ../applications/science/molecular-dynamics/hoomd-blue { }; | |||
|
|||
hoomd-blue-mpi = callPackage ../applications/science/molecular-dynamics/hoomd-blue { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need this attribute when one can also just override?
268b7ac
to
758c612
Compare
All requested changes have been made. I have tested that hoomd works properly with a few of the example scripts. https://nbviewer.jupyter.org/github/joaander/hoomd-examples/blob/master/index.ipynb |
758c612
to
2031018
Compare
Rebased. @markuskowa with your approval this is ready for a merge. We will need to test rebuilding of |
I guess it needs another rebase. |
only mpi version provided
nix derivation was cleaned significantly to follow nixpkgs better
2031018
to
77bab99
Compare
Wow a merge conflict in less than 8 hours, that's some good luck. Fixed now. |
@GrahamcOfBorg build python36Packages.hoomd-blue |
No attempt on aarch64-linux (full log) The following builds were skipped because they don't evaluate on aarch64-linux: python36Packages.hoomd-blue Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: python36Packages.hoomd-blue Partial log (click to expand)
|
@FRidh Are you OK with the changes? |
Bump. Ready for merge following your approval @FRidh. I have verified all of the packages to build properly. |
77bab99
to
ae66a92
Compare
@FRidh changes have been made and ready for merge. |
Success on x86_64-linux (full log) Attempted: lammps Partial log (click to expand)
|
Success on aarch64-linux (full log) Attempted: lammps Partial log (click to expand)
|
Bump. Ready for merge. |
Motivation for this change
Adding molecular dynamics codes that our group uses at UTK. Hoomd-blue is the most interesting addition. While I have not added GPU support it is mpi enabled and a fun code to work with. I do not have enough experience packaging with GPUs yet (maybe will be packaged at a future date). Scales to 10K GPUs according to benchmarks.
Would like to request @markuskowa for review.
Things done
lammps: patch_2Aug2018 -> stable_22Aug2018
dl-poly-classic: init 1.10
hoomd-blue: init at 2.3.4
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)