commit lammps for openSUSE:Factory

Hello community, here is the log from the commit of package lammps for openSUSE:Factory checked in at 2017-11-07 09:58:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lammps (Old) and /work/SRC/openSUSE:Factory/.lammps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lammps" Tue Nov 7 09:58:06 2017 rev:4 rq:538873 version:20171023 Changes: -------- --- /work/SRC/openSUSE:Factory/lammps/lammps.changes 2017-10-27 14:01:42.251224092 +0200 +++ /work/SRC/openSUSE:Factory/.lammps.new/lammps.changes 2017-11-07 09:58:24.353414845 +0100 @@ -1,0 +2,6 @@ +Sat Nov 4 00:21:36 UTC 2017 - junghans@votca.org + +- enable GPU support via OpenCL +- added 30b482975a6a29db2265b44c4f27d6293eacb72f.patch + +------------------------------------------------------------------- New: ---- 30b482975a6a29db2265b44c4f27d6293eacb72f.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lammps.spec ++++++ --- /var/tmp/diff_new_pack.jZ78pI/_old 2017-11-07 09:58:28.697257255 +0100 +++ /var/tmp/diff_new_pack.jZ78pI/_new 2017-11-07 09:58:28.697257255 +0100 @@ -25,6 +25,8 @@ Group: Productivity/Scientific/Chemistry Url: http://lammps.sandia.gov Source0: https://github.com/lammps/lammps/archive/%{uversion}.tar.gz#/%{name}-%{uversion}.tar.gz +# PATCH-FIX-UPSTREAM 30b482975a6a29db2265b44c4f27d6293eacb72f.patch - lje_gpu_reinit: added missing return code +Patch0: https://github.com/lammps/lammps/commit/30b482975a6a29db2265b44c4f27d6293eac... BuildRequires: fftw3-devel BuildRequires: gcc-c++ BuildRequires: gcc-fortran @@ -37,6 +39,8 @@ BuildRequires: zlib-devel BuildRequires: gsl-devel BuildRequires: cmake +BuildRequires: opencl-headers +BuildRequires: ocl-icd-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -114,11 +118,12 @@ %prep %setup -q -n %{name}-%{uversion} +%patch0 -p1 %build source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh -%{cmake} -DENABLE_ALL=ON -DENABLE_MPI=ON -DENABLE_PYTHON=ON -DENABLE_TESTING=ON -DENABLE_VORONOI=ON -DFFT=FFTW3 ../cmake +%{cmake} -DENABLE_ALL=ON -DENABLE_MPI=ON -DENABLE_PYTHON=ON -DENABLE_TESTING=ON -DENABLE_VORONOI=ON -DENABLE_GPU=ON -DGPU_API=OpenCL -DFFT=FFTW3 ../cmake make %{?_smp_mflags} %install ++++++ 30b482975a6a29db2265b44c4f27d6293eacb72f.patch ++++++

From 30b482975a6a29db2265b44c4f27d6293eacb72f Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Fri, 3 Nov 2017 18:22:28 -0600 Subject: [PATCH] lje_gpu_reinit: added missing return code

--- lib/gpu/lal_lj_expand_ext.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/gpu/lal_lj_expand_ext.cpp b/lib/gpu/lal_lj_expand_ext.cpp index 94a57192b9..1aa9dff222 100644 --- a/lib/gpu/lal_lj_expand_ext.cpp +++ b/lib/gpu/lal_lj_expand_ext.cpp @@ -110,6 +110,7 @@ int lje_gpu_reinit(const int ntypes, double **cutsq, double **host_lj1, offset, shift); LJEMF.device->gpu_barrier(); } + return 0; } void lje_gpu_clear() {