Changeset ad8742 in git

Timestamp:

Sep 2, 2019, 5:41:55 PM (5 years ago)

Author:

Murray Heymann <heymann.murray@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

44ebb1208e9d72e44ac4a62daa6d1d118c4acebb

Parents:

bfaec2aa93e88c6781454a61ac4ffa74b64eb0dd

Message:

Make actual prediction

Files:

• Singular/iparith.cc (modified) (4 diffs)
• machine_learning/Makefile.am (modified) (2 diffs)
• machine_learning/ml_python/common/keyword_vector.py (modified) (1 diff)
• machine_learning/ml_python/common/lookuptable.py (modified) (1 diff)
• machine_learning/ml_python/predictor_runner.py (modified) (1 diff)
• machine_learning/mlpredict.c (modified) (8 diffs)
• machine_learning/tests/test_bufsize.c (modified) (1 diff)

Singular/iparith.cc

@@ -80 +80 @@
 
 #include <ctype.h>
+
+#include <readline/history.h>
 
 // defaults for all commands: NO_NC | NO_RING | ALLOW_ZERODIVISOR
@@ -7798 +7800 @@
 
 
-//HERE
 static BOOLEAN jjPREDHELP0(leftv res, leftv)
 {
+        char buffer[30];
+        char filename[15] = "~/.history";
+        int i;
         lists L = (lists)omAllocBin(slists_bin);
+
+        buffer[0] = '\0';
+
+        if(write_history(NULL)) {
+                printf("Failed to write history\n");
+                return TRUE;
+        }
+
         if (!ml_initialise()) {
                 Print("Initialise of ml failed.");
@@ -7809 +7821 @@
         }
 
+        ml_make_prediction(filename, 30, buffer, &i);
+        printf("prediciton %s\n", buffer);
+
         L->Init(1);
 
@@ -7820 +7835 @@
         return FALSE;
 }
+
 
 

machine_learning/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../m4
 
-AM_CPPFLAGS = -I/usr/include/python2.7 -DDATA_PATH=\"$(datadir)\"
+#AM_CPPFLAGS            = -I/usr/include/python3.6 -DDATA_PATH=\"$(datadir)\"
+AM_CPPFLAGS             = -I/usr/include/python2.7 -DDATA_PATH=\"$(datadir)\"
 
-libmlearn_LTLIBRARIES = libmlearn.la
+libmlearn_LTLIBRARIES   = libmlearn.la
 libmlearndir = $(libdir)
 
@@ -10 +11 @@
 
 libmlearn_la_SOURCES    = $(SOURCES)
+#libmlearn_la_LDFLAGS   = $(SINGULAR_LDFLAGS) -lpython3.6m
 libmlearn_la_LDFLAGS    = $(SINGULAR_LDFLAGS) -lpython2.7
 
-libmlearn_includedir=${includedir}/singular/machine_learning
-nobase_libmlearn_include_HEADERS= $(LIBMLEARNHEADERS)
+libmlearn_includedir    = ${includedir}/singular/machine_learning
+nobase_libmlearn_include_HEADERS = $(LIBMLEARNHEADERS)
 
 
 ###########################################################################
 
-TESTS = test_bufsize test_init_ml
+TESTS                   = test_bufsize test_init_ml
+check_PROGRAMS          = test_bufsize test_init_ml
 
-check_PROGRAMS = test_bufsize test_init_ml
+test_bufsize_LDADD      = libmlearn.la
+#test_bufsize_LDFLAGS   = -lpython3.6m
+test_bufsize_LDFLAGS    = -lpython2.7
 
-test_bufsize_LDADD=libmlearn.la
-test_bufsize_LDFLAGS= -lpython2.7
+test_bufsize_SOURCES    = tests/test_bufsize.c
+test_bufsize_CFLAGS     = -Wall -Wextra
 
-test_bufsize_SOURCES=tests/test_bufsize.c
-test_bufsize_CFLAGS= -Wall -Wextra
+test_init_ml_LDADD      = libmlearn.la
+#test_init_ml_LDFLAGS   = -lpython3.6m
+test_init_ml_LDFLAGS    = -lpython2.7
 
