Opened 5 years ago

Closed 5 years ago

#20946 closed enhancement (fixed)

update giac spkg

Reported by: frederichan Owned by:
Priority: major Milestone: sage-7.5
Component: packages: optional Keywords: giac
Cc: Merged in:
Authors: Frederic Han Reviewers: Ralf Stephan
Report Upstream: N/A Work issues:
Branch: c709c1e (Commits, GitHub, GitLab) Commit: c709c1ee6a931eb906284a038e52acd4b200fcc4
Dependencies: Stopgaps:

Status badges

Description (last modified by frederichan)

Update the spkg to upstream 1.2.2-95

The giac tarball built from spkg-src to put in upstream/ is there:

http://webusers.imj-prg.fr/~frederic.han/xcas/sage/giac-1.2.2.95.tar.bz2

Switch to .bz2 as wished in #18826

add --disable-ao in spkg-install to avoid libao dependency. remove the --disable-gmpxx in spkg-install. The built seems not broken anymore.

updtate giacpy to 0.6 doctest fix + change of name to giacpy_sage. The tarball to put in upstream is: http://webusers.imj-prg.fr/~frederic.han/xcas/giacpy/sage/giacpy_sage-0.6.tar.gz

The modifications about giacpy are there: https://gitlab.math.univ-paris-diderot.fr/han/giacpy-sage

The 1.2.2.85 version of giac should fix a race condition in icas that could appear during the test suite.

Change History (35)

comment:1 follow-up: Changed 5 years ago by leif

  • Authors set to Han Frederic
  • Status changed from new to needs_review

You're not (yet?) listed here, so hopefully I've not misspelled your name.

comment:2 in reply to: ↑ 1 Changed 5 years ago by frederichan

Replying to leif:

You're not (yet?) listed here, so hopefully I've not misspelled your name.

its done.

I need to test more. Ex:

Failed example:
[giacpy-0.5.6]     f=1/(5+cos(4*x));f.int(x)
[giacpy-0.5.6] Expected:
[giacpy-0.5.6]     1/2/(2*sqrt(6))*(atan(2*tan(4*x/2)/sqrt(6))+pi*floor(4*x/2/pi+1/2))
[giacpy-0.5.6] Got:
[giacpy-0.5.6]     1/2/(2*sqrt(6))*(atan((-sqrt(6)*sin(4*x)+2*sin(4*x))/(sqrt(6)*cos(4*x)+sqrt(6)-2*cos(4*x)+2))+4*x/2)

comment:3 Changed 5 years ago by frederichan

  • Status changed from needs_review to needs_work

comment:4 Changed 5 years ago by git

  • Commit set to 88c2d0a0227bb9d58e079d67810cae3b659938de

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

600e7a6update to giacpy 0.6. start to change the name from giacpy to giacpy_sage
adae5f7fixes changes of name for giacpy in src/sage/libs/giac.py
88c2d0aupdate SPKG.txt

comment:5 Changed 5 years ago by frederichan

  • Description modified (diff)

comment:6 Changed 5 years ago by git

  • Commit changed from 88c2d0a0227bb9d58e079d67810cae3b659938de to c660391efb842671620f062bc6acae741dab1db3

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

c660391change the name of the spkg giacpy to giacpy_sage

comment:7 Changed 5 years ago by frederichan

Comment 2 is not a problem. This change was done on purpose in giac, both answer are correct. giacpy-0.6 doctests can deal with both answers.

I am waiting a bit more because I have found a bug in 1.2.2.67 http://xcas.e.ujf-grenoble.fr/XCAS/viewtopic.php?f=3&t=1731

comment:8 Changed 5 years ago by git

  • Commit changed from c660391efb842671620f062bc6acae741dab1db3 to eb2591b22c809a5aea4fbed08aadfb110ca31e11

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

eb2591bupdate to giac-1.2.2-69

comment:9 Changed 5 years ago by frederichan

  • Description modified (diff)

comment:10 Changed 5 years ago by frederichan

  • Status changed from needs_work to needs_review

comment:11 follow-up: Changed 5 years ago by fbissey

Darn, I have to update my ebuild for Gentoo. Since we have a spkg-src already should i fix it to get lapack in sage like I did in sage-on-gentoo or should we wait a bit? I would also prefer if the tarball and the folder in which giacpy_sage unfold were matching the new package name.

