conflict resolved

This commit is contained in:
2019-01-08 10:56:09 +01:00
15 changed files with 143 additions and 82 deletions

View File

@@ -4,7 +4,6 @@ pbuild::set_download_url \
"https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${V_MAJOR}.${V_MINOR}/hdf5-$V/src/hdf5-$V.tar.bz2"
pbuild::add_to_group 'Compiler'
pbuild::install_docfiles ACKNOWLEDGMENTS
pbuild::install_docfiles COPYING
pbuild::install_docfiles MANIFEST
@@ -45,5 +44,3 @@ pbuild::pre_configure() {
pbuild::add_configure_args "--enable-fortran"
fi
}

View File

@@ -45,9 +45,12 @@ hdf5_serial/1.8.19 stable gcc/5.4.0
hdf5_serial/1.8.19 stable gcc/6.3.0
hdf5_serial/1.8.19 stable gcc/7.2.0
hdf5_serial/1.8.20 stable gcc/4.8.5
hdf5_serial/1.8.20 stable gcc/5.5.0
hdf5_serial/1.8.20 stable gcc/6.4.0
hdf5_serial/1.8.20 stable gcc/7.3.0
hdf5_serial/1.8.20 stable gcc/8.2.0
hdf5_serial/1.8.20 stable intel/18.4
hdf5_serial/1.10.1 stable gcc/4.8.5
hdf5_serial/1.10.1 stable gcc/4.9.4
@@ -72,3 +75,12 @@ hdf5_serial/1.10.2 stable gcc/7.3.0
hdf5_serial/1.10.2 stable intel/18.2
hdf5_serial/1.10.2 unstable pgi/18.5
hdf5_serial/1.10.2 stable intel/18.3
hdf5_serial/1.10.3 stable gcc/4.8.5
hdf5_serial/1.10.3 stable gcc/5.5.0
hdf5_serial/1.10.3 stable gcc/6.4.0
hdf5_serial/1.10.3 stable gcc/7.3.0
hdf5_serial/1.10.3 stable gcc/8.2.0
hdf5_serial/1.10.3 stable intel/18.4
hdf5_serial/1.10.4 stable gcc/7.3.0

View File

@@ -14,6 +14,8 @@ openmpi/3.1.1 stable gcc/8.1.0
openmpi/3.1.1 stable gcc/8.2.0
openmpi/3.1.2 stable gcc/7.3.0
openmpi/3.1.2 stable gcc/8.2.0
openmpi/3.1.2 stable intel/18.4
openmpi/3.1.3 stable gcc/4.8.5
openmpi/3.1.3 stable gcc/5.5.0

View File

@@ -0,0 +1,2 @@
gromacs/2018.3_sp unstable gcc/8.2.0 openmpi/3.1.1 Python/2.7.14 b:cmake/3.9.6
gromacs/2018.3_dp unstable gcc/8.2.0 openmpi/3.1.1 Python/2.7.14 b:cmake/3.9.6

View File

@@ -3,17 +3,19 @@
pbuild::set_download_url "http://ftp.gromacs.org/pub/$P/$P-${V_PKG}.tar.gz"
pbuild::add_to_group 'MPI'
pbuild::install_docfiles \
AUTHORS \
COPYING \
README
pbuild::install_docfiles ACKNOWLEDGMENTS COPYING MANIFEST README.txt
pbuild::pre_configure() {
pbuild::add_configure_args "-DCMAKE_BUILD_TYPE=RELEASE"
pbuild::add_configure_args "-DGMX_MPI=on"
pbuild::add_configure_args "-DGMX_GPU=off"
pbuild::add_configure_args "-DGMX_SIMD=SSE2"
if pbuild::use_flag dp ; then
pbuild::add_configure_args "-DGFMX_DOUBLE=on"
else # pbuild::use_flag sp
pbuild::add_configure_args "-DGFMX_DOUBLE=off"
fi
pbuild::add_configure_args "-DGMX_GPU=off"
# To remove: pbuild::add_configure_args "-DGMX_SIMD=SSE2"
pbuild::add_configure_args "-DGMX_BUILD_OWN_FFTW=on"
}

