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 2.11.11 and add windows build #18

Merged
merged 9 commits into from
Apr 30, 2024

Conversation

jpfeuffer
Copy link
Contributor

@jpfeuffer jpfeuffer commented Apr 10, 2024

Checklist

  • Used a personal fork of the feedstock to propose changes
  • Bumped the build number (if the version is unchanged)
  • Reset the build number to 0 (if the version changed)
  • Re-rendered with the latest conda-smithy (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
  • Ensured the license file is being packaged.

Closes #16, closes #15, closes #3, closes #1

@conda-forge-webservices
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

@jpfeuffer
Copy link
Contributor Author

@conda-forge-admin, please rerender

@jpfeuffer jpfeuffer changed the title Add windows build and remove all fortran deps Update to 2.11.11, add windows build and remove all fortran deps Apr 10, 2024
@tkralphs
Copy link
Contributor

I guess I wasn't recommending to remove BLAS on Linux and MacOS. This would indeed be a regression and since everything is and has been working fine with BLAS there, I don't see a reason to change it. It is only the linking to BLAS on Windows that is a separate issue, not the linking to BLAS on all platforms. We could consider linking to libcblas on non-windows, though, which would hopefully mean we don't need Fortran at all on any platform. So maybe add back in libcblas and see if it gets picked up on non-Windows. It doesn't hurt to have it available on all platforms, it just won't be picked up on Windows.

@jpfeuffer
Copy link
Contributor Author

jpfeuffer commented Apr 10, 2024

Ah ok! The problem is that --with-blas was removed from all platforms at some point so it was not used at all. That's why I thought you mean a complete removal.

@jpfeuffer
Copy link
Contributor Author

What about lapack? Is it beneficial to have in addition to let's say cblas?
It will require a Fortran compiler I assume?

@conda-forge-webservices
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I wanted to let you know that I linted all conda-recipes in your PR (recipe) and found some lint.

Here's what I've got...

For recipe:

  • Selectors are suggested to take a <two spaces>#<one space>[<expression>] form. See lines [23]

@conda-forge-webservices
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

@jpfeuffer
Copy link
Contributor Author

@conda-forge-admin, please rerender

@jpfeuffer jpfeuffer changed the title Update to 2.11.11, add windows build and remove all fortran deps Update to 2.11.11 and add windows build Apr 10, 2024
@jpfeuffer
Copy link
Contributor Author

Works now. Including cblas on Win and all other Fortran stuff on unix.

@tkralphs
Copy link
Contributor

Great! I couldn't see what you did to get cblas.lib and lapack.lib to be installed on Windows. When I installed the cblas conda package locally, I didn't get the static libraries, as far as I could see. Anyway, great that it's all working now, but LAPACK was not being linked on Windows. I know you had asked about it yesterday. Yes, it is also good to link LAPACK. I committed a change to add that for Windows as well.

@tkralphs
Copy link
Contributor

Hmm, I don't know why the CI jobs on Azure are not being launched.

@jpfeuffer
Copy link
Contributor Author

Will lapack require a fortran compiler?

@jpfeuffer
Copy link
Contributor Author

Apparently not.

@jpfeuffer
Copy link
Contributor Author

Great! I couldn't see what you did to get cblas.lib and lapack.lib to be installed on Windows. When I installed the cblas conda package locally, I didn't get the static libraries, as far as I could see. Anyway, great that it's all working now, but LAPACK was not being linked on Windows. I know you had asked about it yesterday. Yes, it is also good to link LAPACK. I committed a change to add that for Windows as well.

Once you re-render the recipe, conda-forge changes the packages used at build time to the defaults, which are the *netlib version of the blas and lapack packages.
https://github.com/conda-forge/coin-or-utils-feedstock/pull/18/files#diff-283d4846cd6e9d12c8444a622943204d7a168d0c8c350127106345fd3f42ac2bR15-R16

Which has the import lib files:
https://conda-metadata-app.streamlit.app/?q=conda-forge%2Fwin-64%2Flibcblas-3.9.0-5_hd5c7e75_netlib.tar.bz2

@tkralphs
Copy link
Contributor

Everything looks great now, finally!

@jpfeuffer
Copy link
Contributor Author

jpfeuffer commented Apr 16, 2024

@wolfv @h-vetinari Any comments? This should be much faster to review than the previous PR on which you both had a look already. (just to give an estimate, no blame)

@tkralphs
Copy link
Contributor

@wolfv @h-vetinari Can we merge this and move on to the other projects in the Cbc stack? These should be much easier. I don't want @jpfeuffer to lose focus on this, as I don't know if I can push it through myself :).

@tkralphs
Copy link
Contributor

@jpfeuffer Should we just merge? I'm still working on releases for the rest of the stack, but Osi is done and I will push on the rest if we can get this done.

@jpfeuffer
Copy link
Contributor Author

jpfeuffer commented Apr 29, 2024

On the one hand, I am pretty confident that I addressed the comments from last time. With the new PR also the commit history looks much better.
On the other hand, they might not have been fully done with their reviews.

But I think there is nothing that could not be fixed with a smaller follow-up PR.

So, I would vote for yes.

@h-vetinari
Copy link
Member

Sorry, haven't had time for this recently. From a quick look this looks good to me, so feel free to go ahead!

@tkralphs tkralphs merged commit 27e0e3e into conda-forge:main Apr 30, 2024
7 checks passed
@tkralphs
Copy link
Contributor

OK, merged. @jpfeuffer, Do you want to make a PR for Osi? It should be smooth sailing form here, since no other Cbc dependency should link directly to BLAS and LAPACK.

@jpfeuffer
Copy link
Contributor Author

Yay! Yes, I will give it a try!

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