comment:12 Changed 5 years ago by frederichan

  • Description modified (diff)

comment:13 Changed 5 years ago by git

  • Commit changed from eb2591b22c809a5aea4fbed08aadfb110ca31e11 to ddfde459fae8fdce2bfaca37c269edb0f480e5f7

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

ddfde45change the tarball name of giacpy to giacpy_sage

comment:14 in reply to: ↑ 11 ; follow-up: Changed 5 years ago by frederichan

Replying to fbissey:

Darn, I have to update my ebuild for Gentoo. Since we have a spkg-src already should i fix it to get lapack in sage like I did in sage-on-gentoo or should we wait a bit?

Feel free to modify as you want, I have put it on a public branch for this. I have no news from parisse about a lapack change except the discussion on sage-devel.

I would also prefer if the tarball and the folder in which giacpy_sage unfold were matching the new package name.

should be done now

comment:15 in reply to: ↑ 14 Changed 5 years ago by fbissey

Replying to frederichan:

Replying to fbissey:

Darn, I have to update my ebuild for Gentoo. Since we have a spkg-src already should i fix it to get lapack in sage like I did in sage-on-gentoo or should we wait a bit?

Feel free to modify as you want, I have put it on a public branch for this. I have no news from parisse about a lapack change except the discussion on sage-devel.

Yes I can do a simple thing that will work in sage as it works on gentoo since we have .pc files for blas/lapack. Probably won't work for parisse.

I would also prefer if the tarball and the folder in which giacpy_sage unfold were matching the new package name.

should be done now

Thank you.

comment:16 follow-up: Changed 5 years ago by fbissey

Hum I am unwilling to touch the spkg-src while I don't completely understand it. I would regenerate Makefile.in and co and probably wreak havoc in the current setup. Better ship it as it is now. If we really want lapack support we'll work it out later.

Actually the current configuration will work on OS X I think and it is ok not to disable it as the runtime involved comes with the OS.

What is the last bit of spkg-inst supposed to do?

# create the script_subdirectory for the pexpect giac interface by running a trivial instruction
sage -c "giac(1)"
if [ $? -ne 0 ]; then
    echo >&2 "Error running the pexpect interface of giac"
    exit 1
fi

Where is the directory supposed to be created? I cannot see anything new when I run ./sage -p giac with this branch. I was, possibly, expecting something in local/share/sage/ext but found nothing there. Running ./sage -c "giac(1)" manually afterwards didn't have an impact either.

comment:17 in reply to: ↑ 16 Changed 5 years ago by frederichan

Replying to fbissey:

Hum I am unwilling to touch the spkg-src while I don't completely understand it. I would regenerate Makefile.in and co and probably wreak havoc in the current setup. Better ship it as it is now. If we really want lapack support we'll work it out later.

Actually the current configuration will work on OS X I think and it is ok not to disable it as the runtime involved comes with the OS.

What is the last bit of spkg-inst supposed to do?

# create the script_subdirectory for the pexpect giac interface by running a trivial instruction
sage -c "giac(1)"
if [ $? -ne 0 ]; then
    echo >&2 "Error running the pexpect interface of giac"
    exit 1
fi

Where is the directory supposed to be created? I cannot see anything new when I run ./sage -p giac with this branch. I was, possibly, expecting something in local/share/sage/ext but found nothing there. Running ./sage -c "giac(1)" manually afterwards didn't have an impact either.

Indeed It looks obsolete. may by since #17044. Moreover I think that it is the only dependency of SAGE_RUNTIMES cf #19672 comment 6 and jeroen answer. I am trying to remove both.

comment:18 Changed 5 years ago by git

  • Commit changed from ddfde459fae8fdce2bfaca37c269edb0f480e5f7 to 95c7d7cb1453cea41216cafccf62885e476399ab

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

912a9ceMerge branch 'develop' of git://trac.sagemath.org/sage into giacupdate
82bbbb4Remove built of script_subdirectory for the pexpect interface. (Obsolete since #17044)
95c7d7cremove SAGE_RUNTIME dependencies because only sage -c "giac(1)" in spkg_install needed it. (Cf #19672)

comment:19 Changed 5 years ago by git

  • Commit changed from 95c7d7cb1453cea41216cafccf62885e476399ab to 7a407a526acbe448c4fd62f1e1931775b939d478

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

7a407a5add SAGERUNTIME in giacpy_sage dependencies

comment:20 Changed 5 years ago by chapoton

  • Authors changed from Han Frederic to Frederic Han

comment:21 Changed 5 years ago by jdemeyer

  • Status changed from needs_review to needs_work

The branch no longer applies.

comment:22 Changed 5 years ago by git

  • Commit changed from 7a407a526acbe448c4fd62f1e1931775b939d478 to d2ae1dd1b095cdb20db5c35708190431537c92c1

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

2805398Merge branch 'develop' into public/giacupdate
d2ae1ddupdate giac to 1.2.2.81. adapt the cSolve patch

comment:23 Changed 5 years ago by frederichan

  • Description modified (diff)

comment:24 Changed 5 years ago by git

  • Commit changed from d2ae1dd1b095cdb20db5c35708190431537c92c1 to baa4eeb49aa7afb3a8bda950dd85108e2d963554

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

baa4eebupdate to giac-1.2.2.85. This version fix a race condition with icas and jordan that could appear with the test suite

comment:25 Changed 5 years ago by frederichan

  • Description modified (diff)

comment:26 Changed 5 years ago by frederichan

  • Status changed from needs_work to needs_review

comment:27 Changed 5 years ago by rws

  • Reviewers set to Ralf Stephan
  • Status changed from needs_review to positive_review

Passes make ptestlong with optional=atlas,ccache,giac,git_trac,mpir,python2,sage on a system where the old version was installed. I don't think there is something amiss in the package updates. Anyway it's an optional package and an improvement so I'll set positive.

comment:28 Changed 5 years ago by jdemeyer

  • Status changed from positive_review to needs_work

This conflicts with blocker ticket #21441, please rebase on top of that.

comment:29 Changed 5 years ago by jdemeyer

  • Dependencies set to #21441

comment:30 Changed 5 years ago by git

  • Commit changed from baa4eeb49aa7afb3a8bda950dd85108e2d963554 to a12a3ac420483b0a1d607e76985f743ed94a5bd0

Branch pushed to git repo; I updated commit sha1. Last 10 new commits:

bb613fdupdate SPKG.txt
0bf00dcchange the name of the spkg giacpy to giacpy_sage
a6418e4update to giac-1.2.2-69
d601e2bchange the tarball name of giacpy to giacpy_sage
6dcce70Remove built of script_subdirectory for the pexpect interface. (Obsolete since #17044)
f081cecremove SAGE_RUNTIME dependencies because only sage -c "giac(1)" in spkg_install needed it. (Cf #19672)
eb18297add SAGERUNTIME in giacpy_sage dependencies
1c01bc7update giac to 1.2.2.81. adapt the cSolve patch
d80f7a8update to giac-1.2.2.85. This version fix a race condition with icas and jordan that could appear with the test suite
a12a3acMerge branch 'public/giacupdate' of git://trac.sagemath.org/sage into giacupdate

comment:31 Changed 5 years ago by frederichan

  • Status changed from needs_work to needs_review

So I have rebased on u/jdemeyer/sage-pip-install

comment:32 Changed 5 years ago by git

  • Commit changed from a12a3ac420483b0a1d607e76985f743ed94a5bd0 to c709c1ee6a931eb906284a038e52acd4b200fcc4

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

2c125a8Merge branch 'master' of git://trac.sagemath.org/sage into giacupdatev2
c709c1eupdate to giac 1.2.2-95. bugfix version. Ex: (-1)^(2/7)

comment:33 Changed 5 years ago by frederichan

  • Description modified (diff)

comment:34 Changed 5 years ago by fbissey

  • Dependencies #21441 deleted
  • Milestone changed from sage-7.3 to sage-7.5
  • Status changed from needs_review to positive_review

I am not sure why this is not back to positive review. Let's try again.

comment:35 Changed 5 years ago by vbraun

  • Branch changed from public/giacupdate to c709c1ee6a931eb906284a038e52acd4b200fcc4
  • Resolution set to fixed
  • Status changed from positive_review to closed
Note: See TracTickets for help on using tickets.