View File

@@ -3,7 +3,7 @@
module-whatis "GROMACS is a versatile package to perform molecular dynamics"
module-url "http://www.gromacs.org/"
module-license "See PREFIX/share/doc/COPYING"
module-maintainer "Antonio Benedetto <antonio.benedetto@psi.ch>"
module-maintainer "Marc Caubet <marc.caubet@psi.ch>"
module-help "
GROMACS is a versatile package to perform molecular dynamics, i.e. simulate
the Newtonian equations of motion for systems with hundreds to millions of
@@ -15,4 +15,3 @@ GROMACS is extremely fast at calculating the nonbonded interactions (that
usually dominate simulations) many groups are also using it for research on
non-biological systems, e.g. polymers.
"

View File

@@ -1 +1,3 @@
lammps/2018.3 unstable gcc/7.3.0 openmpi/3.0.1
lammps/2018.3 unstable gcc/7.3.0 openmpi/3.0.1
lammps/2018.3_merlin unstable gcc/8.2.0 openmpi/3.1.1 b:cmake/3.9.6
lammps/2018.11_merlin unstable gcc/8.2.0 openmpi/3.1.1 Python/2.7.14 b:cmake/3.9.6

View File

@@ -1,25 +1,80 @@
#!/usr/bin/env modbuild
# pbuild::set_download_url "https://gitlab.psi.ch/caubet_m/merlin-software/raw/master/$P/$P-${V_PKG}.tar.gz"
pbuild::set_download_url "https://github.com/lammps/lammps/archive/patch_15Nov2018.tar.gz"
pbuild::add_to_group 'MPI'
pbuild::set_download_url https://gitlab.psi.ch/Pmodules/download/raw/master/$P-$V.tar.gz
pbuild::install_docfiles \
LICENSE \
README
pbuild::install_docfiles README LICENSE
pbuild::compile_in_sourcetree
# pbuild::pre_configure() {
# pbuild::add_configure_args "-D CMAKE_BUILD_TYPE=RELEASE"
#
# pbuild::add_configure_args "-D BUILD_MPI=yes"
# pbuild::add_configure_args "-D BUILD_OMP=yes"
# pbuild::add_configure_args "-D PKG_USER-OMP=yes"
# pbuild::add_configure_args "-D PKG_BODY=yes"
# pbuild::add_configure_args "-D PKG_DIPOLE=yes"
# pbuild::add_configure_args "-D PKG_MOLECULE=yes"
# pbuild::add_configure_args "-D PKG_MPIIO=yes"
# pbuild::add_configure_args "-D PKG_REPLICA=yes"
# # pbuild::add_configure_args "-D PKG_REAX=yes"
# pbuild::add_configure_args "-D PKG_RIGID=yes"
# pbuild::add_configure_args "-D PKG_USER-REAXC=yes"
#
# }
# pbuild::configure() {
# cp -v "${BUILDBLOCK_DIR}/files/Makefile.PSI" "${BUILD_DIR}/src/MAKE/MINE"
# }
#
pbuild::configure() {
cp -v "${BUILDBLOCK_DIR}/files/Makefile.PSI" "${BUILD_DIR}/src/MAKE/MINE"
sed -i '/^CCFLAGS.*/ s/$/ -fopenmp/' ${BUILD_DIR}/src/MAKE/Makefile.mpi
sed -i '/^LINKFLAGS.*/ s/$/ -fopenmp/' ${BUILD_DIR}/src/MAKE/Makefile.mpi
}
pbuild::compile() {
make -C src PSI
echo BEGIN COMPILE
cd src
# make clean-all
# make no-all
make yes-user-omp
make yes-asphere
make yes-body
make yes-compress
make yes-coreshell
make yes-dipole
make yes-granular
make yes-manybody
make yes-kspace
make yes-mc
make yes-misc
make yes-molecule
make yes-mpiio
make yes-opt
make yes-python
make yes-replica
make yes-rigid
make yes-snap
make yes-user-eff
make yes-user-drude
make yes-user-reaxc
make yes-user-reaxc args="-m serial"
make yes-user-reaxc args="-m mpi"
make mpi
echo ENDCOMPILE
}
pbuild::install() {
install -m 0755 -d "${PREFIX}/bin"
install -m 0755 "${BUILD_DIR}/src/lmp_PSI" "${PREFIX}/bin/lmp_omp"
strip "${PREFIX}/bin/lmp_omp"
# Modify this for installing individual binaries
install -m 0755 "${BUILD_DIR}/src/lmp_mpi" "${PREFIX}/bin/"
# Strip all present binaries
for file in $(ls ${PREFIX}/bin/lmp_*)
do
strip "$file"
done
}
pbuild::make_all

