newstyle Find_Python, numpy2, and xtensor 0.26#150
newstyle Find_Python, numpy2, and xtensor 0.26#150constantinpape merged 14 commits intoDerThorsten:masterfrom
Conversation
There was a problem hiding this comment.
I just created a blank file here...
| fail-fast: false | ||
| matrix: | ||
| os: [macos-latest, windows-latest, ubuntu-latest] | ||
| python-version: [3.11] |
There was a problem hiding this comment.
This parameter doesn't exist (anymore???)
| -DCMAKE_PREFIX_PATH:PATH="%CONDA_PREFIX%" ^ | ||
| -DCMAKE_INSTALL_PREFIX:PATH="%CONDA_PREFIX%" ^ | ||
| -DPython_EXECUTABLE:PATH="%CONDA_PREFIX%\python.exe" ^ | ||
| -DCMAKE_CXX_FLAGS="/EHsc" ^ |
There was a problem hiding this comment.
Why do you specify /EHsc i'm not familiar with windows but can you remove this?
There was a problem hiding this comment.
My windows knowledge is also limited... It seems like this is for suppressing some warnings during compilation. Do you think there is a problem in having it here?
5f0b113 to
d2a9029
Compare
d2a9029 to
4704811
Compare
fc3b0d6 to
83eb9ad
Compare
|
@constantinpape It would be great to get this in so we can start to get numpy2 compatibility |
|
Hi @hmaarrfk and thanks for looking into this! I will see if I can take care of it now. |
|
Do point me to your fix. Curious to learn! |
|
The problem is/was that z5 was still pinned to an earlier xtensor version, using the previous imports. Luckily this was easy to fix, see conda-forge/z5py-feedstock#78 . So here, we just need to wait a bit till the new version is on conda-forge. Maybe should also pin the z5 version to This should now also enable updating |
constantinpape
left a comment
There was a problem hiding this comment.
The tests pass now and the changes look good from my side.
Should I merge it @hmaarrfk or do you want to change anything else?
I would then also go ahead with a new release, so that we can get this on conda-forge.
|
I think this is great! Just wanted to help close this exploration we started a while back and see if we can remove your numpy 1 pin on micro-Sam! Let's keep the merging and releasing momentum going ;) |
|
Ah windows actually fails :( I will check it later. |
|
I think cmake4 got more strict with path manipulation. |
|
hmm, i think you and i found a similar "fix" nearly at the same time. i don't think your fix worked for me locally though..... With my debug statements, I can see: so it seems to me that |
Yes, my fix also didn't work in the CI.
I see. Hopefully your last commit addresses this. Let's see :) |
6467ad7 to
4a2a254
Compare
4a2a254 to
e3767b6
Compare
I was booted into windows up to 10 seconds ago. So I have high hopes. I spent a bit of time cleaning up commit history. These build problems are annoying but I appreciate your help in unpinning dependencies! Very excited for this! |
|
Yes, it' fixed now! Thanks for all the efforts :) ! I will go ahead and merge this and create a new release. |
I'm just trying to see if a few more things can be simplified from the codebase
still very much a draft at this stage.