-test_init_ml_LDADD=libmlearn.la
-test_init_ml_LDFLAGS= -lpython2.7
+test_init_ml_SOURCES    = tests/test_init_ml.c
+test_init_ml_CFLAGS     = -Wall -Wextra
 
-test_init_ml_SOURCES=tests/test_init_ml.c
-test_init_ml_CFLAGS= -Wall -Wextra
-
-#mlmoduledir = ${datadir}/singular/mlearn
-nobase_dist_data_DATA = \
+nobase_dist_data_DATA   = \
         ml_python/__init__.py \
         ml_python/predictor_runner.py \

machine_learning/ml_python/common/keyword_vector.py

@@ -71 +71 @@
     vectors = vectors.toarray()
     if normalise:
+        #print(sys.version)
         vectors = vectors / np.sqrt((vectors ** 2).sum(-1))[..., np.newaxis]
     return vectors

machine_learning/ml_python/common/lookuptable.py

@@ -55 +55 @@
 
     # extract keywords using the singular script
-    os.system(SINGULAR_BIN + " -q " + EXTRACT_SCRIPT + 
+    os.system(SINGULAR_BIN + " -q " + EXTRACT_SCRIPT +
             " | sort | uniq > " + KEYWORDS_FILE)
 

machine_learning/ml_python/predictor_runner.py

@@ -37 +37 @@
     predictor.fit(vectors, file_list)
 
+    filename = os.path.expanduser(filename)
     test_vec = count_occurances(filename, dictionary)
     prediction = predictor.predict(np.array([test_vec]))

machine_learning/mlpredict.c

@@ -101 +101 @@
         PyObject *pName = NULL;
         PyObject *pModule = NULL;
+        PyObject *pTemp = NULL;
 
         if (!Py_IsInitialized()) {
@@ -107 +108 @@
 
         pName = PyString_FromString("sys");
+        //pName = PyUnicode_FromString("sys");
         pModule = PyImport_Import(pName);
         Py_DECREF(pName);
@@ -128 +130 @@
         pString = PyObject_Str(pPath);
         spath = PyString_AsString(pString);
+        //pTemp = PyUnicode_AsASCIIString(pString);
+        //spath = PyBytes_AsString(pTemp);
         /* get the path to be set */
         PYTPATH(buffer);
         if (!strstr(spath, buffer)) {
                 pMyPath = PyString_FromString(buffer);
+                //pMyPath = PyUnicode_FromString(buffer);
                 /* pPath set to tuple, so no decref needed later */
                 PyList_Append(pPath, pMyPath);
@@ -137 +142 @@
         }
         Py_DECREF(pString);
+        //Py_XDECREF(pTemp);
         Py_DECREF(pPath);
 
@@ -194 +200 @@
         PyObject *pFName = NULL, *pArgs = NULL;
         PyObject *pValue = NULL; PyObject *pString = NULL;
+        PyObject *pTemp = NULL;
         int ret_string_len = 0;
 
         pFName = PyString_FromString(filename);
+        //pFName = PyUnicode_FromString(filename);
         if (!pFName) {
                 fprintf(stderr, "This is weird\n");
@@ -231 +239 @@
         pString = PyObject_Str(pValue);
         strncpy(prediction_buffer, PyString_AsString(pString), buffer_size - 1);
+        //pTemp = PyUnicode_AsASCIIString(pString);
+        //strncpy(prediction_buffer, PyBytes_AsString(pTemp), buffer_size - 1);
         ret_string_len = strlen(PyString_AsString(pString));
+        //ret_string_len = strlen(PyBytes_AsString(pTemp));
         if (ret_string_len >= buffer_size - 1) {
                 prediction_buffer[buffer_size - 1] = '\0';
@@ -240 +251 @@
 
         Py_DECREF(pString);
+        //Py_XDECREF(pTemp);
         Py_DECREF(pValue);
 
@@ -286 +298 @@
         /* import the module */
         pName = PyString_FromString(module);
+        //pName = PyUnicode_FromString(module);
         pModule = PyImport_Import(pName);
         Py_DECREF(pName);

machine_learning/tests/test_bufsize.c

@@ -12 +12 @@
         char buffer12[12];
         char buffer20[20];
-        double time_taken;
         if (argc != 1) {
                 printf("Usage: %s\n", argv[0]);