Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update NTL to 6.0.0 #14876

Closed
vbraun opened this issue Jul 10, 2013 · 56 comments
Closed

Update NTL to 6.0.0 #14876

vbraun opened this issue Jul 10, 2013 · 56 comments

Comments

@vbraun
Copy link
Member

vbraun commented Jul 10, 2013

New upstream version.

Use git branch and tarball at:

Depends on #14333

CC: @nexttime @jpflori

Component: packages: standard

Author: Volker Braun, Jean-Pierre Flori

Branch: 8c9d711

Reviewer: Jean-Pierre Flori,François Bissey

Issue created by migration from https://trac.sagemath.org/ticket/14876

@nexttime
Copy link
Mannequin

nexttime mannequin commented Jul 10, 2013

comment:2

... and keep the $MAKE patches in mind (don't recall the ticket number right now), in case they're still necessary.

@vbraun
Copy link
Member Author

vbraun commented Jul 10, 2013

comment:3

If you mean #14692: I won't included anything from that ticket as long as it is not finished.

@nexttime
Copy link
Mannequin

nexttime mannequin commented Jul 10, 2013

comment:4

Replying to @vbraun:

If you mean #14692: I won't included anything from that ticket as long as it is not finished.

Yes, that's what I meant.

It is finished, you just have to include the ($MAKE-related) patches.

I rebased Jean-Pierre's spkg at #2114 on mine, but then Jeroen felt he had to make trivial changes to that again, so that I would now again have to rebase mine on that of #2114, but that doesn't make sense if you're going to create a 6.0.0 anyway.

@jpflori
Copy link

jpflori commented Jul 10, 2013

comment:5

Yes please include #14692, there was just a trivial change to .hgignore to do and hg addremove but I completely forgot...

@jpflori
Copy link

jpflori commented Jul 10, 2013

comment:6

If Shoup has some interest on updating NTL again, we should definitely forward him our patches.

@vbraun
Copy link
Member Author

vbraun commented Jul 10, 2013

Attachment: trac_14876_ntl_typedef.patch.gz

Initial patch

@vbraun
Copy link
Member Author

vbraun commented Jul 10, 2013

comment:7

Please somebody go ahead and forward our patches...

@jpflori
Copy link

jpflori commented Jul 10, 2013

comment:8

Ok, I'll take care of forwarding the patches.

@vbraun

This comment has been minimized.

@jpflori
Copy link

jpflori commented Jul 10, 2013

comment:10

Groumpf, you just prevented me from posting that:

Please don't produce any spkg yet if not already done.
Before forwarding the patches I have to check they still apply onto 6.0.0, so I can draft an initial spkg on top of the one from #14692 and then you can fix whatever you want on top of it to ease the git transition and so on.

So I'll just check your spkg.

@vbraun
Copy link
Member Author

vbraun commented Jul 10, 2013

comment:11

Singular doesn't build with NTL-6.0.0.

In the interest of getting this git-ready let's wait with the version bump.

@vbraun

This comment has been minimized.

@vbraun
Copy link
Member Author

vbraun commented Jul 10, 2013

Work Issues: Singular

@vbraun vbraun changed the title Update NTL to 6.0.0 and track all files Update NTL to 6.0.0 Jul 10, 2013
@vbraun
Copy link
Member Author

vbraun commented Jul 10, 2013

comment:13

For the record, this is not fixed in Singular-3.1.6 (#14333), but is fixed in the upstream trunk https://groups.google.com/d/msg/libsingular-devel/aiMvEnN8qyg/cIFUsOXxK_MJ

@jpflori
Copy link

jpflori commented Jul 11, 2013

comment:14

Replying to @jpflori:

Ok, I'll take care of forwarding the patches.

Done and taken into account by Shoup.
It's on his todo list.
Great news.

@jpflori
Copy link

jpflori commented Jul 15, 2013

comment:15

Replying to @jpflori:

Replying to @jpflori:

Ok, I'll take care of forwarding the patches.

Done and taken into account by Shoup.
It's on his todo list.
Great news.

For future reference:
http://shoup.net/pipermail/ntl_shoup.net/2013-July/000041.html

Note that Victor's answer is not appearing there.

@jpflori
Copy link

jpflori commented Dec 31, 2013

Reviewer: Jean-Pierre Flori

@jpflori
Copy link

jpflori commented Dec 31, 2013

Dependencies: 14333

@jpflori
Copy link

jpflori commented Dec 31, 2013

Changed author from Volker Braun to Volker Braun, Jean-Pierre Flori

@jpflori
Copy link

jpflori commented Dec 31, 2013

Branch: u/jpflori/ticket/14876

@jpflori

This comment has been minimized.

@jpflori
Copy link

jpflori commented Dec 31, 2013

Changed work issues from Singular to segfaults

@jpflori
Copy link

jpflori commented Dec 31, 2013

Commit: 649e889

@jpflori
Copy link

jpflori commented Dec 31, 2013

comment:16

Singular update is positively reviewed.
I simply gitified everything and had to add a definition in the Singular patch for NTL 6.0.0 compat.
Let's get this in, I agree with Volker previous changes.
The only point left is quickly check that I did not screwed up the singular patch modif; and fix all the horrible segfaults.


New commits:

649e889Update NTL to 6.0.0.
eca3246# Wed Jul 10 11:09:10 2013 -0400

@kiwifb
Copy link
Member

kiwifb commented Dec 31, 2013

comment:23

Just to be clear. You git branch has both #14333 and this ticket. Which now that I wrote it, seem totally normal. With git, branch depending from another ticket will include change from the depending ticket.

@jpflori
Copy link

jpflori commented Jan 3, 2014

comment:24

I don't really know what should happen here.
For sure #14333 is a dependency.
But I forgot the # in the dependencies field so maybe that's what confused the git plugin.

@kiwifb
Copy link
Member

kiwifb commented Jan 4, 2014

comment:25

OK so I will try to do some testing of this. Apart from singular the following packages have a dependency to ntl:

  • flint
  • eclib
  • linbox
  • "sage-clib" and sage itself.

So my plan is to start from 6.1.beta2 add #14333, this ticket the flint upgrade and then rebuild the rest.

@sagetrac-vbraun-spam sagetrac-vbraun-spam mannequin modified the milestones: sage-6.1, sage-6.2 Jan 30, 2014
@jpflori
Copy link

jpflori commented Feb 17, 2014

comment:27

Replying to @kiwifb:

OK so I will try to do some testing of this. Apart from singular the following packages have a dependency to ntl:

  • flint
  • eclib
  • linbox
  • "sage-clib" and sage itself.

So my plan is to start from 6.1.beta2 add #14333, this ticket the flint upgrade and then rebuild the rest.

Any result on that? :)

@kiwifb
Copy link
Member

kiwifb commented Feb 17, 2014

comment:28

I dropped the ball because of other stuff. It will be easier to start from 6.2.beta2 since singular has been merged.

@kiwifb
Copy link
Member

kiwifb commented Feb 18, 2014

comment:29

Well so far it is extremely painful and not going very far. Switching branch with sage --dev checkout brought me in a state where I ended downloading older versions of sage's dependencies.
I have a thing about complaining about documentation, I'll certainly try to write some stuff down if I ever figure out things.

@kiwifb
Copy link
Member

kiwifb commented Feb 18, 2014

comment:30

Oh and the tarball cannot be found for good measure.

@jpflori
Copy link

jpflori commented Feb 18, 2014

comment:31

Typo indeed.

@jpflori

This comment has been minimized.

@jpflori

This comment has been minimized.

@kiwifb
Copy link
Member

kiwifb commented Feb 18, 2014

comment:33

Replying to @jpflori:

Typo indeed.

Can't believe I didn't notice that.

@kiwifb
Copy link
Member

kiwifb commented Feb 18, 2014

comment:34

Can you rebase the branch on 6.2.beta2? I have done:

  • ./sage -dev checkout --ticket 14876
  • downloaded ntl-6.0.0.tar.bz2 to upstream
  • tried to rebuild flint...
cat build/pkgs/flint/package-version.txt 
2.3.p1

So that branch is still on the old versions of flint, singular and eclib. I need to be able to rebuild them to fully test the ticket.

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Feb 18, 2014

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

8c9d711Merge remote-tracking branch 'trac/develop' into ticket/14876

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Feb 18, 2014

Changed commit from b6d64b4 to 8c9d711

@kiwifb
Copy link
Member

kiwifb commented Feb 18, 2014

comment:36

Do you know how I should checkout the changes? ./sage -dev checkout --ticket 14876 still leaves me with flint 2.3.p1.

@jpflori
Copy link

jpflori commented Feb 18, 2014

comment:37

I'd say

git fetch --all
git checkout -b test_ntl trac/u/jpflori/ticket/14876

Of course, you need to be tracking everything from the track git branch for that to work.
I don't remmeber the syntac, but something like

git fetch trac u/jpflori/ticket/14876
git checkout -b test_ntl trac/u/jpflori/ticket/14876

might do the trick if you don't.

I don't know how to do that with the dev scripts, sorry :(

@kiwifb
Copy link
Member

kiwifb commented Feb 19, 2014

comment:38

Forget about the dev scripts for now.

git fetch --all
git checkout u/jpflori/ticket/14876

worked. pity I didn't think of switching to a test branch earlier.
So far I did ./sage -f flint,eclib,singular,linbox and ./sage -b successfully.
Running ./sage -tp 12 --all --long now.

@kiwifb
Copy link
Member

kiwifb commented Feb 19, 2014

comment:39
----------------------------------------------------------------------
All tests passed!
----------------------------------------------------------------------
Total time for all tests: 1234.6 seconds
    cpu time: 12669.7 seconds
    cumulative wall time: 13905.8 seconds

Yes!

@kiwifb
Copy link
Member

kiwifb commented Feb 19, 2014

Changed reviewer from Jean-Pierre Flori to Jean-Pierre Flori,François Bissey

@kiwifb
Copy link
Member

kiwifb commented Feb 19, 2014

comment:40

I just had a thought. Will the dependency of ntl need an artificial bump to be rebuilt or is the upgrade system able to cope with that?

@vbraun
Copy link
Member Author

vbraun commented Feb 20, 2014

comment:41

Dependents of NTL will be rebuilt automatically.

I tried upgrading and it didn't produce a working Sage, but complete rebuild does. Possibly because wrong header files are used at one point, one of the limitations of our build system.

@vbraun
Copy link
Member Author

vbraun commented Feb 20, 2014

Changed branch from u/jpflori/ticket/14876 to 8c9d711

@jpflori
Copy link

jpflori commented Mar 14, 2014

Changed commit from 8c9d711 to none

@jpflori
Copy link

jpflori commented Mar 14, 2014

comment:43

For those interested, 6.1 has been released: #15938 (nothing to see there yet).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

4 participants