Context Navigation

← Previous Ticket
Next Ticket →

Ticket #12754 (closed defect: duplicate)

Last modified 14 months ago

Fix scoping / name look-up issue in PolyBoRi 0.8.1 and support flags from the environment

Reported by:	AlexanderDreyer	Owned by:	AlexanderDreyer
Priority:	major	Milestone:	sage-duplicate/invalid/wontfix
Component:	algebra	Keywords:
Cc:	leif, PolyBoRi, malb, burcin	Work issues:
Report Upstream:	Reported upstream. Little or no feedback.	Reviewers:	Alexander Dreyer, Leif Leonhardy, Martin Albrecht, Burcin Erocal
Authors:		Merged in:
Dependencies:	#12750	Stopgaps:

Description (last modified by AlexanderDreyer) (diff)

The following was found out here: http://groups.google.com/group/sage-release/browse_thread/thread/e2a87c73dc1625f2

* PolyBoRi fails to build due to stricter (C++11) scoping / name look-up rules.
    Unfortunately PolyBoRi doesn't honor CXXFLAGS, so I had to use CXX="g++-4.7.0 -fpermissive" to make the spkg build.

The scoping issue should be fixed here: https://bitbucket.org/brickenstein/polybori/changeset/43b3931ceed7/raw/

Also, we should support CXXFLAGS and CFLAGS (ANd CPPFLAGS?) in the spkg.

We just have to merge the latest changes from polybori-0.8.0.p2 in #12750 :

This fixes building with GCC-4.7.0, see #12751 for the GCC-4.7.0 metaticket as well as building on Solaris and OpenSolaris, see #12655.

Current spkg

Install http://boxen.math.washington.edu/home/dreyer/spkg/polybori-0.8.1.p1.spkg

Change History

comment:1 Changed 14 months ago by AlexanderDreyer

Owner changed from AlexGhitza to AlexanderDreyer

comment:2 Changed 14 months ago by AlexanderDreyer

Description modified (diff)

comment:3 Changed 14 months ago by AlexanderDreyer

Status changed from new to needs_review

comment:4 Changed 14 months ago by AlexanderDreyer

Description modified (diff)

comment:5 Changed 14 months ago by jdemeyer

Reviewers changed from leif, PolyBoRi, malb, burcin to Leif Leonhardy, Martin Albrecht, Burcin Erocal
Dependencies set to #12750
Authors changed from AlexanderDreyer to Alexander Dreyer

comment:6 follow-ups: ↓ 7 ↓ 8 Changed 14 months ago by leif

Cc leif, PolyBoRi, malb, burcin added

So we now have the same spkgs at #12655 and here?

I've added #12655 as a dependency, as someone^TM should (independently) review the upgrade there, such that we here just have to review that the changes coming from #12750 are properly merged.

