mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 03:39:03 -04:00
Initial import (#877651).
This commit is contained in:
pcpa
parent
257b1142ac
commit
86f823b2b0
41 changed files with 13000 additions and 0 deletions
194
sagemath-fplll.patch
Normal file
194
sagemath-fplll.patch
Normal file
|
|
@ -0,0 +1,194 @@
|
|||
diff -up sage-5.8/spkg/build/sage-5.8/module_list.py.orig sage-5.8/spkg/build/sage-5.8/module_list.py
|
||||
--- sage-5.8/spkg/build/sage-5.8/module_list.py.orig 2013-03-19 18:10:02.994978010 -0300
|
||||
+++ sage-5.8/spkg/build/sage-5.8/module_list.py 2013-03-19 18:10:19.754978651 -0300
|
||||
@@ -660,6 +660,7 @@ ext_modules = [
|
||||
libraries = ['gmp', 'mpfr', 'stdc++', 'fplll'],
|
||||
language="c++",
|
||||
include_dirs = [SAGE_INC + 'fplll'],
|
||||
+ extra_compile_args=["-DFPLLL_V3_COMPAT"],
|
||||
depends = [SAGE_INC + "fplll/fplll.h"]),
|
||||
|
||||
Extension('sage.libs.linbox.linbox',
|
||||
diff -up sage-5.8/spkg/build/sage-5.8/sage/libs/fplll/fplll.pxi.orig sage-5.8/spkg/build/sage-5.8/sage/libs/fplll/fplll.pxi
|
||||
--- sage-5.8/spkg/build/sage-5.8/sage/libs/fplll/fplll.pxi.orig 2013-03-19 18:10:17.008978546 -0300
|
||||
+++ sage-5.8/spkg/build/sage-5.8/sage/libs/fplll/fplll.pxi 2013-03-19 18:10:19.755978652 -0300
|
||||
@@ -10,22 +10,22 @@ cdef extern from "fplll/fplll.h":
|
||||
#
|
||||
|
||||
cdef extern from "fplll/nr.h":
|
||||
- ctypedef struct Z_NR "Z_NR<mpz_t>":
|
||||
+ ctypedef struct Z_NR "fplll::Z_NR<mpz_t>":
|
||||
mpz_t (*GetData)()
|
||||
void (*set_mpz_t "set")(mpz_t d)
|
||||
|
||||
- Z_NR *Z_NR_new "new Z_NR<mpz_t>"()
|
||||
+ Z_NR *Z_NR_new "new fplll::Z_NR<mpz_t>"()
|
||||
void Z_NR_delete "delete "(Z_NR *mem)
|
||||
|
||||
- Z_NR *Z_NR_construct "Construct< Z_NR<mpz_t> >"(void *mem)
|
||||
- void Z_NR_destruct "Destruct< Z_NR<mpz_t> >"(Z_NR *mem)
|
||||
+ Z_NR *Z_NR_construct "Construct< fplll::Z_NR<mpz_t> >"(void *mem)
|
||||
+ void Z_NR_destruct "Destruct< fplll::Z_NR<mpz_t> >"(Z_NR *mem)
|
||||
|
||||
#
|
||||
# matrices over the integers
|
||||
#
|
||||
|
||||
cdef extern from "fplll/matrix.h":
|
||||
- ctypedef struct ZZ_mat "ZZ_mat<mpz_t>":
|
||||
+ ctypedef struct ZZ_mat "fplll::ZZ_mat<mpz_t>":
|
||||
int (*GetNumCols)()
|
||||
int (*GetNumRows)()
|
||||
|
||||
@@ -41,83 +41,83 @@ cdef extern from "fplll/matrix.h":
|
||||
void (*gen_ntrulike2)(int bits,int q)
|
||||
void (*gen_ajtai)(double alpha)
|
||||
|
||||
- ZZ_mat *ZZ_mat_new "new ZZ_mat<mpz_t>"(int r, int c)
|
||||
+ ZZ_mat *ZZ_mat_new "new fplll::ZZ_mat<mpz_t>"(int r, int c)
|
||||
void ZZ_mat_delete "delete "(ZZ_mat *mem)
|
||||
|
||||
#
|
||||
# fastest LLL
|
||||
#
|
||||
|
||||
-cdef extern from "fplll/fast.h":
|
||||
- ctypedef struct fast_double "fast<mpz_t,double>":
|
||||
+cdef extern from "fplll/fplllv31.h":
|
||||
+ ctypedef struct fast_double "fplll::fast<mpz_t,double>":
|
||||
int (*LLL)()
|
||||
ZZ_mat* (*GetBase)()
|
||||
|
||||
- fast_double *fast_double_new "new fast<mpz_t,double>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
+ fast_double *fast_double_new "new fplll::fast<mpz_t,double>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
void fast_double_delete "delete "(fast_double *mem)
|
||||
|
||||
#
|
||||
# fastest LLL with early reduction
|
||||
#
|
||||
|
||||
-cdef extern from "fplll/fast_earlyred.h":
|
||||
- ctypedef struct fast_early_red_double "fast_early_red<mpz_t,double>":
|
||||
+cdef extern from "fplll/fplllv31.h":
|
||||
+ ctypedef struct fast_early_red_double "fplll::fast_early_red<mpz_t,double>":
|
||||
int (*LLL)()
|
||||
ZZ_mat* (*GetBase)()
|
||||
|
||||
- fast_early_red_double *fast_early_red_double_new "new fast_early_red<mpz_t,double>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
+ fast_early_red_double *fast_early_red_double_new "new fplll::fast_early_red<mpz_t,double>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
void fast_early_red_double_delete "delete "(fast_early_red_double *mem)
|
||||
|
||||
#
|
||||
# heuristic
|
||||
#
|
||||
|
||||
-cdef extern from "fplll/heuristic.h":
|
||||
- ctypedef struct heuristic_mpfr "heuristic<mpz_t,mpfr_t>":
|
||||
+cdef extern from "fplll/fplllv31.h":
|
||||
+ ctypedef struct heuristic_mpfr "fplll::heuristic<mpz_t,mpfr_t>":
|
||||
int (*LLL)()
|
||||
ZZ_mat* (*GetBase)()
|
||||
|
||||
- heuristic_mpfr *heuristic_mpfr_new "new heuristic<mpz_t,mpfr_t>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
+ heuristic_mpfr *heuristic_mpfr_new "new fplll::heuristic<mpz_t,mpfr_t>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
void heuristic_mpfr_delete "delete "(heuristic_mpfr *mem)
|
||||
|
||||
- ctypedef struct heuristic_dpe "heuristic<mpz_t,dpe_t>":
|
||||
+ ctypedef struct heuristic_dpe "fplll::heuristic<mpz_t,dpe_t>":
|
||||
int (*LLL)()
|
||||
ZZ_mat* (*GetBase)()
|
||||
|
||||
- heuristic_dpe *heuristic_dpe_new "new heuristic<mpz_t,dpe_t>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
+ heuristic_dpe *heuristic_dpe_new "new fplll::heuristic<mpz_t,dpe_t>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
void heuristic_dpe_delete "delete "(heuristic_dpe *mem)
|
||||
|
||||
- ctypedef struct heuristic_double "heuristic<mpz_t,double>":
|
||||
+ ctypedef struct heuristic_double "fplll::heuristic<mpz_t,double>":
|
||||
int (*LLL)()
|
||||
ZZ_mat* (*GetBase)()
|
||||
|
||||
- heuristic_double *heuristic_double_new "new heuristic<mpz_t,double>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
+ heuristic_double *heuristic_double_new "new fplll::heuristic<mpz_t,double>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
void heuristic_double_delete "delete "(heuristic_double *mem)
|
||||
|
||||
#
|
||||
# heuristic with early reduction
|
||||
#
|
||||
|
||||
-cdef extern from "fplll/heuristic_early_red.h":
|
||||
- ctypedef struct heuristic_early_red_mpfr "heuristic_early_red<mpz_t,mpfr_t>":
|
||||
+cdef extern from "fplll/fplllv31.h":
|
||||
+ ctypedef struct heuristic_early_red_mpfr "fplll::heuristic_early_red<mpz_t,mpfr_t>":
|
||||
int (*LLL)()
|
||||
ZZ_mat* (*GetBase)()
|
||||
|
||||
- heuristic_early_red_mpfr *heuristic_early_red_mpfr_new "new heuristic_early_red<mpz_t,mpfr_t>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
+ heuristic_early_red_mpfr *heuristic_early_red_mpfr_new "new fplll::heuristic_early_red<mpz_t,mpfr_t>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
void heuristic_early_red_mpfr_delete "delete "(heuristic_early_red_mpfr *mem)
|
||||
|
||||
- ctypedef struct heuristic_early_red_dpe "heuristic_early_red<mpz_t,dpe_t>":
|
||||
+ ctypedef struct heuristic_early_red_dpe "fplll::heuristic_early_red<mpz_t,dpe_t>":
|
||||
int (*LLL)()
|
||||
ZZ_mat* (*GetBase)()
|
||||
|
||||
- heuristic_early_red_dpe *heuristic_early_red_dpe_new "new heuristic_early_red<mpz_t,dpe_t>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
+ heuristic_early_red_dpe *heuristic_early_red_dpe_new "new fplll::heuristic_early_red<mpz_t,dpe_t>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
void heuristic_early_red_dpe_delete "delete "(heuristic_early_red_dpe *mem)
|
||||
|
||||
- ctypedef struct heuristic_early_red_double "heuristic_early_red<mpz_t,double>":
|
||||
+ ctypedef struct heuristic_early_red_double "fplll::heuristic_early_red<mpz_t,double>":
|
||||
int (*LLL)()
|
||||
ZZ_mat* (*GetBase)()
|
||||
|
||||
- heuristic_early_red_double *heuristic_early_red_double_new "new heuristic_early_red<mpz_t,double>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
+ heuristic_early_red_double *heuristic_early_red_double_new "new fplll::heuristic_early_red<mpz_t,double>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
void heuristic_early_red_double_delete "delete "(heuristic_early_red_double *mem)
|
||||
|
||||
|
||||
@@ -126,36 +126,36 @@ cdef extern from "fplll/heuristic_early
|
||||
# provable LLL
|
||||
#
|
||||
|
||||
-cdef extern from "fplll/proved.h":
|
||||
- ctypedef struct proved_mpfr "proved<mpz_t,mpfr_t>":
|
||||
+cdef extern from "fplll/fplllv31.h":
|
||||
+ ctypedef struct proved_mpfr "fplll::proved<mpz_t,mpfr_t>":
|
||||
int (*LLL)()
|
||||
ZZ_mat* (*GetBase)()
|
||||
|
||||
- proved_mpfr *proved_mpfr_new "new proved<mpz_t,mpfr_t>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
+ proved_mpfr *proved_mpfr_new "new fplll::proved<mpz_t,mpfr_t>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
void proved_mpfr_delete "delete "(proved_mpfr *mem)
|
||||
|
||||
- ctypedef struct proved_dpe "proved<mpz_t,dpe_t>":
|
||||
+ ctypedef struct proved_dpe "fplll::proved<mpz_t,dpe_t>":
|
||||
int (*LLL)()
|
||||
ZZ_mat* (*GetBase)()
|
||||
|
||||
- proved_dpe *proved_dpe_new "new proved<mpz_t,dpe_t>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
+ proved_dpe *proved_dpe_new "new fplll::proved<mpz_t,dpe_t>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
void proved_dpe_delete "delete "(proved_dpe *mem)
|
||||
|
||||
- ctypedef struct proved_double "proved<mpz_t,double>":
|
||||
+ ctypedef struct proved_double "fplll::proved<mpz_t,double>":
|
||||
int (*LLL)()
|
||||
ZZ_mat* (*GetBase)()
|
||||
|
||||
- proved_double *proved_double_new "new proved<mpz_t,double>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
+ proved_double *proved_double_new "new fplll::proved<mpz_t,double>"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
void proved_double_delete "delete "(proved_double *mem)
|
||||
|
||||
#
|
||||
# wrapper code which chooses a LLL sequence automatically
|
||||
#
|
||||
|
||||
-cdef extern from "fplll/wrapper.h":
|
||||
- ctypedef struct wrapper:
|
||||
+cdef extern from "fplll/fplllv31.h":
|
||||
+ ctypedef struct wrapper "fplll::wrapper":
|
||||
int (*LLL)()
|
||||
ZZ_mat* (*GetBase)()
|
||||
|
||||
- wrapper *wrapper_new "new wrapper"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
+ wrapper *wrapper_new "new fplll::wrapper"(ZZ_mat *B,int precision, double eta, double delta)
|
||||
void wrapper_delete "delete "(wrapper *mem)
|
||||
Loading…
Add table
Add a link
Reference in a new issue