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

Wbhart update cxxwrap #191

Merged
merged 22 commits into from
Feb 20, 2020
Merged

Wbhart update cxxwrap #191

merged 22 commits into from
Feb 20, 2020

Conversation

fieker
Copy link
Contributor

@fieker fieker commented Feb 5, 2020

should be merged with other pull request - but I lack to git-fu

Copy link
Member

@fingolfin fingolfin left a comment

Choose a reason for hiding this comment

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

Seems plausible though before we switch to CxxWrap 0.9, we should coordinate with Polymake.jl / @kalmarek to avoid annoyances.

Project.toml Outdated Show resolved Hide resolved
deps/build.jl Outdated
@@ -203,8 +203,14 @@ push!(Libdl.DL_LOAD_PATH, joinpath(prefixpath, "lib"))

cd(oldwdir)

println("here")
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
println("here")

Copy link
Contributor

Choose a reason for hiding this comment

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

Agreed.

deps/build.jl Outdated
jlcxx_cmake_dir = realpath(joinpath(dirname(pathof(CxxWrap)), "..", "deps", "usr", "lib", "cmake", "JlCxx"))

#jlcxx_cmake_dir = ENV["JLCXX_DIR"]

println("jlcxx_cmake_dir = $jlcxx_cmake_dir")
Copy link
Member

Choose a reason for hiding this comment

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

I assume we can also get rid of this?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, we can get rid of the commented line and the println. At least, I think so. We should be going back to whatever was there before, I believe, and that would seem to do it.

@fieker
Copy link
Contributor Author

fieker commented Feb 5, 2020 via email

@codecov
Copy link

codecov bot commented Feb 5, 2020

Codecov Report

Merging #191 into master will increase coverage by 77.62%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master     #191       +/-   ##
===========================================
+ Coverage       0%   77.62%   +77.62%     
===========================================
  Files          37       37               
  Lines        3169     3110       -59     
===========================================
+ Hits            0     2414     +2414     
+ Misses       3169      696     -2473
Impacted Files Coverage Δ
src/ideal/ideal.jl 88.99% <ø> (+88.99%) ⬆️
src/number/n_transExt.jl 69.35% <100%> (+69.35%) ⬆️
src/number/n_unknown.jl 40.78% <0%> (+40.78%) ⬆️
src/resolution/resolution.jl 52.72% <0%> (+52.72%) ⬆️
src/module/module.jl 66.66% <0%> (+66.66%) ⬆️
src/matrix/matrix.jl 67.05% <0%> (+67.05%) ⬆️
src/map/alghom.jl 67.5% <0%> (+67.5%) ⬆️
src/libsingular/flint/fmpz.jl 68.14% <0%> (+68.14%) ⬆️
src/caller.jl 68.91% <0%> (+68.91%) ⬆️
... and 28 more

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 4feee11...6064629. Read the comment docs.

@wbhart
Copy link
Contributor

wbhart commented Feb 5, 2020

You should also update the version of Singular to 0.2.0 as this is technically breaking (for Oscar). That would make this independent of the Polymake PR.

Project.toml Outdated Show resolved Hide resolved
Project.toml Outdated Show resolved Hide resolved
deps/build.jl Outdated
@@ -203,8 +203,14 @@ push!(Libdl.DL_LOAD_PATH, joinpath(prefixpath, "lib"))

cd(oldwdir)

println("here")
Copy link
Contributor

Choose a reason for hiding this comment

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

Agreed.

deps/build.jl Outdated
jlcxx_cmake_dir = realpath(joinpath(dirname(pathof(CxxWrap)), "..", "deps", "usr", "lib", "cmake", "JlCxx"))

#jlcxx_cmake_dir = ENV["JLCXX_DIR"]

println("jlcxx_cmake_dir = $jlcxx_cmake_dir")
Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, we can get rid of the commented line and the println. At least, I think so. We should be going back to whatever was there before, I believe, and that would seem to do it.

@wbhart
Copy link
Contributor

wbhart commented Feb 5, 2020

I don't see where the changes mentioned at the bottom of this thread:

JuliaInterop/CxxWrap.jl#170

have been made.

@wbhart
Copy link
Contributor

wbhart commented Feb 5, 2020

Also, there are a lot of CI failures which look real.

@kalmarek
Copy link

what is the ETA on this?

@fieker
Copy link
Contributor Author

fieker commented Feb 13, 2020 via email

@kalmarek
Copy link

Linux and MacOS don't share the compiler;
also there are still two deprecated warnings on MacOS

wbhart and others added 2 commits February 17, 2020 16:40
@fieker fieker merged commit 8dd96df into master Feb 20, 2020
@fieker fieker deleted the wbhart-update_cxxwrap branch February 20, 2020 21:11
fingolfin pushed a commit to fingolfin/Singular.jl that referenced this pull request Jun 6, 2023
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.

5 participants