View File

@@ -1,22 +1,12 @@
#%Module1.0
module-whatis "an accelerator modeling code th"
module-url "http://www.aps.anl.gov/Accelerator_Systems_Division/Accelerator_Operations_Physics/elegant.html"
module-license "See: http://www.aps.anl.gov/epics/license/index.php"
module-maintainer "Achim Gsell <achim.gsell@psi.ch>"
module-whatis "An accelerator modeling code th"
module-url "https://lammps.sandia.gov/"
module-license "See: https://lammps.sandia.gov/doc/Intro_opensource.html"
module-maintainer "Marc Caubet Serrabou <marc.caubet@psi.ch>"
module-help "
elegant is an accelerator modeling code that performs many functions. Its
basic function is 6D tracking, which it performs using matrices (up to
second order), symplectic integration, numerical integration, or a user-
defined mixture. It computes Twiss parameters, transport matrices, radiation
integrals, correction matrices, amplification factors, and floor coordinates.
It also performs optimization, including optimization of radiation integrals,
floor coordinates, transport matrices, and beam properties from tracking. A
number of time-dependent elements are supported, such as rf cavities, kickers,
and ramping machines. The code provides simulation of various collective
effects, such as wakes and coherent synchrotron radiation.
"
LAMMPS is a classical molecular dynamics (MD) code that models ensembles of particles in a liquid, solid, or gaseous state. It can model atomic, polymeric, biological, solid-state (metals, ceramics, oxides), granular, coarse-grained, or macroscopic systems using a variety of interatomic potentials (force fields) and boundary conditions. It can model 2d or 3d systems with only a few particles up to millions or billions. LAMMPS can be built and run on a laptop or desktop machine, but is designed for parallel computers. It will run on any parallel machine that supports the MPI message-passing library. This includes shared-memory boxes and distributed-memory clusters and supercomputers. LAMMPS is written in C++. Earlier versions were written in F77 and F90. See the History page of the website for details. All versions can be downloaded from the LAMMPS website. LAMMPS is designed to be easy to modify or extend with new capabilities, such as new force fields, atom types, boundary conditions, or diagnostics. See the Modify doc page for more details. In the most general sense, LAMMPS integrates Newtons equations of motion for a collection of interacting particles. A single particle can be an atom or molecule or electron, a coarse-grained cluster of atoms, or a mesoscopic or macroscopic clump of material. The interaction models that LAMMPS includes are mostly short-range in nature; some long-range models are included as well. LAMMPS uses neighbor lists to keep track of nearby particles. The lists are optimized for systems with particles that are repulsive at short distances, so that the local density of particles never becomes too large. This is in contrast to methods used for modeling plasma or gravitational bodies (e.g. galaxy formation). On parallel machines, LAMMPS uses spatial-decomposition techniques to partition the simulation domain into small sub-domains of equal computational cost, one of which is assigned to each processor. Processors communicate and store “ghost” atom information for atoms that border their sub-domain."
setenv RPN_DEFNS $PREFIX/RPN-DEFNS
setenv HOST_ARCH linux-x86_64

1
MPI/qe/6/variants Normal file
View File

