Skip to content

Add Python3 compatibility #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TalhaAsmal wants to merge 2 commits into
base: master
Choose a base branch
from
+146 −2
Open

Add Python3 compatibility #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9245db0
Add Python3 compatibility
Sep 21, 2016
3f185e8
Merge branch 'master' of https://github.com/lferry007/LargeVis
TalhaAsmal Nov 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 73 additions & 1 deletion Linux/LargeVismodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,23 @@ real *out_vec;
LargeVis model;
char *filename;

struct module_state {
PyObject *error;
};

#if PY_MAJOR_VERSION >= 3
#define GETSTATE(m) ((struct module_state*)PyModule_GetState(m))
#else
#define GETSTATE(m) (&_state)
static struct module_state _state;
#endif

static PyObject *error_out(PyObject *m) {
struct module_state *st = GETSTATE(m);
PyErr_SetString(st->error, "something bad happened");
return NULL;
}

static PyObject *Run(PyObject *self, PyObject *args)
{
long long out_dim = -1;
Expand Down Expand Up @@ -94,7 +111,11 @@ static PyObject *LoadFromList(PyObject *self, PyObject *args)
}
for (long long j = 0; j < n_dim; ++j)
{
#if PY_MAJOR_VERSION >= 3
real x = atof(PyBytes_AS_STRING(PyUnicode_AsUTF8String(PyObject_Str(PyList_GetItem(vec, j)))));
#else
real x = atof(PyString_AsString(PyObject_Str(PyList_GetItem(vec, j))));
#endif
data[ll + j] = x;
}
}
Expand All @@ -116,6 +137,7 @@ static PyObject *SaveToFile(PyObject *self, PyObject *args)

static PyMethodDef PyExtMethods[] =
{
{ "error_out", (PyCFunction)error_out, METH_NOARGS, NULL},
{ "run", Run, METH_VARARGS, "(All arguments are optional.\nrun(output dimension, threads number, training samples, propagations number, learning rate, rp-trees number, negative samples number, neighbors number, gamma, perplexity)\nFire up LargeVis." },
{ "loadfile", LoadFromFile, METH_VARARGS, "loadfile(str filename)\nLoad high-dimensional feature vectors from file." },
{ "loadgraph", LoadFromGraph, METH_VARARGS, "loadfile(str filename)\nLoad graph from file." },
Expand All @@ -124,8 +146,58 @@ static PyMethodDef PyExtMethods[] =
{ NULL, NULL, 0, NULL }
};

#if PY_MAJOR_VERSION >= 3

static int Traverse(PyObject *m, visitproc visit, void *arg) {
Py_VISIT(GETSTATE(m)->error);
return 0;
}

static int Clear(PyObject *m) {
Py_CLEAR(GETSTATE(m)->error);
return 0;
}


static struct PyModuleDef moduledef = {
PyModuleDef_HEAD_INIT,
"LargeVis",
NULL,
sizeof(struct module_state),
PyExtMethods,
NULL,
Traverse,
Clear,
NULL
};

#define INITERROR return NULL

PyMODINIT_FUNC PyInit_LargeVis(void)

#else
#define INITERROR return

PyMODINIT_FUNC initLargeVis()
#endif
{
printf("LargeVis successfully imported!\n");
Py_InitModule("LargeVis", PyExtMethods);
#if PY_MAJOR_VERSION >= 3
PyObject *module = PyModule_Create(&moduledef);
#else
PyObject *module = Py_InitModule("LargeVis", PyExtMethods);
#endif
if (module == NULL)
INITERROR;
struct module_state *st = GETSTATE(module);

st->error = PyErr_NewException("myextension.Error", NULL, NULL);
if (st->error == NULL) {
Py_DECREF(module);
INITERROR;
}

#if PY_MAJOR_VERSION >= 3
return module;
#endif
}
74 changes: 73 additions & 1 deletion Windows/LargeVismodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,23 @@ real *out_vec;
LargeVis model;
char *filename;

struct module_state {
PyObject *error;
};

#if PY_MAJOR_VERSION >= 3
#define GETSTATE(m) ((struct module_state*)PyModule_GetState(m))
#else
#define GETSTATE(m) (&_state)
static struct module_state _state;
#endif

static PyObject *error_out(PyObject *m) {
struct module_state *st = GETSTATE(m);
PyErr_SetString(st->error, "something bad happened");
return NULL;
}

static PyObject *Run(PyObject *self, PyObject *args)
{
long long out_dim = -1;
Expand Down Expand Up @@ -94,7 +111,11 @@ static PyObject *LoadFromList(PyObject *self, PyObject *args)
}
for (long long j = 0; j < n_dim; ++j)
{
#if PY_MAJOR_VERSION >= 3
real x = atof(PyBytes_AS_STRING(PyUnicode_AsUTF8String(PyObject_Str(PyList_GetItem(vec, j)))));
#else
real x = atof(PyString_AsString(PyObject_Str(PyList_GetItem(vec, j))));
#endif
data[ll + j] = x;
}
}
Expand All @@ -116,6 +137,7 @@ static PyObject *SaveToFile(PyObject *self, PyObject *args)

static PyMethodDef PyExtMethods[] =
{
{ "error_out", (PyCFunction)error_out, METH_NOARGS, NULL},
{ "run", Run, METH_VARARGS, "(All arguments are optional.\nrun(output dimension, threads number, training samples, propagations number, learning rate, rp-trees number, negative samples number, neighbors number, gamma, perplexity)\nFire up LargeVis." },
{ "loadfile", LoadFromFile, METH_VARARGS, "loadfile(str filename)\nLoad high-dimensional feature vectors from file." },
{ "loadgraph", LoadFromGraph, METH_VARARGS, "loadfile(str filename)\nLoad graph from file." },
Expand All @@ -124,8 +146,58 @@ static PyMethodDef PyExtMethods[] =
{ NULL, NULL, 0, NULL }
};

#if PY_MAJOR_VERSION >= 3

static int Traverse(PyObject *m, visitproc visit, void *arg) {
Py_VISIT(GETSTATE(m)->error);
return 0;
}

static int Clear(PyObject *m) {
Py_CLEAR(GETSTATE(m)->error);
return 0;
}


static struct PyModuleDef moduledef = {
PyModuleDef_HEAD_INIT,
"LargeVis",
NULL,
sizeof(struct module_state),
PyExtMethods,
NULL,
Traverse,
Clear,
NULL
};

#define INITERROR return NULL

PyMODINIT_FUNC PyInit_LargeVis(void)

#else
#define INITERROR return

PyMODINIT_FUNC initLargeVis()
#endif
{
printf("LargeVis successfully imported!\n");
Py_InitModule("LargeVis", PyExtMethods);
#if PY_MAJOR_VERSION >= 3
PyObject *module = PyModule_Create(&moduledef);
#else
PyObject *module = Py_InitModule("LargeVis", PyExtMethods);
#endif
if (module == NULL)
INITERROR;
struct module_state *st = GETSTATE(module);

st->error = PyErr_NewException("myextension.Error", NULL, NULL);
if (st->error == NULL) {
Py_DECREF(module);
INITERROR;
}

#if PY_MAJOR_VERSION >= 3
return module;
#endif
}