MonetDB: pyapi - Added HAVE_LIBPANDAS and HAVE_LIBSCIPY conditio...

[Mark Raasveldt]

Changeset: b7ea61e83c34 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b7ea61e83c34
Modified Files:
        configure.ag
        sql/backends/monet5/Tests/All
        testing/Mtest.py.in
Branch: pyapi
Log Message:

Added HAVE_LIBPANDAS and HAVE_LIBSCIPY conditionals.


diffs (56 lines):

diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2284,6 +2284,8 @@ AM_CONDITIONAL(HAVE_LIBR, test x"$have_l
 
 # Python API (embedded Python)
 have_libpy=no
+have_libpandas=no
+have_libscipy=no
 if test "x$enable_pyintegration" != xno; then
        case "$enable_pyintegration" in
        yes|auto)
@@ -2324,9 +2326,19 @@ if test "x$enable_pyintegration" != xno;
                AC_DEFINE(HAVE_LIBPY, 1, [Define if we can link to python])
                AC_SUBST(libpy_CFLAGS, $libpy_CFLAGS)
                AC_SUBST(libpy_LIBS, $libpy_LIBS)
+               PANDAS=`$PYTHON_CMD -c "import pandas; print 1"`
+               if [test "x$PANDAS" = x1]; then
+                       have_libpandas=yes
+               fi
+               SCIPY=`$PYTHON_CMD -c "import scipy; print 1"`
+               if [test "x$SCIPY" = x1]; then
+                       have_libscipy=yes
+               fi
        fi
 fi
 AM_CONDITIONAL(HAVE_LIBPY, test x"$have_libpy" != xno)
+AM_CONDITIONAL(HAVE_LIBPANDAS, test x"$have_libpandas" != xno)
+AM_CONDITIONAL(HAVE_LIBSCIPY, test x"$have_libscipy" != xno)
 
 
 # ODBC, only used by ODBC driver
diff --git a/sql/backends/monet5/Tests/All b/sql/backends/monet5/Tests/All
--- a/sql/backends/monet5/Tests/All
+++ b/sql/backends/monet5/Tests/All
@@ -5,7 +5,7 @@ HAVE_LIBPY?pyapi01
 HAVE_LIBPY?pyapi02
 HAVE_LIBPY?pyapi03
 HAVE_LIBPY?pyapi04
-HAVE_LIBPY?pyapi05
+HAVE_LIBSCIPY?pyapi05
 HAVE_LIBPY?pyapi06
 HAVE_LIBPY?pyapi07
 HAVE_LIBPY?pyapi08
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -307,6 +307,8 @@ CONDITIONALS = {
     'HAVE_LIBBZ2'          : "@HAVE_LIBBZ2_FALSE@",
     'HAVE_LIBR'            : "@HAVE_LIBR_FALSE@",
     'HAVE_LIBPY'           : "@HAVE_LIBPY_FALSE@",
+    'HAVE_LIBPANDAS'       : "@HAVE_LIBPANDAS_FALSE@",
+    'HAVE_LIBSCIPY'        : "@HAVE_LIBSCIPY_FALSE@",
     'HAVE_LIBZ'            : "@HAVE_LIBZ_FALSE@",
     'HAVE_MONETDB5'        : "@HAVE_MONETDB5_FALSE@",
     'HAVE_NETCDF'          : "@HAVE_NETCDF_FALSE@",
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list