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

Refactor src/license.jl #251

Merged
merged 7 commits into from
Mar 28, 2024
Merged

Refactor src/license.jl #251

merged 7 commits into from
Mar 28, 2024

Conversation

odow
Copy link
Member

@odow odow commented Mar 21, 2024

Take 2 of #240

I'll comment inline.

src/license.jl Outdated Show resolved Hide resolved
src/license.jl Outdated Show resolved Hide resolved
src/license.jl Show resolved Hide resolved
Copy link

codecov bot commented Mar 21, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.08%. Comparing base (67265ab) to head (0128ec6).
Report is 4 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #251      +/-   ##
==========================================
+ Coverage   67.98%   68.08%   +0.10%     
==========================================
  Files           6        6              
  Lines        3314     3290      -24     
==========================================
- Hits         2253     2240      -13     
+ Misses       1061     1050      -11     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@joaquimg joaquimg left a comment

Choose a reason for hiding this comment

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

looking good

src/license.jl Outdated Show resolved Hide resolved
src/license.jl Show resolved Hide resolved
Comment on lines -71 to -73
if isdir(dirname(libxprs))
cd(dirname(libxprs))
end
Copy link
Member

Choose a reason for hiding this comment

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

we can try removing this. We´d need to test the PR before merging

Copy link
Member Author

Choose a reason for hiding this comment

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

I think I've done it correctly, but try testing it.

# Now you can use Xpress
```
"""
function initialize(; kwargs...)
Copy link
Member Author

Choose a reason for hiding this comment

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

@joaquimg any reason to call userlic instead of this initialize? We'll keep the old behavior, but this might be simpler. No need for dlopen and XPRSinit.

Copy link
Member

Choose a reason for hiding this comment

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

I have had to load some libraries explicitly in some cases. For instance, xprl.dll on windows.

Copy link
Member Author

Choose a reason for hiding this comment

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

Hmm. We should be able to fix that. The CI binaries work find? I think it should probably also work without the explicit dlopen. ccall should do it.

Copy link
Member

Choose a reason for hiding this comment

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

I can simply start using this new reasonable function and report back

Copy link
Member Author

Choose a reason for hiding this comment

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

So I removed the dlopen and CI still passing. So let me know

Copy link
Member

Choose a reason for hiding this comment

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

it would be good to document how to swap versions with he jll.
It is very common that we need specific versions to reproduce and debug

Copy link
Member Author

Choose a reason for hiding this comment

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

how does it find the dll with no dlopen?

libxprs is the full path, and that should be able to open any dependencies.

it would be good to document how to swap versions with he jll.

This PR is unrelated to the jll?

Copy link
Member

Choose a reason for hiding this comment

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

This is working on my naive tests. Will test in production during the week!

Copy link
Member Author

Choose a reason for hiding this comment

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

Since we're going to need to do a bunch of testing before tagging the next release (which I'll make as breaking, just to be on the safe side), objections to merging this now so you can test on master or with the Xpress_jll patch?

Copy link
Member

Choose a reason for hiding this comment

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

Let's wait Monday night. Today is Sunday in Brazil :)

src/Xpress.jl Outdated Show resolved Hide resolved
src/Xpress.jl Show resolved Hide resolved
@odow odow mentioned this pull request Mar 24, 2024
1 task
@odow odow merged commit 1b075d1 into master Mar 28, 2024
7 checks passed
@odow odow deleted the od/license-2 branch April 2, 2024 06:30
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