(Alternatively, we could just make #12655 depend on #12750, which already has positive review, and probably close this ticket as a duplicate of #12750.)

[Argh, concurrent editing, with a slow connection on my side btw. -- you now already changed the reviewers and added #12750 as a dependency...]

comment:7 in reply to: ↑ 6 Changed 14 months ago by AlexanderDreyer

Replying to leif:

(Alternatively, we could just make #12655 depend on #12750, which already has positive review, and probably close this ticket as a duplicate of #12750.)

I'd prefer this solution. What can do it? (Obviously I can't.)

comment:8 in reply to: ↑ 6 Changed 14 months ago by AlexanderDreyer

For convenience I put the diffs of patchsets here (they arise from merging #12750 into #12655):

diff-0.8.1.

-                      old
+                      new
 diff -r f05b48d16bc7 -r 0ff1dee2843e SPKG.txt
+diff -r 82bcfd079628 -r 666438ae9200 SPKG.txt
 --- a/SPKG.txt Mon Mar 12 16:08:02 2012 +0100
 +++ b/SPKG.txt Thu Mar 22 17:21:37 2012 +0100
@@ -36,6 +36,10 @@
++++ b/SPKG.txt Mon Mar 26 23:47:06 2012 +0200
+@@ -36,8 +36,15 @@
   * png/libpng12 (accomplished because Python and gd depend on it, too)
   * libz         (accomplished because e.g. libpng depends on it)
 …
++
  == Releases ==
++=== polybori-0.8.1.p1 (Alexander Dreyer, March 26th, 2012) ===
++ * Rebased spkg on polybori-0.8.0.p2
++
  === polybori-0.8.1.p0 (Alexander Dreyer, March 7th, 2012) ===
+diff -r f05b48d16bc7 -r 0ff1dee2843e custom.py
+  * Updating sources to PolyBoRi's release 0.8.1
+diff -r 82bcfd079628 -r 666438ae9200 custom.py
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
 +++ b/custom.py        Thu Mar 22 17:21:37 2012 +0100
@@ -0,0 +1,64 @@
++++ b/custom.py        Mon Mar 26 23:47:06 2012 +0200
+@@ -0,0 +1,73 @@
 +import os
 +import sys
++
 +# FIXME: Do we really want to *overwrite* the flags (e.g. if set by the user)?
++CCFLAGS=["-O3 -Wno-long-long -Wreturn-type -g -fPIC"]
++#CXXFLAGS=CCFLAGS+["-ftemplate-depth-100 -g -fPIC"]
++CXXFLAGS=CCFLAGS+["-ftemplate-depth-100"]
++# Answer: Should be fixed now.
++CCFLAGS += ["-Wno-long-long", "-Wreturn-type"]
++
++# Note: PolyBoRi still appends DEFAULT_*FLAGS (overwrite those, if necessary)
++if 'CFLAGS' in os.environ:
++  CFLAGS = os.environ['CFLAGS'].split(' ')
++
++if 'CXXFLAGS' in os.environ:
++  CXXFLAGS = os.environ['CXXFLAGS'].split(' ')
++
++if 'CPPFLAGS' in os.environ:
++  CCFLAGS = os.environ['CPPFLAGS'].split(' ')
++
 +GD_LIBS+=["png12","z"]
++
 …
 +  CXX = os.environ['CXX']
 +except:
 +  pass
 diff -r f05b48d16bc7 -r 0ff1dee2843e patches/PyPolyBoRi.patch
+diff -r 82bcfd079628 -r 666438ae9200 patches/PyPolyBoRi.patch
 --- a/patches/PyPolyBoRi.patch Mon Mar 12 16:08:02 2012 +0100
 +++ /dev/null  Thu Jan 01 00:00:00 1970 +0000
@@ -1,253 +0,0 @@
 …
 -+Polynomial = PolynomialFactory()
 -+Variable = VariableFactory()
+-
 diff -r f05b48d16bc7 -r 0ff1dee2843e patches/PyPolyBoRi.py
+diff -r 82bcfd079628 -r 666438ae9200 patches/PyPolyBoRi.py
 --- a/patches/PyPolyBoRi.py    Mon Mar 12 16:08:02 2012 +0100
 +++ /dev/null  Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
 …
 -Polynomial = PolynomialFactory()
 -Variable = VariableFactory()
+-
+diff -r f05b48d16bc7 -r 0ff1dee2843e patches/custom.py
+diff -r 82bcfd079628 -r 666438ae9200 patches/base_lookup.patch
+--- a/patches/base_lookup.patch        Mon Mar 12 16:08:02 2012 +0100
++++ b/patches/base_lookup.patch        Mon Mar 26 23:47:06 2012 +0200
+@@ -8,7 +8,7 @@
+ diff -r 617ce1a715329d16e5ebde0bfdde9c4d09072451 -r 43b3931ceed7b57c4c5385442de6ff45bd0f477c libpolybori/include/polybori/iterators/CTermStack.h
+ --- a/libpolybori/include/polybori/iterators/CTermStack.h     Mon Mar 19 22:53:46 2012 +0100
+ +++ b/libpolybori/include/polybori/iterators/CTermStack.h     Wed Mar 21 22:18:37 2012 +0100
+-@@ -853,7 +853,7 @@
++@@ -854,7 +854,7 @@
+      PBORI_ASSERT(m_zero.isValid());
+      PBORI_ASSERT(m_zero.isEmpty());
+diff -r 82bcfd079628 -r 666438ae9200 patches/custom.py
 --- a/patches/custom.py        Mon Mar 12 16:08:02 2012 +0100
 +++ /dev/null  Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
+@@ -1,75 +0,0 @@
 -import os
 -import sys
+-
 -# FIXME: Do we really want to *overwrite* the flags (e.g. if set by the user)?
+-# Note: there will be better ways in PolyBoRi 0.8.1
 -CCFLAGS=["-O3 -Wno-long-long -Wreturn-type -g -fPIC"]
 -#CXXFLAGS=CCFLAGS+["-ftemplate-depth-100 -g -fPIC"]
 -CXXFLAGS=CCFLAGS+["-ftemplate-depth-100"]
+-CFLAGS=["-std=c99"]
+-
+-if 'CFLAGS' in os.environ:
+-  CFLAGS += os.environ['CFLAGS'].split(' ')
+-
+-if 'CXXFLAGS' in os.environ:
+-  CXXFLAGS += os.environ['CXXFLAGS'].split(' ')
+-
+-if 'CPPFLAGS' in os.environ:
+-  CCFLAGS += os.environ['CPPFLAGS'].split(' ')
+-
 -GD_LIBS+=["png12","z"]
+-
 …
 -  CXX = os.environ['CXX']
 -except:
 -  pass
 diff -r f05b48d16bc7 -r 0ff1dee2843e patches/gbcore.py.patch
+diff -r 82bcfd079628 -r 666438ae9200 patches/gbcore.py.patch
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
 +++ b/patches/gbcore.py.patch  Thu Mar 22 17:21:37 2012 +0100
++++ b/patches/gbcore.py.patch  Mon Mar 26 23:47:06 2012 +0200
@@ -0,0 +1,33 @@
 +# HG changeset patch
 +# User Alexander Dreyer <adreyer@gmx.de>
 …
 +     ocode=old_ring.get_order_code()
 +     try:
 +         new_ring = old_ring.clone(ordering=options["switch_to"])
 diff -r f05b48d16bc7 -r 0ff1dee2843e patches/ipbori.patch
+diff -r 82bcfd079628 -r 666438ae9200 patches/ipbori.patch
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
 +++ b/patches/ipbori.patch     Thu Mar 22 17:21:37 2012 +0100
++++ b/patches/ipbori.patch     Mon Mar 26 23:47:06 2012 +0200
@@ -0,0 +1,24 @@
 +# HG changeset patch
 +# User Alexander Dreyer <adreyer@gmx.de>
 …
 +     except:
 +         return False
++
 diff -r f05b48d16bc7 -r 0ff1dee2843e patches/nf.h.patch
+diff -r 82bcfd079628 -r 666438ae9200 patches/nf.h.patch
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
 +++ b/patches/nf.h.patch       Thu Mar 22 17:21:37 2012 +0100
++++ b/patches/nf.h.patch       Mon Mar 26 23:47:06 2012 +0200
@@ -0,0 +1,19 @@
 +# HG changeset patch
 +# User Alexander Dreyer <adreyer@gmx.de>
 …
 + extern "C"{
 + #include <m4ri/m4ri.h>
++
 diff -r f05b48d16bc7 -r 0ff1dee2843e spkg-install
+diff -r 82bcfd079628 -r 666438ae9200 spkg-install
 --- a/spkg-install     Mon Mar 12 16:08:02 2012 +0100
 +++ b/spkg-install     Thu Mar 22 17:21:37 2012 +0100
@@ -10,17 +10,30 @@
++++ b/spkg-install     Mon Mar 26 23:47:06 2012 +0200
+@@ -10,21 +10,30 @@
  WORKDIR=${PWD}/src
  SCONS=scons
 -patch()
+-prepare()
 +prepare_polybori()
+ {
      if [ $UNAME = "CYGWIN" ]; then
 …
 -    cp patches/custom.py             src/${PBDIR}
 -    cp patches/PyPolyBoRi.py         src/${PBDIR}/pyroot/polybori
 +    cd ${PBDIR}
++
+-    cd ${WORKDIR}/${PBDIR}
+-    patch -p1 < ../../patches/base_lookup.patch
 +    # place configuration file
 +    cp ../../custom.py .
++
 …
 +        fi
 +    done
++
 +    cd ${WORKDIR}
+     cd ${WORKDIR}
+ }
+-
  build_polybori()
+ {
      cd ${PBDIR}
@@ -57,9 +70,9 @@
+@@ -61,8 +70,9 @@
      rm -rf ${SAGE_LOCAL}/include/cudd
+ }
 -patch
+-prepare
 +cd ${WORKDIR}
--cd src
 +prepare_polybori
  echo "Starting build..."
+ echo "Removing old PolyBoRi install..."

comment:9 Changed 14 months ago by jdemeyer

Status changed from needs_review to positive_review
Reviewers changed from Leif Leonhardy, Martin Albrecht, Burcin Erocal to Alexander Dreyer, Leif Leonhardy, Martin Albrecht, Burcin Erocal
Milestone changed from sage-5.0 to sage-duplicate/invalid/wontfix
Authors Alexander Dreyer deleted

Duplicate of #12750 and #12655.

comment:10 Changed 14 months ago by jdemeyer

Status changed from positive_review to closed
Resolution set to duplicate
Summary changed from Fix scoping / name look-up issue und PolyBoRi 0.8.1 and support flags from the envrionment to Fix scoping / name look-up issue in PolyBoRi 0.8.1 and support flags from the environment

Note: See TracTickets for help on using tickets.

Download in other formats: