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 to bliss 0.77 #35344

Merged
merged 11 commits into from
Jul 1, 2023
Merged

Update to bliss 0.77 #35344

merged 11 commits into from
Jul 1, 2023

Conversation

antonio-rojas
Copy link
Contributor

Comes with a cmake-based build system now (albeit with no install target), so the autotoolization patches shouldn't be needed. Not sure about the other patches included in the fork, but in case any of them is still needed we might consider to keep them here rather than in an outside fork for transparency.

Needs changes in sagelib for the new canonical_form and find_automorphisms API.

Fixes: #33010

@antonio-rojas
Copy link
Contributor Author

@kiwifb I think I've pulled all commits from trac including your cmake changes, please double check.

@codecov-commenter
Copy link

codecov-commenter commented Mar 24, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.02 ⚠️

Comparison is base (c00e6c2) 88.62% compared to head (363cdb9) 88.61%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #35344      +/-   ##
===========================================
- Coverage    88.62%   88.61%   -0.02%     
===========================================
  Files         2148     2148              
  Lines       398855   398855              
===========================================
- Hits        353480   353440      -40     
- Misses       45375    45415      +40     

see 24 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@kiwifb
Copy link
Member

kiwifb commented Mar 25, 2023

Looks great and the bots are happy apart from the linter. I will try to figure what it complains about.

Copy link
Member

@kiwifb kiwifb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to go

src/sage/graphs/bliss.pyx Outdated Show resolved Hide resolved
@mkoeppe mkoeppe mentioned this pull request Jun 23, 2023
@dimpase
Copy link
Member

dimpase commented Jun 23, 2023

all good

@dimpase
Copy link
Member

dimpase commented Jun 24, 2023 via email

@dcoudert
Copy link
Contributor

A subdirectory as done for cliquer might be better.

@dimpase
Copy link
Member

dimpase commented Jun 24, 2023

A subdirectory as done for cliquer might be better.

this is now antonio-rojas#1 - to be merged by @antonio-rojas

move bliss_find_automorphisms.h to subdir
@dimpase dimpase mentioned this pull request Jun 25, 2023
@mkoeppe
Copy link
Member

mkoeppe commented Jun 29, 2023

I had to make this change to get it compile on macOS (with Xcode)

diff --git a/src/sage/graphs/bliss.pyx b/src/sage/graphs/bliss.pyx
index 373b99f4d5..d8c50f220e 100644
--- a/src/sage/graphs/bliss.pyx
+++ b/src/sage/graphs/bliss.pyx
@@ -1,4 +1,5 @@
 # distutils: language = c++
+# distutils: extra_compile_args = -std=c++11
 # distutils: libraries = bliss
 # sage_setup: distribution = sagemath-bliss
 

@dimpase
Copy link
Member

dimpase commented Jun 29, 2023

I had to make this change to get it compile on macOS (with Xcode)

diff --git a/src/sage/graphs/bliss.pyx b/src/sage/graphs/bliss.pyx
index 373b99f4d5..d8c50f220e 100644
--- a/src/sage/graphs/bliss.pyx
+++ b/src/sage/graphs/bliss.pyx
@@ -1,4 +1,5 @@
 # distutils: language = c++
+# distutils: extra_compile_args = -std=c++11
 # distutils: libraries = bliss
 # sage_setup: distribution = sagemath-bliss
 

OK, added.

@github-actions
Copy link

Documentation preview for this PR (built with commit 3ee7616; changes) is ready! 🎉

@vbraun vbraun merged commit 537bc25 into sagemath:develop Jul 1, 2023
9 checks passed
@mkoeppe mkoeppe added this to the sage-10.1 milestone Jul 1, 2023
@antonio-rojas antonio-rojas deleted the bliss-0.77 branch July 2, 2023 10:35
vbraun pushed a commit to vbraun/sage that referenced this pull request Dec 4, 2023
    
Provide spkg-config for bliss, with minimal version 0.77.

Depends on sagemath#35344, where Sage's bliss is bumped to 0.77
with the necessary API changes.

Fixes sagemath#35829
    
URL: sagemath#35830
Reported by: Dima Pasechnik
Reviewer(s): Dima Pasechnik, Matthias Köppe
vbraun pushed a commit to vbraun/sage that referenced this pull request Dec 5, 2023
    
Provide spkg-config for bliss, with minimal version 0.77.

Depends on sagemath#35344, where Sage's bliss is bumped to 0.77
with the necessary API changes.

Fixes sagemath#35829
    
URL: sagemath#35830
Reported by: Dima Pasechnik
Reviewer(s): Dima Pasechnik, Matthias Köppe
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update bliss to 0.77
7 participants