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 S2 to use external Abseil #134

Merged
merged 14 commits into from
Sep 21, 2021
Merged

Update S2 to use external Abseil #134

merged 14 commits into from
Sep 21, 2021

Conversation

paleolimbot
Copy link
Collaborator

No description provided.

@codecov-commenter
Copy link

codecov-commenter commented Sep 8, 2021

Codecov Report

Merging #134 (ba6f4d0) into master (c87c10d) will not change coverage.
The diff coverage is n/a.

❗ Current head ba6f4d0 differs from pull request most recent head 57e9369. Consider uploading reports for the commit 57e9369 to get more accurate results
Impacted file tree graph

@@           Coverage Diff           @@
##           master     #134   +/-   ##
=======================================
  Coverage   94.04%   94.04%           
=======================================
  Files          40       40           
  Lines        2987     2987           
=======================================
  Hits         2809     2809           
  Misses        178      178           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c87c10d...57e9369. Read the comment docs.

@edzer
Copy link
Member

edzer commented Sep 16, 2021

@paleolimbot is this ready to go? Final deadline from CRAN is Sep 30.

@paleolimbot
Copy link
Collaborator Author

I was still waiting for literally any action upstream on S2 since it sounded like there may have been hope. Abseil is the "hard" part in the sense that it contains a lot of compiler-specific code that needs some workarounds for CRAN. I did that first and it looks like it will work. If the upstream PR isn't merged I'll probably recreate it by changing the header includes rather than update based on the untested PR.

@edzer
Copy link
Member

edzer commented Sep 16, 2021

OK. Shall we plan to merge this & submit by Sep 23, then?

@paleolimbot
Copy link
Collaborator Author

There's no point in merging this yet because it doesn't actually fix the issue...it includes Abseil, which is the "fix", but it doesn't use Abseil (yet). I can devote Monday to this and will make sure we have some checks in motion by then.

@paleolimbot paleolimbot marked this pull request as ready for review September 20, 2021 17:18
@paleolimbot
Copy link
Collaborator Author

I can confirm that this fixes #79 via a Dockerfile based on debian/testing:

FROM cran/debian
RUN apt update && apt install -y gcc-11 g++-11

RUN mkdir ~/.R && echo 'CXX11=g++-11' > ~/.R/Makevars && echo 'CXX=g++-11' >> ~/.R/Makevars && echo 'CC=gcc-11' >> ~/.R/Makevars
RUN echo 'CCFLAGS = -Wall -pedantic -O2' >> ~/.R/Makevars && echo 'CXXFLAGS = -Wall -pedantic -O2' >> ~/.R/Makevars && echo 'CXX11FLAGS = -Wall -pedantic -O2' >> ~/.R/Makevars 

I also checked rhub::check_for_cran() and rhub::check_on_solaris() since a lot of the nuts-and-bolts internal code changed.

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

Successfully merging this pull request may close these issues.

3 participants