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

Extract common wrappers to Python compatibility header

Browse Source
This commit is contained in:
Richard Berger
2017-05-15 17:45:36 -04:00
parent 93cc6f4a5d
commit 69ccbd1562
5 changed files with 45 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/PYTHON/python_impl.cpp
View File

@ -11,6 +11,10 @@
See the README file in the top-level LAMMPS directory.
------------------------------------------------------------------------- */
/* ----------------------------------------------------------------------
Contributing author: Axel Kohlmeyer and Richard Berger (Temple U)
------------------------------------------------------------------------- */
#include <Python.h>
#include "python.h"
#include "force.h"
@ -18,6 +22,7 @@
#include "variable.h"
#include "memory.h"
#include "error.h"
#include "python_compat.h"
using namespace LAMMPS_NS;
@ -25,21 +30,6 @@ enum{NONE,INT,DOUBLE,STRING,PTR};
#define VALUELENGTH 64 // also in variable.cpp
// Wrap API changes between Python 2 and 3 using macros
#if PY_MAJOR_VERSION == 2
#define PY_INT_FROM_LONG(X) PyInt_FromLong(X)
#define PY_INT_AS_LONG(X) PyInt_AsLong(X)
#define PY_STRING_FROM_STRING(X) PyString_FromString(X)
#define PY_VOID_POINTER(X) PyCObject_FromVoidPtr((void *) X, NULL)
#define PY_STRING_AS_STRING(X) PyString_AsString(X)
#elif PY_MAJOR_VERSION == 3
#define PY_INT_FROM_LONG(X) PyLong_FromLong(X)
#define PY_INT_AS_LONG(X) PyLong_AsLong(X)
#define PY_STRING_FROM_STRING(X) PyUnicode_FromString(X)
#define PY_VOID_POINTER(X) PyCapsule_New((void *) X, NULL, NULL)
#define PY_STRING_AS_STRING(X) PyUnicode_AsUTF8(X)
#endif
/* ---------------------------------------------------------------------- */