Changeset 92d684 in git


Ignore:
Timestamp:
Aug 10, 2011, 3:57:13 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
db45a2a06453f84672a9bd3c4a2c2230cb7fe17d
Parents:
cf41549933e3a2f719c447992e836d965e3be351
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-10 15:57:13+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:17:28+01:00
Message:
ADD: python - related changes
FIX: removed C++-related heades (unused anyway)
FIX: blackbox
Location:
Singular
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • Singular/blackbox.cc

    rcf4154 r92d684  
    11#include <kernel/mod2.h>
    2 #include <Singular/tok.h>
    3 #include <Singular/subexpr.h>
    4 #include <Singular/ipshell.h>
    5 #include <Singular/blackbox.h>
     2#include <misc/auxiliary.h>
     3
     4#include "tok.h"
     5#include "subexpr.h"
     6#include "ipshell.h"
     7
     8#include "blackbox.h"
    69
    710#define MAX_BB_TYPES 256

  • Singular/blackbox.h

    rcf4154 r92d684  
    11#ifndef BLACKBOX_H
    22#define BLACKBOX_H
     3
     4#include <misc/auxiliary.h>
    35#include <omalloc/omalloc.h>
     6
    47#include <kernel/structs.h>
    58#include <kernel/febase.h>
     9
     10#include <Singular/lists.h>
    611#include <Singular/silink.h>
    712

  • Singular/gms.h

    rcf4154 r92d684  
    1717
    1818#include <Singular/lists.h>
     19
    1920lists gmsNF(ideal p, ideal g, matrix B, int D, int K);
    2021BOOLEAN gmsNF(leftv res, leftv h);

  • Singular/makefile

    rcf4154 r92d684  
    3535## compiler and linker options
    3636##
    37 LIBPOLYS_CFLAGS = -I.. -I../libpolys
     37LIBPOLYS_INCLUDES = -I.. -I../libpolys
     38LIBPOLYS_CFLAGS = ${LIBPOLYS_INCLUDES}
    3839LIBPOLYS_LIBS   = -L../factory -L../omalloc -L../libpolys/misc -L../libpolys/reporter -L../libpolys/resources -L../libpolys/coeffs -L../libpolys/polys -lpolys -lcoeffs -lresources -lreporter -lmisc -lfactory -lomalloc
    3940LIBPOLYS_LIBSG   = -L../factory -L../omalloc -L../libpolys/misc -L../libpolys/reporter -L../libpolys/resources -L../libpolys/coeffs -L../libpolys/polys -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g -lfactory -lomalloc_g
    4041
     42
     43PYTHON_INCLUDES = `python-config --includes`
     44PYTHON_CFLAGS = `python-config --cflags`
     45PYTHON_LIBS   = `python-config --libs`
     46
    4147PIPE            = -pipe
    42 CFLAGS          = -O3 -w -fomit-frame-pointer ${PIPE} ${LIBPOLYS_CFLAGS}
    43 CXXFLAGS        = -O3 -w -fomit-frame-pointer --no-rtti ${PIPE} ${LIBPOLYS_CFLAGS}
     48CFLAGS          = -O3 -fomit-frame-pointer ${PIPE} ${LIBPOLYS_CFLAGS} ${PYTHON_CFLAGS}
     49CXXFLAGS        = -O3 -fomit-frame-pointer --no-rtti ${PIPE} ${LIBPOLYS_CFLAGS} ${PYTHON_CFLAGS}
    4450CXXTEMPLFLAGS   = -fno-implicit-templates --no-exceptions
    45 CPPFLAGS        = -I${srcdir} -I..  -I${includedir}   ${LIBPOLYS_CFLAGS}
     51CPPFLAGS        = -I${srcdir} -I..  -I${includedir} ${LIBPOLYS_INCLUDES}  ${PYTHON_INCLUDES}
    4652DEFS            = -DNDEBUG -DOM_NDEBUG
    4753LDFLAGS         = -L${srcdir}/lib
    … …  
    5258LD_LIBC         = -lc
    5359STATIC_LDFLAGS  = -static
    54 LIBS            = -lm -lsingfac -lsingcf -lntl -lgmp -lreadline -lncurses -lm  -lnsl  -lomalloc_ndebug
     60LIBS            = -lm -lsingfac -lsingcf -lntl -lgmp -lreadline -lncurses -lm  -lnsl  -lomalloc_ndebug ${PYTHON_LIBS}
    5561MP_LIBS         = -lMPT -lMP -lnsl
    5662

  • Singular/pyobject.cc

    rcf4154 r92d684  
    1313//*****************************************************************************
    1414
    15 
    16 
    17 
    18 
    1915#include <kernel/mod2.h>
    20 
    21 #include <Singular/ipid.h>
    22 #include <Singular/blackbox.h>
     16#include <misc/auxiliary.h>
     17
    2318#include <omalloc/omalloc.h>
     19
    2420#include <kernel/febase.h>
    25 #include <kernel/longrat.h>
    26 #include <Singular/subexpr.h>
    27 
    28 #include <Singular/lists.h>
     21// #include <kernel/longrat.h>
     22
     23#include "subexpr.h"
     24#include "lists.h"
     25#include "ipid.h"
     26#include "blackbox.h"
    2927
    3028#include <Python.h>
    31 #include <iterator>             // std::distance
    32 #include <stdio.h>
     29// #include <iterator>             // std::distance
     30// #include <stdio.h>
    3331
    3432void sync_contexts();
    … …  
    348346{
    349347  ptr_type pylist(PyList_New(0));
    350   for (std::size_t i = 0; i <= value->nr; ++i)
     348  for (size_t i = 0; i <= value->nr; ++i)
    351349    PyList_Append(pylist, PythonCastDynamic((value->m) + i));
    352350
    … …  
    366364 
    367365private:
    368   std::size_t size(leftv iter, std::size_t distance = 0) const
     366  size_t size(leftv iter, size_t distance = 0) const
    369367  {
    370368    if (iter) { do { ++distance; } while(iter = iter->next); };
    … …  
    374372  void append_to(leftv iter) const
    375373  {
    376     for(std::size_t idx = 0; iter != NULL; iter = iter->next)
     374    for(size_t idx = 0; iter != NULL; iter = iter->next)
    377375      PyTuple_SetItem(*this, idx++, PythonCastDynamic(iter));
    378376  }

  • Singular/silink.h

    rcf4154 r92d684  
    99*/
    1010
     11#include <misc/auxiliary.h>
    1112#include <kernel/structs.h>
     13
    1214#include <Singular/sing_dbm.h>
    1315#include <Singular/lists.h>
    … …  
    9294
    9395#include <omalloc/omalloc.h>
     96
    9497inline char* slString(si_link l)
    9598{
Note: See TracChangeset for help on using the changeset viewer.