@@ -0,0 +1 @@
qe/6.3 unstable gcc/8.2.0 openmpi/3.1.1 b:cmake/3.9.6

32
MPI/qe/build Executable file
View File

@@ -0,0 +1,32 @@
#!/usr/bin/env modbuild
pbuild::set_download_url "https://github.com/QEF/q-e/archive/$P-$V.tar.gz"
echo "https://github.com/QEF/q-e/archive/$P-$V.tar.gz"
pbuild::add_to_group 'MPI'
pbuild::install_docfiles License README.md CONTRIBUTING.md
pbuild::compile_in_sourcetree
pbuild::configure() {
mkdir -p ${PREFIX}
./configure -enable-openmp --with-prefix="${PREFIX}/bin" --prefix="${PREFIX}/bin"
}
pbuild::compile() {
make all
}
pbuild::install() {
# Due to bug in: https://gitlab.com/QEF/q-e/commit/88e6558646dbbcfcafa5f3fa758217f6062ab91c.diff
# Deploying custom install procedure
mkdir -p ${PREFIX}/bin
cd ${BUILD_DIR}
for x in `find * ! -path "test-suite/*" -name *.x -type f` ; do
cp $x ${PREFIX}/bin/
done
echo 'Quantum ESPRESSO binaries installed in ${PREFIX}/bin'
# make install
}

9
MPI/qe/modulefile Normal file
View File

@@ -0,0 +1,9 @@
#%Module1.0
module-whatis "is an integrated suite of Open-Source computer codes for electronic-structure calculations and materials modeling at the nanoscale. It is based on density-functional theory, plane waves, and pseudopotentials."
module-url "https://www.quantum-espresso.org"
module-license "See PREFIX/share/doc/COPYING"
module-maintainer "Marc Caubet <marc.caubet@psi.ch>"
module-help "
QUANTUM ESPRESSOR is an integrated suite of Open-Source computer codes for electronic-structure calculations and materials modeling at the nanoscale. It is based on density-functional theory, plane waves, and pseudopotentials.
"

View File

@@ -1,21 +0,0 @@
#!/usr/bin/env modbuild
pbuild::set_download_url "http://ftp.gromacs.org/pub/$P/$P-${V_PKG}.tar.gz"
pbuild::add_to_group 'SandBox'
pbuild::install_docfiles ACKNOWLEDGMENTS COPYING MANIFEST README.txt
pbuild::pre_configure() {
pbuild::add_configure_args "-DCMAKE_BUILD_TYPE=RELEASE"
pbuild::add_configure_args "-DGMX_MPI=on"
if pbuild::use_flag dp ; then
pbuild::add_configure_args "-DGFMX_DOUBLE=on"
fi
if pbuild::use_flag sp ; then
pbuild::add_configure_args "-DGFMX_DOUBLE=off"
fi
pbuild::add_configure_args "-DGMX_GPU=off"
pbuild::add_configure_args "-DGMX_BUILD_OWN_FFTW=on"
}

View File

@@ -1,3 +0,0 @@
gromacs/2018.3_dp unstable gcc/8.2.0 openmpi/3.1.1 Python/2.7.14 b:cmake/3.9.6
gromacs/2018.3_sp unstable gcc/8.2.0 openmpi/3.1.1 Python/2.7.14 b:cmake/3.9.6

View File

@@ -1,18 +0,0 @@
#%Module1.0
module-whatis "GROMACS is a versatile package to perform molecular dynamics"
module-url "http://www.gromacs.org/"
module-license "See PREFIX/share/doc/COPYING"
module-maintainer "Marc Caubet <marc.caubet@psi.ch>"
module-help "
GROMACS is a versatile package to perform molecular dynamics, i.e. simulate
the Newtonian equations of motion for systems with hundreds to millions of
particles.
It is primarily designed for biochemical molecules like proteins, lipids and
nucleic acids that have a lot of complicated bonded interactions, but since
GROMACS is extremely fast at calculating the nonbonded interactions (that
usually dominate simulations) many groups are also using it for research on
non-biological systems, e.g. polymers.
"