Commit 7a44c22b authored by Valentin Reis's avatar Valentin Reis
Browse files

Application updates.

parent c14f0f26
Pipeline #5166 passed with stage
in 1 second
......@@ -3,5 +3,5 @@
"rev": "09fe8a78baf6ba5eaef7d2804f7b653885d60fee",
"date": "2018-02-07T02:03:46-08:00",
"sha256": "1iqdbkg4dm36qskbyfi30w6rw70g2r6mi0qhzavc21338bf4j9hy",
"fetchSubmodules": true
"fetchSubmodules": false
}
{
"url": "https://xgitlab.cels.anl.gov/argo/applications/amg.git",
"rev": "5b453f3080cad9894af26816112c4256e6d867f9",
"date": "2018-12-06T14:01:46-06:00",
"sha256": "1i1526lmxn4p5l0pdvz36685i1nwbvvp10apfwd06j6avxj8wh2n",
"fetchSubmodules": true
"rev": "182582ddd924a0e06d906952e4632c25324a1120",
"date": "2019-02-11T15:51:19-06:00",
"sha256": "16166g7ndlhvy96wg3rr5cf9h7f8lxdpi2xyyrrsls701wiizd09",
"fetchSubmodules": false
}
......@@ -8,7 +8,6 @@
, gzip
, fftw
, openblas
, mpiSupport ? false
, mpi ? null
, libnrm
, nrmSupport ? false
......@@ -18,8 +17,6 @@ let
inherit (stdenv.lib) optional;
in
assert mpiSupport -> mpi != null;
stdenv.mkDerivation rec {
# LAMMPS has weird versioning converted to ISO 8601 format
version = "patch_2Aug2018";
......@@ -41,8 +38,7 @@ stdenv.mkDerivation rec {
inherit mpi;
};
buildInputs = [ fftw libpng openblas gzip bash ]
++ (optional mpiSupport [ mpi ]) ++ (optional nrmSupport libnrm);
buildInputs = [ fftw libpng openblas gzip bash mpi ] ++ (optional nrmSupport libnrm);
# Must do manual build due to LAMMPS requiring a seperate build for
# the libraries and executable
......@@ -54,8 +50,8 @@ stdenv.mkDerivation rec {
chmod -R 755 lammps/src/
cd lammps/src
for pack in ${lammps_packages}; do make "yes-$pack" SHELL=$SHELL; done
make mode=exe ${if mpiSupport then "mpi" else "serial"} SHELL=$SHELL LMP_INC="${lammps_includes}" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
make mode=shlib ${if mpiSupport then "mpi" else "serial"} SHELL=$SHELL LMP_INC="${lammps_includes}" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
make -j 50 mode=exe mpi SHELL=$SHELL LMP_INC="${lammps_includes}" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
make -j 50 mode=shlib mpi SHELL=$SHELL LMP_INC="${lammps_includes}" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
mkdir -p $out/bin
cp -v lmp_* $out/bin/
......
......@@ -3,5 +3,5 @@
"rev": "32e57a2571890b7a2b6628b5d2d4b7b3fae947b8",
"date": "2016-07-27T10:55:31-07:00",
"sha256": "00r88rywxz34chl6whhpjzfbkjnb509qdjzd7bv34wi7bwvw6hwi",
"fetchSubmodules": true
"fetchSubmodules": false
}
{
"url": "https://xgitlab.cels.anl.gov/argo/applications/stream.git",
"rev": "80b58ec15aa2f00ef15dffc8d31a6a3460b4c876",
"date": "2018-11-13T11:24:35-06:00",
"sha256": "0ag8z1b0pvidg6yndfxhh130xdyqclb944qiiazrn6a7f1qn7ham",
"fetchSubmodules": true
"rev": "75cfcac83c0f81dda84d163c04d43d13369b987d",
"date": "2019-02-11T14:05:19-06:00",
"sha256": "01asknhry5wxvibnshd89r1rlrrqrj8yl32b5l3fy0mpwirdjiml",
"fetchSubmodules": false
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment