Skip to content

Commit

Permalink
Trac #29706: Move Extension options from src/module_list.py to "distu…
Browse files Browse the repository at this point in the history 
…tils:" directives in the individual files (part 1 - some packages without OptionalExtensions)

This simplifies `src/module_list.py` a lot. This is preparation for
splitting sagelib into separate distutils packages.

Follow-up tickets take care of the remaining packages; in the end, in
#29701, `src/module_list.py` will no longer be used, and in another
follow-up ticket, it will disappear completely:
 - #29720: Move `Extension` options ... (part 2 - `OptionalExtension`s)
 - #29785: Move `Extension` options ... (part 3: Get rid of
`uname_specific`)
 - #29786: Move `Extension` options ... (part 4: `sage.rings`)
 - #29790: Move `Extension` options ... (part 5: `sage.graphs`)
 - #29791: Move `Extension` options ... (part 6: last)
 - #29721: takes care of `sage.libs.coxeter3`
 - #29701: takes care of `sage.graphs.graph_decompositions`

URL: https://trac.sagemath.org/29706
Reported by: mkoeppe
Ticket author(s): Matthias Koeppe
Reviewer(s): Jonathan Kliem, John Palmieri
  • Loading branch information
Release Manager committed Jun 23, 2020
2 parents c721b2a + 1bfe30d commit 54b9dba
Show file tree
Hide file tree
Showing 40 changed files with 159 additions and 337 deletions.
316 changes: 8 additions & 308 deletions src/module_list.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,22 +133,7 @@ def uname_specific(name, value, alternative):
##
################################

Extension('sage.algebras.quatalg.quaternion_algebra_element',
sources = ['sage/algebras/quatalg/quaternion_algebra_element.pyx'],
language='c++',
libraries = ["gmp", "m", "ntl"]),

Extension('*', sources = ['sage/algebras/letterplace/*.pyx']),

Extension('*', sources = ['sage/algebras/finite_dimensional_algebras/*.pyx']),

Extension('sage.algebras.quatalg.quaternion_algebra_cython',
sources = ['sage/algebras/quatalg/quaternion_algebra_cython.pyx'],
language='c++',
libraries = ["gmp", "m", "ntl"]),

Extension('sage.algebras.lie_algebras.lie_algebra_element',
sources = ["sage/algebras/lie_algebras/lie_algebra_element.pyx"]),
Extension('*', ['sage/algebras/**/*.pyx']),

################################
##
Expand Down Expand Up @@ -279,54 +264,7 @@ def uname_specific(name, value, alternative):
##
################################

Extension('sage.geometry.point_collection',
sources = ['sage/geometry/point_collection.pyx']),

Extension('sage.geometry.toric_lattice_element',
sources = ['sage/geometry/toric_lattice_element.pyx']),

Extension('sage.geometry.integral_points',
sources = ['sage/geometry/integral_points.pyx']),

Extension('sage.geometry.triangulation.base',
sources = ['sage/geometry/triangulation/base.pyx',
'sage/geometry/triangulation/functions.cc',
'sage/geometry/triangulation/data.cc',
'sage/geometry/triangulation/triangulations.cc'],
depends = ['sage/geometry/triangulation/functions.h',
'sage/geometry/triangulation/data.h',
'sage/geometry/triangulation/triangulations.h'],
language="c++"),

Extension('sage.geometry.polyhedron.combinatorial_polyhedron.base',
sources = ['sage/geometry/polyhedron/combinatorial_polyhedron/base.pyx']),

Extension('sage.geometry.polyhedron.combinatorial_polyhedron.list_of_faces',
sources = ['sage/geometry/polyhedron/combinatorial_polyhedron/list_of_faces.pyx'],
depends = ['sage/geometry/polyhedron/combinatorial_polyhedron/bit_vector_operations.cc'],
language="c++",
extra_compile_args=['-std=c++11']),

Extension('sage.geometry.polyhedron.combinatorial_polyhedron.face_iterator',
sources = ['sage/geometry/polyhedron/combinatorial_polyhedron/face_iterator.pyx'],
depends = ['sage/geometry/polyhedron/combinatorial_polyhedron/bit_vector_operations.cc'],
language="c++",
extra_compile_args=['-std=c++11']),

