Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Fix invalid uses of sig_on() in matrix.misc
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdemeyer
jdemeyer committed Feb 5, 2019
1 parent a6cab5b commit 85d25bf
Showing 1 changed file with 101 additions and 118 deletions.
219 changes: 101 additions & 118 deletions src/sage/matrix/misc.pyx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ relevant classes and this file deleted.
"""
from __future__ import absolute_import

from cysignals.signals cimport sig_on, sig_off
from cysignals.signals cimport sig_check

from sage.ext.mod_int cimport *
from sage.libs.gmp.mpz cimport *
Expand Down Expand Up @@ -83,63 +83,59 @@ def matrix_integer_dense_rational_reconstruction(Matrix_integer_dense A, Integer
R = Matrix_rational_dense.__new__(Matrix_rational_dense,
A.parent().change_ring(QQ), 0,0,0)

cdef mpz_t a, bnd, other_bnd, one, denom, tmp
cdef mpz_t a, bnd, other_bnd, denom, tmp
cdef mpq_t qtmp
cdef Integer _bnd
cdef Py_ssize_t i, j
cdef int do_it
import math

sig_on()
try:
mpz_init_set_si(denom, 1)
mpz_init(a)
mpz_init(tmp)
mpz_init_set_si(one, 1)
mpz_init(other_bnd)
mpq_init(qtmp)

_bnd = (N//2).isqrt()
mpz_init_set(bnd, _bnd.value)
mpz_sub(other_bnd, N.value, bnd)

for i from 0 <= i < A._nrows:
for j from 0 <= j < A._ncols:
A.get_unsafe_mpz(i, j, a)
if mpz_cmp(denom, one) != 0:
mpz_mul(a, a, denom)
mpz_fdiv_r(a, a, N.value)
do_it = 0
if mpz_cmp(a, bnd) <= 0:
do_it = 1
elif mpz_cmp(a, other_bnd) >= 0:
mpz_sub(a, a, N.value)
do_it = 1
if do_it:
fmpz_set_mpz(fmpq_mat_entry_num(R._matrix, i, j), a)
if mpz_cmp(denom, one) != 0:
fmpz_set_mpz(fmpq_mat_entry_den(R._matrix, i, j), denom)
fmpq_canonicalise(fmpq_mat_entry(R._matrix, i, j))
else:
fmpz_one(fmpq_mat_entry_den(R._matrix, i, j))

mpz_init_set_si(denom, 1)
mpz_init(a)
mpz_init(tmp)
mpz_init(other_bnd)
mpq_init(qtmp)

_bnd = (N//2).isqrt()
mpz_init_set(bnd, _bnd.value)
mpz_sub(other_bnd, N.value, bnd)

for i in range(A._nrows):
for j in range(A._ncols):
sig_check()
A.get_unsafe_mpz(i, j, a)
if mpz_cmp_ui(denom, 1) != 0:
mpz_mul(a, a, denom)
mpz_fdiv_r(a, a, N.value)
do_it = 0
if mpz_cmp(a, bnd) <= 0:
do_it = 1
elif mpz_cmp(a, other_bnd) >= 0:
mpz_sub(a, a, N.value)
do_it = 1
if do_it:
fmpz_set_mpz(fmpq_mat_entry_num(R._matrix, i, j), a)
if mpz_cmp_ui(denom, 1) != 0:
fmpz_set_mpz(fmpq_mat_entry_den(R._matrix, i, j), denom)
fmpq_canonicalise(fmpq_mat_entry(R._matrix, i, j))
else:
# Otherwise have to do it the hard way
A.get_unsafe_mpz(i, j, tmp)
mpq_rational_reconstruction(qtmp, tmp, N.value)
mpz_lcm(denom, denom, mpq_denref(qtmp))
fmpq_set_mpq(fmpq_mat_entry(R._matrix, i, j), qtmp)

mpz_clear(denom)
mpz_clear(a)
mpz_clear(tmp)
mpz_clear(one)
mpz_clear(other_bnd)
mpz_clear(bnd)
mpq_clear(qtmp)
finally:
sig_off()
fmpz_one(fmpq_mat_entry_den(R._matrix, i, j))
else:
# Otherwise have to do it the hard way
A.get_unsafe_mpz(i, j, tmp)
mpq_rational_reconstruction(qtmp, tmp, N.value)
mpz_lcm(denom, denom, mpq_denref(qtmp))
fmpq_set_mpq(fmpq_mat_entry(R._matrix, i, j), qtmp)

mpz_clear(denom)
mpz_clear(a)
mpz_clear(tmp)
mpz_clear(other_bnd)
mpz_clear(bnd)
mpq_clear(qtmp)

return R


def matrix_integer_sparse_rational_reconstruction(Matrix_integer_sparse A, Integer N):
"""
Given a sparse matrix over the integers and an integer modulus, do
Expand Down Expand Up @@ -171,68 +167,63 @@ def matrix_integer_sparse_rational_reconstruction(Matrix_integer_sparse A, Integ
A.parent().change_ring(QQ), 0,0,0)

