Ticket #14570: trac14570.patch

File trac14570.patch, 3.8 KB (added by R. Andrew Ohana, 9 years ago)

apply to sage library

  • module_list.py

    # HG changeset patch
    # User R. Andrew Ohana <andrew.ohana@gmail.com>
    # Date 1368658170 25200
    #      Wed May 15 15:49:30 2013 -0700
    # Node ID 015a8b8bb32467ef544d6d66b1f115cd2d2488c7
    # Parent  fa50e5f80bc33a4cf32cccf0ef04a04b3814e5b8
    Cythonize Sage library out of tree
    
    diff --git a/module_list.py b/module_list.py
    a b  
    332332               sources = ['sage/geometry/integral_points.pyx']),
    333333
    334334     Extension('sage.geometry.triangulation.base',
    335                sources = ['sage/geometry/triangulation/functions.cc',
     335               sources = ['sage/geometry/triangulation/base.pyx',
     336                          'sage/geometry/triangulation/functions.cc',
    336337                          'sage/geometry/triangulation/data.cc',
    337                           'sage/geometry/triangulation/base.pyx',
    338338                          'sage/geometry/triangulation/triangulations.cc'],
     339               depends = ['sage/geometry/triangulation/functions.h',
     340                          'sage/geometry/triangulation/data.h',
     341                          'sage/geometry/triangulation/triangulations.h'],
    339342               language="c++"),
    340343
    341344    ################################
     
    394397              depends = flint_depends),
    395398
    396399    Extension('sage.graphs.planarity',
    397               sources = ['sage/graphs/planarity_c/graphColorVertices.c',
     400              sources = ['sage/graphs/planarity.pyx',
     401                         'sage/graphs/planarity_c/graphColorVertices.c',
    398402                         'sage/graphs/planarity_c/graphColorVertices_Extensions.c',
    399403                         'sage/graphs/planarity_c/graphDrawPlanar.c',
    400404                         'sage/graphs/planarity_c/graphDrawPlanar_Extensions.c',
     
    419423                         'sage/graphs/planarity_c/planarityRandomGraphs.c',
    420424                         'sage/graphs/planarity_c/planaritySpecificGraph.c',
    421425                         'sage/graphs/planarity_c/planarityUtils.c',
    422                          'sage/graphs/planarity_c/stack.c',
    423                          'sage/graphs/planarity.pyx'],
     426                         'sage/graphs/planarity_c/stack.c'],
    424427              depends = ['sage/graphs/planarity_c/appconst.h',
    425428                         'sage/graphs/planarity_c/graphColorVertices.h',
    426429                         'sage/graphs/planarity_c/graphColorVertices.private.h',
  • sage/libs/singular/groebner_strategy.pyx

    diff --git a/sage/libs/singular/groebner_strategy.pyx b/sage/libs/singular/groebner_strategy.pyx
    a b  
    1717#                  http://www.gnu.org/licenses/
    1818#*****************************************************************************
    1919
    20 cdef extern from "":
     20cdef extern from *: # hack to get at cython macro
    2121    int unlikely(int)
    2222    int likely(int)
    2323
  • sage/libs/singular/polynomial.pyx

    diff --git a/sage/libs/singular/polynomial.pyx b/sage/libs/singular/polynomial.pyx
    a b  
    1313#*****************************************************************************
    1414include "../../ext/interrupt.pxi"
    1515
    16 cdef extern from "":
     16cdef extern from *: # hack to get at cython macro
    1717    int unlikely(int)
    1818
    1919import re
  • sage/libs/singular/singular.pyx

    diff --git a/sage/libs/singular/singular.pyx b/sage/libs/singular/singular.pyx
    a b  
    614614# Initialisation
    615615# ==============
    616616
    617 cdef extern from "":
     617cdef extern from *: # hack to get at cython macro
    618618    int unlikely(int)
    619619
    620620cdef extern from "dlfcn.h":
  • setup.py

    diff --git a/setup.py b/setup.py
    a b  
    532532    ext_modules = cythonize(
    533533        ext_modules,
    534534        nthreads = int(os.environ.get('SAGE_NUM_THREADS', 0)),
     535        build_dir = 'build/cythonized',
    535536        force=force)
    536537
    537538    open(version_file, 'w').write(Cython.__version__)