ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep numpy imports inside of functions

Browse Source
This commit is contained in:
Richard Berger
2020-12-15 18:50:38 -05:00
parent ccb304fa13
commit ac203b3683
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
python/lammps/numpy.py
View File

@ -19,7 +19,6 @@
import warnings import warnings
from ctypes import POINTER, c_double, c_int, c_int32, c_int64, cast from ctypes import POINTER, c_double, c_int, c_int32, c_int64, cast
import numpy as np
from .constants import * from .constants import *
from .data import NeighList from .data import NeighList
@ -46,6 +45,7 @@ class numpy_wrapper:
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
def _ctype_to_numpy_int(self, ctype_int): def _ctype_to_numpy_int(self, ctype_int):
import numpy as np
if ctype_int == c_int32: if ctype_int == c_int32:
return np.int32 return np.int32
elif ctype_int == c_int64: elif ctype_int == c_int64:
@ -240,6 +240,7 @@ class numpy_wrapper:
:return: the requested data or None :return: the requested data or None
:rtype: c_double, numpy.array, or NoneType :rtype: c_double, numpy.array, or NoneType
""" """
import numpy as np
value = self.lmp.extract_variable(name, group, vartype) value = self.lmp.extract_variable(name, group, vartype)
if vartype == LMP_VAR_ATOM: if vartype == LMP_VAR_ATOM:
return np.ctypeslib.as_array(value) return np.ctypeslib.as_array(value)
@ -283,6 +284,7 @@ class numpy_wrapper:
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
def iarray(self, c_int_type, raw_ptr, nelem, dim=1): def iarray(self, c_int_type, raw_ptr, nelem, dim=1):
import numpy as np
np_int_type = self._ctype_to_numpy_int(c_int_type) np_int_type = self._ctype_to_numpy_int(c_int_type)
if dim == 1: if dim == 1:
@ -297,6 +299,7 @@ class numpy_wrapper:
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
def darray(self, raw_ptr, nelem, dim=1): def darray(self, raw_ptr, nelem, dim=1):
import numpy as np
if dim == 1: if dim == 1:
ptr = cast(raw_ptr, POINTER(c_double * nelem)) ptr = cast(raw_ptr, POINTER(c_double * nelem))
else: else: