Skip to content

format and int generic for x86 #13

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

Merged
merged 2 commits into from
Jan 21, 2021
Merged

Conversation

matbesancon
Copy link
Collaborator

This should resolve the current fail on x86, hard-coded Int64 blocked conversions

@matbesancon
Copy link
Collaborator Author

We will also see if the error observed on nightly has been fixed

@codecov
Copy link

codecov bot commented Jan 17, 2021

Codecov Report

Merging #13 (f183976) into master (4cd3593) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master      #13   +/-   ##
=======================================
  Coverage   82.97%   82.97%           
=======================================
  Files           5        5           
  Lines         276      276           
=======================================
  Hits          229      229           
  Misses         47       47           
Impacted Files Coverage Δ
src/MatrixOptInterface.jl 88.00% <ø> (ø)
src/matrix_input.jl 98.41% <ø> (ø)
src/conic_form.jl 78.94% <100.00%> (ø)

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 4cd3593...f183976. Read the comment docs.

@matbesancon
Copy link
Collaborator Author

So COSMO.jl seems to be the cause of test failure on x86 architecture. And latest has some broken JLL artifacts.

@@ -26,14 +26,14 @@ _set_type(::MOI.ConstraintIndex{F,S}) where {F,S} = S
cons_offset(conic::MOI.Zeros) = conic.dimension
cons_offset(conic::MOI.Nonnegatives) = conic.dimension
cons_offset(conic::MOI.SecondOrderCone) = conic.dimension
cons_offset(conic::MOI.PositiveSemidefiniteConeTriangle) = Int64((conic.side_dimension*(conic.side_dimension+1))/2)
cons_offset(conic::MOI.PositiveSemidefiniteConeTriangle) = Int((conic.side_dimension*(conic.side_dimension+1))/2)
Copy link
Member

@blegat blegat Jan 18, 2021

Choose a reason for hiding this comment

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

This should be div(conic.side_dimension * (conic.side_dimension+1), 2) or even better, we should replace this con_offset by MOI.dimension

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I replaced the implementation with MOI.dimension. I didn't want to remove cons_offset altogether in the same PR, maybe do so in a follow-up

@@ -26,14 +26,14 @@ _set_type(::MOI.ConstraintIndex{F,S}) where {F,S} = S
cons_offset(conic::MOI.Zeros) = conic.dimension
cons_offset(conic::MOI.Nonnegatives) = conic.dimension
cons_offset(conic::MOI.SecondOrderCone) = conic.dimension
cons_offset(conic::MOI.PositiveSemidefiniteConeTriangle) = Int64((conic.side_dimension*(conic.side_dimension+1))/2)
cons_offset(conic::MOI.PositiveSemidefiniteConeTriangle) = MOI.dimension(conic)
Copy link
Member

Choose a reason for hiding this comment

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

All cons_offset method are equivalent to MOI.dimension so we should just remove this cons_offset function.

Copy link
Member

Choose a reason for hiding this comment

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

Missed your other comment, let's do it in a separate PR indeed

@blegat blegat merged commit 72e6d7c into jump-dev:master Jan 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants