From 5e3fe19c9f991a8f1ffde16efb6d40a5c53aa42f Mon Sep 17 00:00:00 2001 From: tomswinburne Date: Tue, 29 Jun 2021 10:48:19 +0200 Subject: [PATCH] revert --- python/lammps/core.py | 11 ++++------- src/MAKE/Makefile.mpi | 6 +++--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/python/lammps/core.py b/python/lammps/core.py index ea038c0920..d26726b176 100644 --- a/python/lammps/core.py +++ b/python/lammps/core.py @@ -123,17 +123,14 @@ class lammps(object): lib_ext = ".dll" modpath = winpath else: - """ import platform - if platform.system() == "Darwin": # this flags an error on MacOSX + if platform.system() == "Darwin": lib_ext = ".dylib" elif platform.system() == "Windows": lib_ext = ".dll" else: lib_ext = ".so" - """ - lib_ext = ".so" - + if not self.lib: if name: libpath = join(modpath,"liblammps_%s" % name + lib_ext) @@ -1573,8 +1570,8 @@ class lammps(object): """Return a string with detailed information about any devices that are usable by the GPU package. - This is a wrapper around the :cpp:func:`lammps_get_gpu_device_info` - function of the C-library interface. + This is a wrapper around the :cpp:func:`lammps_get_gpu_device_info` + function of the C-library interface. :return: GPU device info string :rtype: string diff --git a/src/MAKE/Makefile.mpi b/src/MAKE/Makefile.mpi index 7b06320f52..756c25c7e0 100644 --- a/src/MAKE/Makefile.mpi +++ b/src/MAKE/Makefile.mpi @@ -7,12 +7,12 @@ SHELL = /bin/sh # specify flags and libraries needed for your compiler CC = mpicxx -CCFLAGS = -g -O3 -std=c++11 +CCFLAGS = -g -O3 SHFLAGS = -fPIC DEPFLAGS = -M LINK = mpicxx -LINKFLAGS = -g -O3 -std=c++11 +LINKFLAGS = -g -O3 LIB = SIZE = size @@ -28,7 +28,7 @@ SHLIBFLAGS = -shared -rdynamic # LAMMPS ifdef settings # see possible settings in Section 3.5 of the manual -LMP_INC = -DLAMMPS_GZIP -DLAMMPS_MEMALIGN=64 -DLAMMPS_EXCEPTIONS +LMP_INC = -DLAMMPS_GZIP -DLAMMPS_MEMALIGN=64 # -DLAMMPS_CXX98 # MPI library # see discussion in Section 3.4 of the manual