Extension('sage.geometry.polyhedron.combinatorial_polyhedron.polyhedron_face_lattice',
sources = ['sage/geometry/polyhedron/combinatorial_polyhedron/polyhedron_face_lattice.pyx'],
depends = ['sage/geometry/polyhedron/combinatorial_polyhedron/bit_vector_operations.cc'],
language="c++",
extra_compile_args=['-std=c++11']),

Extension('sage.geometry.polyhedron.combinatorial_polyhedron.combinatorial_face',
sources = ['sage/geometry/polyhedron/combinatorial_polyhedron/combinatorial_face.pyx'],
depends = ['sage/geometry/polyhedron/combinatorial_polyhedron/bit_vector_operations.cc'],
language="c++",
extra_compile_args=['-std=c++11']),

Extension('sage.geometry.polyhedron.combinatorial_polyhedron.conversions',
sources = ['sage/geometry/polyhedron/combinatorial_polyhedron/conversions.pyx']),
Extension('*', ['sage/geometry/**/*.pyx']),

################################
##
Expand Down Expand Up @@ -646,110 +584,7 @@ def uname_specific(name, value, alternative):
##
###################################

Extension('sage.libs.ntl.convert',
sources = ["sage/libs/ntl/convert.pyx"],
libraries = ["ntl", "gmp"],
language='c++'),

Extension('sage.libs.ntl.error',
sources = ["sage/libs/ntl/error.pyx"],
libraries = ["ntl", "gmp"],
language='c++'),

Extension('sage.libs.ntl.ntl_GF2',
sources = ["sage/libs/ntl/ntl_GF2.pyx"],
libraries = ["ntl", "gmp"],
language='c++'),

Extension('sage.libs.ntl.ntl_GF2E',
sources = ["sage/libs/ntl/ntl_GF2E.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),

Extension('sage.libs.ntl.ntl_GF2EContext',
sources = ["sage/libs/ntl/ntl_GF2EContext.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),

Extension('sage.libs.ntl.ntl_GF2EX',
sources = ["sage/libs/ntl/ntl_GF2EX.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),

Extension('sage.libs.ntl.ntl_GF2X',
sources = ["sage/libs/ntl/ntl_GF2X.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),

Extension('sage.libs.ntl.ntl_lzz_p',
sources = ["sage/libs/ntl/ntl_lzz_p.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),

Extension('sage.libs.ntl.ntl_lzz_pContext',
sources = ["sage/libs/ntl/ntl_lzz_pContext.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),

Extension('sage.libs.ntl.ntl_lzz_pX',
sources = ["sage/libs/ntl/ntl_lzz_pX.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),

Extension('sage.libs.ntl.ntl_mat_GF2',
sources = ["sage/libs/ntl/ntl_mat_GF2.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),

Extension('sage.libs.ntl.ntl_mat_GF2E',
sources = ["sage/libs/ntl/ntl_mat_GF2E.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),

Extension('sage.libs.ntl.ntl_mat_ZZ',
sources = ["sage/libs/ntl/ntl_mat_ZZ.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),

Extension('sage.libs.ntl.ntl_ZZ',
sources = ["sage/libs/ntl/ntl_ZZ.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),

Extension('sage.libs.ntl.ntl_ZZX',
sources = ["sage/libs/ntl/ntl_ZZX.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),

Extension('sage.libs.ntl.ntl_ZZ_p',
sources = ["sage/libs/ntl/ntl_ZZ_p.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),

Extension('sage.libs.ntl.ntl_ZZ_pContext',
sources = ["sage/libs/ntl/ntl_ZZ_pContext.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),

Extension('sage.libs.ntl.ntl_ZZ_pE',
sources = ["sage/libs/ntl/ntl_ZZ_pE.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),

Extension('sage.libs.ntl.ntl_ZZ_pEContext',
sources = ["sage/libs/ntl/ntl_ZZ_pEContext.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),

Extension('sage.libs.ntl.ntl_ZZ_pEX',
sources = ["sage/libs/ntl/ntl_ZZ_pEX.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),

Extension('sage.libs.ntl.ntl_ZZ_pX',
sources = ["sage/libs/ntl/ntl_ZZ_pX.pyx"],
libraries = ["ntl", "gmp", "m"],
language='c++'),
Extension('*', ["sage/libs/ntl/*.pyx"]),

################################
##
Expand Down Expand Up @@ -921,97 +756,15 @@ def uname_specific(name, value, alternative):
##
################################

Extension('sage.modular.arithgroup.congroup',
sources = ['sage/modular/arithgroup/congroup.pyx']),

Extension('sage.modular.arithgroup.farey_symbol',
sources = ['sage/modular/arithgroup/farey_symbol.pyx']),

Extension('sage.modular.arithgroup.arithgroup_element',
sources = ['sage/modular/arithgroup/arithgroup_element.pyx']),

Extension('sage.modular.hypergeometric_misc',
sources = ['sage/modular/hypergeometric_misc.pyx']),

Extension('sage.modular.modform.eis_series_cython',
sources = ['sage/modular/modform/eis_series_cython.pyx']),

Extension('sage.modular.modform.l_series_gross_zagier_coeffs',
sources = ['sage/modular/modform/l_series_gross_zagier_coeffs.pyx']),

Extension('sage.modular.modsym.apply',
sources = ['sage/modular/modsym/apply.pyx'],
extra_compile_args=["-D_XPG6"]),

Extension('sage.modular.modsym.manin_symbol',
sources = ['sage/modular/modsym/manin_symbol.pyx']),

Extension('sage.modular.modsym.relation_matrix_pyx',
sources = ['sage/modular/modsym/relation_matrix_pyx.pyx']),

Extension('sage.modular.modsym.heilbronn',
sources = ['sage/modular/modsym/heilbronn.pyx'],
extra_compile_args=["-D_XPG6"]),

Extension('sage.modular.modsym.p1list',
sources = ['sage/modular/modsym/p1list.pyx']),

Extension('sage.modular.pollack_stevens.dist',
sources = ['sage/modular/pollack_stevens/dist.pyx'],
libraries = ["gmp", "zn_poly"],
extra_compile_args = ["-D_XPG6"]),
Extension('*', ['sage/modular/**/*.pyx']),

################################
##
## sage.modules
##
################################

Extension('sage.modules.vector_rational_sparse',
sources = ['sage/modules/vector_rational_sparse.pyx']),

Extension('sage.modules.vector_integer_sparse',
sources = ['sage/modules/vector_integer_sparse.pyx']),

Extension('sage.modules.vector_modn_sparse',
sources = ['sage/modules/vector_modn_sparse.pyx']),

Extension('sage.modules.finite_submodule_iter',
sources = ['sage/modules/finite_submodule_iter.pyx']),

Extension('sage.modules.free_module_element',
sources = ['sage/modules/free_module_element.pyx']),

Extension('sage.modules.module',
sources = ['sage/modules/module.pyx']),

Extension('sage.modules.vector_complex_double_dense',
['sage/modules/vector_complex_double_dense.pyx']),

Extension('sage.modules.vector_double_dense',
['sage/modules/vector_double_dense.pyx']),

Extension('sage.modules.vector_integer_dense',
sources = ['sage/modules/vector_integer_dense.pyx']),

Extension('sage.modules.vector_modn_dense',
sources = ['sage/modules/vector_modn_dense.pyx']),

Extension('sage.modules.vector_mod2_dense',
sources = ['sage/modules/vector_mod2_dense.pyx'],
libraries = m4ri_libs + gd_libs + png_libs,
library_dirs = m4ri_library_dirs + gd_library_dirs + png_library_dirs,
include_dirs = m4ri_include_dirs + gd_include_dirs + png_include_dirs,
extra_compile_args = m4ri_extra_compile_args),

Extension('sage.modules.vector_rational_dense',
sources = ['sage/modules/vector_rational_dense.pyx']),

Extension('sage.modules.vector_real_double_dense',
['sage/modules/vector_real_double_dense.pyx']),

Extension('sage.modules.with_basis.indexed_element',
sources = ['sage/modules/with_basis/indexed_element.pyx']),
Extension('*', ['sage/modules/**/*.pyx']),

################################
##
Expand Down Expand Up @@ -1560,31 +1313,7 @@ def uname_specific(name, value, alternative):
##
################################

Extension('sage.schemes.elliptic_curves.descent_two_isogeny',
sources = ['sage/schemes/elliptic_curves/descent_two_isogeny.pyx'],
libraries = ['ratpoints']),

Extension('sage.schemes.elliptic_curves.period_lattice_region',
sources = ['sage/schemes/elliptic_curves/period_lattice_region.pyx']),

Extension('sage.schemes.elliptic_curves.mod_sym_num',
sources = ['sage/schemes/elliptic_curves/mod_sym_num.pyx']),

Extension('sage.schemes.hyperelliptic_curves.hypellfrob',
sources = ['sage/schemes/hyperelliptic_curves/hypellfrob.pyx',
'sage/schemes/hyperelliptic_curves/hypellfrob/hypellfrob.cpp',
'sage/schemes/hyperelliptic_curves/hypellfrob/recurrences_ntl.cpp',
'sage/schemes/hyperelliptic_curves/hypellfrob/recurrences_zn_poly.cpp'],
libraries = ['gmp', 'ntl', 'zn_poly'],
depends = ['sage/schemes/hyperelliptic_curves/hypellfrob/hypellfrob.h',
'sage/schemes/hyperelliptic_curves/hypellfrob/recurrences_ntl.h',
'sage/schemes/hyperelliptic_curves/hypellfrob/recurrences_zn_poly.h'],
language = 'c++',
include_dirs = ['sage/libs/ntl/',
'sage/schemes/hyperelliptic_curves/hypellfrob/']),

Extension('sage.schemes.toric.divisor_class',
sources = ['sage/schemes/toric/divisor_class.pyx']),
Extension('*', ['sage/schemes/**/*.pyx']),

################################
##
Expand All @@ -1600,39 +1329,14 @@ def uname_specific(name, value, alternative):
##
################################

Extension('sage.stats.hmm.util',
sources = ['sage/stats/hmm/util.pyx']),

Extension('sage.stats.hmm.distributions',
sources = ['sage/stats/hmm/distributions.pyx']),

Extension('sage.stats.hmm.hmm',
sources = ['sage/stats/hmm/hmm.pyx']),

Extension('sage.stats.hmm.chmm',
sources = ['sage/stats/hmm/chmm.pyx']),

Extension('sage.stats.intlist',
sources = ['sage/stats/intlist.pyx']),

Extension('sage.stats.distributions.discrete_gaussian_integer',
sources = ['sage/stats/distributions/discrete_gaussian_integer.pyx', 'sage/stats/distributions/dgs_gauss_mp.c', 'sage/stats/distributions/dgs_gauss_dp.c', 'sage/stats/distributions/dgs_bern.c'],
depends = ['sage/stats/distributions/dgs_gauss.h', 'sage/stats/distributions/dgs_bern.h', 'sage/stats/distributions/dgs_misc.h'],
extra_compile_args = ["-D_XOPEN_SOURCE=600"]),
Extension('*', ['sage/stats/**/*.pyx']),

################################
##
## sage.structure
##
################################

# Compile this with -Os because it works around a bug with
# GCC-4.7.3 + Cython 0.19 on Itanium, see Trac #14452. Moreover, it
# actually results in faster code than -O3.
Extension('sage.structure.element',
sources = ['sage/structure/element.pyx'],
extra_compile_args=["-Os"]),

Extension('*', ['sage/structure/*.pyx']),

################################
Expand All @@ -1649,10 +1353,6 @@ def uname_specific(name, value, alternative):
##
################################

Extension('sage.tests.stl_vector',
sources = ['sage/tests/stl_vector.pyx'],
language = 'c++'),
Extension('*', ['sage/tests/**/*.pyx'])

Extension('sage.tests.cython',
sources = ['sage/tests/cython.pyx']),
]
2 changes: 2 additions & 0 deletions src/sage/algebras/quatalg/quaternion_algebra_cython.pyx
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# distutils: language = c++
# distutils: libraries = gmp m ntl
"""
Optimized Cython code needed by quaternion algebras
Expand Down
2 changes: 2 additions & 0 deletions src/sage/algebras/quatalg/quaternion_algebra_element.pyx
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# distutils: language = c++
# distutils: libraries = gmp m ntl
"""
Elements of Quaternion Algebras
Expand Down
Loading

0 comments on commit 54b9dba

Please sign in to comment.