Changeset b03e2f in git

Timestamp:

Aug 9, 2019, 10:47:44 PM (4 years ago)

Author:

Murray Heymann <heymann.murray@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

cd552eb18a483f4541fb1abe06b65fd12e5852c0

Parents:

092e6882fed83e361d79576bc0aa7dc34ac19ad2

Message:

Include mlpredict in build system

Files:

• .gitignore (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• Singular/Makefile.am (modified) (2 diffs)
• Singular/iparith.cc (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• machine_learning/Makefile.am (added)
• machine_learning/configure.ac (added)
• machine_learning/mlpredict.c (modified) (1 diff)
• machine_learning/mlpredict.h (modified) (2 diffs)

.gitignore

@@ -123 +123 @@
 .coverage
 *.pyc
+machine_learning/machine_learning-config.h

Makefile.am

@@ -2 +2 @@
 
 SUBDIRS = resources omalloc factory \
-libpolys gfanlib IntegerProgramming \
+libpolys machine_learning gfanlib IntegerProgramming \
 kernel Singular \
 dox emacs redhat desktop

Singular/Makefile.am

@@ -3 +3 @@
 GIT_VERSION := $(shell $(top_srcdir)/git-version-gen $(top_srcdir)/.tarball-git-version)
 
-AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(FACTORY_INCLUDES) $(CCLUSTER_CPPFLAGS)  $(GMP_CPPFLAGS) $(FLINT_CFLAGS) -DGIT_VERSION='"$(GIT_VERSION)"'
+AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(FACTORY_INCLUDES) $(CCLUSTER_CPPFLAGS)  $(GMP_CPPFLAGS) $(FLINT_CFLAGS) -DGIT_VERSION='"$(GIT_VERSION)"' -I/usr/include/python2.7
 
 AM_CXXFLAGS=$(NTL_CPPFLAGS)
@@ -136 +136 @@
 nodist_libSingular_la_SOURCES = feOpt.inc iparith.inc
 
-libSingular_la_LDFLAGS    =$(SINGULAR_LDFLAGS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION} $(CCLUSTER_LIBS) ${PTHREAD_LDFLAGS}
-libSingular_la_LIBADD     =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${BUILTIN_FLAGS} ${top_builddir}/kernel/libkernel.la ${PTHREAD_LIBS}
-
+libSingular_la_LDFLAGS    =$(SINGULAR_LDFLAGS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION} $(CCLUSTER_LIBS) ${PTHREAD_LDFLAGS} -lpython2.7
+libSingular_la_LIBADD     =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${BUILTIN_FLAGS} ${top_builddir}/kernel/libkernel.la ${PTHREAD_LIBS} ${top_builddir}/machine_learning/libmlearn.la
 libSingular_includedir = ${includedir}/singular/Singular
 nobase_libSingular_include_HEADERS = $(SingularHEADERS)

Singular/iparith.cc

@@ -50 +50 @@
 #include "kernel/polys.h"
 #include "kernel/ideals.h"
+
+#include "machine_learning/mlpredict.h"
 
 #include "Singular/mod_lib.h"
@@ -7945 +7947 @@
         struct blackbox_list *bb_list = NULL;
         unsigned nCount = (sArithBase.nCmdUsed-1) / 3;
+
+        if (ml_is_initialised()) {
+                printf("ml is initialised\n");
+        } else {
+                printf("ml is NOT initialised\n");
+        }
+
         if ((3*nCount) < sArithBase.nCmdUsed) {
                 nCount++;

configure.ac

@@ -232 +232 @@
 
 AC_CONFIG_SUBDIRS([libpolys])
+
+AC_CONFIG_SUBDIRS([machine_learning])
 
 AC_CONFIG_FILES([Makefile])

machine_learning/mlpredict.c

@@ -8 +8 @@
 #include <stdio.h>
 #include <Python.h>
-
-#include "mlpredict.h"
 
 /* Locally defined macros */

machine_learning/mlpredict.h

@@ -8 +8 @@
 #ifndef MLPREDICT_H
 #define MLPREDICT_H
+extern "C" {
 
 /**
@@ -53 +54 @@
                                            int *pred_len);
 
+}
 #endif