Skip to content

Commit

Permalink
gh-36878: polymake 4.11
Browse files Browse the repository at this point in the history
    
<!-- ^^^^^
Please provide a concise, informative and self-explanatory title.
Don't put issue numbers in there, do this in the PR body below.
For example, instead of "Fixes #1234" use "Introduce new method to
calculate 1+1"
-->
<!-- Describe your changes here in detail -->

<!-- Why is this change required? What problem does it solve? -->
<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes #12345". -->
<!-- If your change requires a documentation PR, please link it
appropriately. -->

Fixes #36023

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. -->
<!-- If your change requires a documentation PR, please link it
appropriately -->
<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
<!-- Feel free to remove irrelevant items. -->

- [ ] The title is concise, informative, and self-explanatory.
- [ ] The description explains in detail what this PR is about.
- [ ] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on
- #12345: short description why this is a dependency
- #34567: ...
-->
- #36930

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: #36878
Reported by: Matthias Köppe
Reviewer(s): Kwankyu Lee
  • Loading branch information
Release Manager committed Jan 12, 2024
2 parents fe174bf + dcbb426 commit 87a91d9
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 24 deletions.
31 changes: 16 additions & 15 deletions build/pkgs/polymake/SPKG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,47 +25,48 @@ Dependencies
------------

Polymake needs a working installation of Perl, including its shared
library and some modules (XML::Writer XML::LibXML XML::LibXSLT
Term::ReadLine::Gnu JSON SVG). The Polymake interface in Sage
additionally needs File::Slurp. For full functionality including
polymake's polyDB, also the Perl module MongoDB is needed.
library and some modules (``XML::Writer XML::LibXML XML::LibXSLT
Term::ReadLine::Gnu JSON SVG``). The Polymake interface in Sage
additionally needs ``File::Slurp``. For full functionality including
polymake's polyDB, also the Perl module ``MongoDB`` is needed.

These are not provided by a Sage package. The script package
perl_cpan_polymake_prereq will signal an error at build time if the
These are not provided by a Sage package. The dummy package
``perl_cpan_polymake_prereq`` will signal an error at build time if the
required prerequisites are not met.

The configure script will inform you about the equivalent system
The ``configure`` script will inform you about the equivalent system
packages that you should install. Otherwise, you can use CPAN (see
below).

Sage might install the Term::ReadLine::Gnu module, however, when you
Sage might install the ``Term::ReadLine::Gnu`` module, however, when you
install polymake, if it is not provided by the system, or if Sage
installs its own readline library.
installs its own ``readline`` library.


A distribution-independent way to install Perl modules (into a user's
home directory or /usr/local) is using CPAN. This is also the way to
home directory or ``/usr/local``) is using CPAN. This is also the way to
install the modules on macOS. For this, if you don't have root access,
you will need the local::lib Perl module installed::
you will need the ``local::lib`` Perl module installed::

cpan -i XML::Writer XML::LibXML XML::LibXSLT File::Slurp Term::ReadLine::Gnu JSON SVG MongoDB

Several Sage packages should be installed before installing the polymake
Several Sage packages should be installed before installing the ``polymake``
package to give a more featureful Polymake installation::

sage -i 4ti2 latte_int topcom qhull

Software that would need to be installed manually (no Sage package
available) for a more featureful Polymake installation: azove, porta,
vinci, SplitsTree4.
available) for a more featureful Polymake installation: ``azove``, ``porta``,
``vinci``, ``SplitsTree4``.

Information on missing Polymake prerequisites after installing polymake::

$ sage -sh
(sage-sh) $ polymake
polytope> show_unconfigured;

In order to Polymake from Sage, you will need the JuPyMake::
In order to use Polymake from Sage, you will also need the ``jupymake``
package::

sage -i jupymake

Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/polymake/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=polymake-VERSION-minimal.tar.bz2
sha1=e34a9cb83a831b4b058e0803a606f29ff940a4e2
md5=2118f0cae2f512b994bbc72552966bb9
cksum=2954910267
sha1=0445f1a6d174906317a07c4bef299d0b4502c779
md5=7a86d17822f229d6088dd7d65c8c1cad
cksum=2732048385
upstream_url=https://polymake.org/lib/exe/fetch.php/download/polymake-VERSION-minimal.tar.bz2
2 changes: 1 addition & 1 deletion build/pkgs/polymake/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$(MP_LIBRARY) bliss cddlib normaliz perl_term_readline_gnu ppl perl_cpan_polymake_prereq libxml2 lrslib | ninja_build
$(MP_LIBRARY) bliss cddlib normaliz perl_term_readline_gnu ppl libxml2 perl_cpan_polymake_prereq lrslib | ninja_build

----------
All lines of this file are ignored except the first.
1 change: 0 additions & 1 deletion build/pkgs/polymake/dependencies_optional

This file was deleted.

2 changes: 1 addition & 1 deletion build/pkgs/polymake/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.9
4.11
7 changes: 4 additions & 3 deletions src/sage/geometry/polyhedron/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1175,12 +1175,13 @@ def _polymake_init_(self):
Floating-point polyhedron::
sage: P = polytopes.dodecahedron(exact=False); P # needs sage.groups
sage: # optional - jupymake, needs sage.groups
sage: P = polytopes.dodecahedron(exact=False); P
A 3-dimensional polyhedron in RDF^3 defined as the convex hull of 20 vertices
sage: print("Maybe recompile warning"); PP = polymake(P); PP # optional - jupymake, needs sage.groups
sage: print("There may be a recompilation warning"); PP = polymake(P); PP
There may be a recompilation warning...
Polytope<Float>[...]
sage: sorted(PP.VERTICES[:], key=repr)[0] # optional - jupymake, needs sage.groups
sage: sorted(PP.VERTICES[:], key=repr)[0]
1 -0.472135955 0 -1.236067978
"""
Expand Down

0 comments on commit 87a91d9

Please sign in to comment.