Opened 7 years ago

Closed 7 years ago

#18030 closed enhancement (fixed)

Clean-up stdsage.pxi includes

Reported by: jdemeyer Owned by:
Priority: major Milestone: sage-6.6
Component: cython Keywords:
Cc: Merged in:
Authors: Jeroen Demeyer Reviewers: Peter Bruin
Report Upstream: N/A Work issues:
Branch: 00db4b2 (Commits, GitHub, GitLab) Commit: 00db4b2ce1e441578db6c939af4f399c2736ccd8
Dependencies: #18007, #18145 Stopgaps:

Status badges

Description


Change History (19)

comment:1 Changed 7 years ago by jdemeyer

  • Branch set to u/jdemeyer/ticket/18030

comment:2 Changed 7 years ago by jdemeyer

  • Commit set to 9aadb701eaed57ca58515207a9022baaee043887
  • Status changed from new to needs_review

New commits:

ce992d2Move includes of interrupt.pxi to .pyx files
9aadb70Clean-up stdsage.pxi includes

comment:3 Changed 7 years ago by git

  • Commit changed from 9aadb701eaed57ca58515207a9022baaee043887 to 9ede242a98acf2ddc50a8460ba6f83d07b0af67d

Branch pushed to git repo; I updated commit sha1. New commits:

9ede242Directly cimport PY_NEW

comment:4 Changed 7 years ago by git

  • Commit changed from 9ede242a98acf2ddc50a8460ba6f83d07b0af67d to 5137c4b6e7c47067e535a91495c8bc8808f1f140

Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:

5137c4bDirectly cimport PY_NEW

comment:5 Changed 7 years ago by pbruin

  • Reviewers set to Peter Bruin
  • Status changed from needs_review to positive_review

Looks good to me.

comment:6 Changed 7 years ago by vbraun

  • Status changed from positive_review to needs_work
Cythonizing sage/sat/solvers/cryptominisat/solverconf.pyx

Error compiling Cython file:
------------------------------------------------------------
...
        cdef uint32_t *learnt1 = get_unitary_learnts_helper(self._solver,&num)

        r = []
        for i in range(num):
            r.append( (-1)**int(learnt1[i]&1) * (int(learnt1[i]>>1)+1) )
        sage_free(learnt1)
                ^
------------------------------------------------------------

sage/sat/solvers/cryptominisat/cryptominisat.pyx:415:17: undeclared name not builtin: sage_free

Error compiling Cython file:
------------------------------------------------------------
...
        cdef uint32_t *learnt1 = get_unitary_learnts_helper(self._solver,&num)

        r = []
        for i in range(num):
            r.append( (-1)**int(learnt1[i]&1) * (int(learnt1[i]>>1)+1) )
        sage_free(learnt1)
                        ^
------------------------------------------------------------

sage/sat/solvers/cryptominisat/cryptominisat.pyx:415:25: Cannot convert 'uint32_t *' to Python object

Error compiling Cython file:
------------------------------------------------------------
...

        r = []
        for i in range(num):
            clause = learnt[i]
            C = [(-1)**int(clause[j]&1) * (int(clause[j]>>1)+1) for j in range(1,clause[0]+1)]
            sage_free(clause)
                           ^
------------------------------------------------------------

sage/sat/solvers/cryptominisat/cryptominisat.pyx:427:28: Cannot convert 'uint32_t *' to Python object

Error compiling Cython file:
------------------------------------------------------------
...
        for i in range(num):
            clause = learnt[i]
            C = [(-1)**int(clause[j]&1) * (int(clause[j]>>1)+1) for j in range(1,clause[0]+1)]
            sage_free(clause)
            r.append(tuple(C))
        sage_free(learnt)
                       ^
------------------------------------------------------------

sage/sat/solvers/cryptominisat/cryptominisat.pyx:429:24: Cannot convert 'uint32_t **' to Python object
Traceback (most recent call last):
  File "/mnt/disk/home/release/Sage/local/lib/python2.7/site-packages/Cython-0.22-py2.7-linux-x86_64.egg/Cython/Build/Dependencies.py", line 1003, in cythonize_one_helper
    return cythonize_one(*m[1:])
  File "/mnt/disk/home/release/Sage/local/lib/python2.7/site-packages/Cython-0.22-py2.7-linux-x86_64.egg/Cython/Build/Dependencies.py", line 985, in cythonize_one

comment:7 Changed 7 years ago by jdemeyer

This is exactly the problem that #18145 was meant to detect, so that ticket did its job.

comment:8 Changed 7 years ago by git

  • Commit changed from 5137c4b6e7c47067e535a91495c8bc8808f1f140 to 8d18d587f40faf6c67af66aee90130892282aab4

Branch pushed to git repo; I updated commit sha1. New commits:

c98c51aAdd includes to modular_decomposition.pyx
ba7c496Merge commit 'c98c51a982ee78488a5ff2b01ffe5dfb996ef969' into t/18030/ticket/18030
8d18d58Add includes to cryptominisat.pyx

comment:9 Changed 7 years ago by jdemeyer

  • Status changed from needs_work to needs_review

comment:10 Changed 7 years ago by jdemeyer

  • Status changed from needs_review to needs_work

comment:11 Changed 7 years ago by jdemeyer

  • Dependencies changed from #18007 to #18007, #18145

comment:12 Changed 7 years ago by git

  • Commit changed from 8d18d587f40faf6c67af66aee90130892282aab4 to b55b277f371a0aba7683ea0614e2ec1d818d92b3

Branch pushed to git repo; I updated commit sha1. New commits:

c98e78dMerge commit '7d1b5f8ca56180ca2d7044453707c619ef17b51a' into HEAD
c683c19Add PARI documentation
4b07161Better format links
9f710a2Merge commit '4b071619a00e667d3452a73229de43f231dfe662' into HEAD
41755feRe-organize building of Sage library and auto-generated files
3510d45Minor review fixes
e56aeb2Cythonize optional extensions
71c60acMerge commit 'e56aeb2c9a190813096a0f7db1683d3d5bc774d1' into t/18030/ticket/18030
b55b277Add missing includes

comment:13 Changed 7 years ago by jdemeyer

  • Status changed from needs_work to needs_review

comment:14 Changed 7 years ago by pbruin

  • Status changed from needs_review to positive_review

Passes tests again (I tested this merged with 6.6.rc3).

comment:15 Changed 7 years ago by vbraun

  • Status changed from positive_review to needs_work

Conflicts, merge in 6.7.rc0

comment:16 Changed 7 years ago by git

  • Commit changed from b55b277f371a0aba7683ea0614e2ec1d818d92b3 to 00db4b2ce1e441578db6c939af4f399c2736ccd8

Branch pushed to git repo; I updated commit sha1. New commits:

00db4b2Merge tag '6.7.beta0' into t/18030/ticket/18030

comment:17 Changed 7 years ago by jdemeyer

  • Status changed from needs_work to needs_review

comment:18 Changed 7 years ago by pbruin

  • Status changed from needs_review to positive_review

comment:19 Changed 7 years ago by vbraun

  • Branch changed from u/jdemeyer/ticket/18030 to 00db4b2ce1e441578db6c939af4f399c2736ccd8
  • Resolution set to fixed
  • Status changed from positive_review to closed
Note: See TracTickets for help on using tickets.