cdef mpq_t t
cdef mpz_t a, bnd, other_bnd, one, denom
cdef mpz_t a, bnd, other_bnd, denom
cdef Integer _bnd
cdef Py_ssize_t i, j
cdef int do_it
cdef mpz_vector* A_row
cdef mpq_vector* R_row
import math

sig_on()
try:
mpq_init(t)
mpz_init_set_si(denom, 1)
mpz_init(a)
mpz_init_set_si(one, 1)
mpz_init(other_bnd)

_bnd = (N//2).isqrt()
mpz_init_set(bnd, _bnd.value)
mpz_sub(other_bnd, N.value, bnd)

for i from 0 <= i < A._nrows:
A_row = &A._matrix[i]
R_row = &R._matrix[i]
reallocate_mpq_vector(R_row, A_row.num_nonzero)
R_row.num_nonzero = A_row.num_nonzero
R_row.degree = A_row.degree
for j from 0 <= j < A_row.num_nonzero:
mpz_set(a, A_row.entries[j])
if mpz_cmp(denom, one) != 0:
mpz_mul(a, a, denom)
mpz_fdiv_r(a, a, N.value)
do_it = 0
if mpz_cmp(a, bnd) <= 0:
do_it = 1
elif mpz_cmp(a, other_bnd) >= 0:
mpz_sub(a, a, N.value)
do_it = 1
if do_it:
mpz_set(mpq_numref(t), a)
if mpz_cmp(denom, one) != 0:
mpz_set(mpq_denref(t), denom)
mpq_canonicalize(t)
else:
mpz_set_si(mpq_denref(t), 1)
mpq_set(R_row.entries[j], t)
R_row.positions[j] = A_row.positions[j]

mpq_init(t)
mpz_init_set_si(denom, 1)
mpz_init(a)
mpz_init(other_bnd)

_bnd = (N//2).isqrt()
mpz_init_set(bnd, _bnd.value)
mpz_sub(other_bnd, N.value, bnd)

for i in range(A._nrows):
sig_check()
A_row = &A._matrix[i]
R_row = &R._matrix[i]
reallocate_mpq_vector(R_row, A_row.num_nonzero)
R_row.num_nonzero = A_row.num_nonzero
R_row.degree = A_row.degree
for j in range(A_row.num_nonzero):
sig_check()
mpz_set(a, A_row.entries[j])
if mpz_cmp_ui(denom, 1) != 0:
mpz_mul(a, a, denom)
mpz_fdiv_r(a, a, N.value)
do_it = 0
if mpz_cmp(a, bnd) <= 0:
do_it = 1
elif mpz_cmp(a, other_bnd) >= 0:
mpz_sub(a, a, N.value)
do_it = 1
if do_it:
mpz_set(mpq_numref(t), a)
if mpz_cmp_ui(denom, 1) != 0:
mpz_set(mpq_denref(t), denom)
mpq_canonicalize(t)
else:
# Otherwise have to do it the hard way
mpq_rational_reconstruction(t, A_row.entries[j], N.value)
mpq_set(R_row.entries[j], t)
R_row.positions[j] = A_row.positions[j]
mpz_lcm(denom, denom, mpq_denref(t))

mpq_clear(t)

mpz_clear(denom)
mpz_clear(a)
mpz_clear(one)
mpz_clear(other_bnd)
mpz_clear(bnd)
finally:
sig_off()
mpz_set_si(mpq_denref(t), 1)
mpq_set(R_row.entries[j], t)
R_row.positions[j] = A_row.positions[j]
else:
# Otherwise have to do it the hard way
mpq_rational_reconstruction(t, A_row.entries[j], N.value)
mpq_set(R_row.entries[j], t)
R_row.positions[j] = A_row.positions[j]
mpz_lcm(denom, denom, mpq_denref(t))

mpq_clear(t)
mpz_clear(denom)
mpz_clear(a)
mpz_clear(other_bnd)
mpz_clear(bnd)

return R


Expand Down Expand Up @@ -440,8 +431,6 @@ def matrix_rational_echelon_form_multimodular(Matrix self, height_guess=None, pr
return E, tuple(best_pivots)


###########################

def cmp_pivots(x, y):
"""
Compare two sequences of pivot columns.
Expand Down Expand Up @@ -485,12 +474,6 @@ def cmp_pivots(x, y):
return -1



#######################################



#######################################
def hadamard_row_bound_mpfr(Matrix A):
"""
Given a matrix A with entries that coerce to RR, compute the row
Expand Down Expand Up @@ -540,9 +523,10 @@ def hadamard_row_bound_mpfr(Matrix A):
mpfr_init(pr)
mpfr_set_si(d, 0, MPFR_RNDU)

for i from 0 <= i < A._nrows:
for i in range(A._nrows):
mpfr_set_si(s, 0, MPFR_RNDU)
for j from 0 <= j < A._ncols:
for j in range(A._ncols):
sig_check()
a = A.get_unsafe(i, j)
mpfr_mul(pr, a.value, a.value, MPFR_RNDU)
mpfr_add(s, s, pr, MPFR_RNDU)
Expand All @@ -555,4 +539,3 @@ def hadamard_row_bound_mpfr(Matrix A):
mpfr_clear(d)
mpfr_clear(pr)
return b.ceil()

0 comments on commit 85d25bf

Please sign in to comment.