-
Notifications
You must be signed in to change notification settings - Fork 327
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
Fix manylinux wheel builds #1099
Conversation
BFID |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've given this a first pass, there are numerous questions and suggestions,mostly related to code cleanliness, overall coherence and adherence to conventions. One they are resolved I will do a functional review and actually test the code to ensure it behaves as advertised.
#!/bin/bash | ||
set -xe | ||
cd $(dirname $0) | ||
source ./prepare_miniconda.sh $1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is $1
supposed to be and does the script need to fail if $1
is empty?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added error checking in 7ba4e73
@@ -0,0 +1,116 @@ | |||
#!/bin/bash | |||
|
|||
# based on https://github.com/AnacondaRecipes/llvmdev-feedstock/blob/master/recipe/build.sh |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PS: Maybe include a link to the commit hash or version here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file is a copy of ../llvmdev/build.sh
with minor changes. I'll add file level comments to document this.
Main changes are improving error handling, documentation
Addressed all review comments. The scripts have room for improvements but we should just do them later as part of updating all the CI/release infrastructure. |
Tested build farm. Manylinux llvmlite wheel still works |
I looked at all the changes you made and am happy with the response. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I spot checked this using docker on mac.
First I ran:
./buildscripts/manylinux/docker_run_x64.sh build_llvmdev.sh
This produced the llvmdev
package locally.
Then I applied the patch:
diff --git i/buildscripts/manylinux/build_llvmlite.sh w/buildscripts/manylinux/build_llvmlite.sh
index 582b35c991..73f1c35313 100755
--- i/buildscripts/manylinux/build_llvmlite.sh
+++ w/buildscripts/manylinux/build_llvmlite.sh
@@ -21,9 +21,11 @@ conda activate $envname
# Install llvmdev
if [[ $(uname -m) == "aarch64" ]] ; then
- conda install -y numba/label/manylinux_2_28::llvmdev --no-deps
+ #conda install -y numba/label/manylinux_2_28::llvmdev --no-deps
+ conda install -y -c file://$outputdir llvmdev --no-deps
elif [[ $(uname -m) == "x86_64" ]] ; then
- conda install -y numba/label/manylinux_2_17::llvmdev --no-deps
+ #conda install -y numba/label/manylinux_2_17::llvmdev --no-deps
+ conda install -y -c file://$outputdir llvmdev --no-deps
else
echo "Error: Unsupported architecture: $(uname -m)"
exit 1
And then I ran:
./buildscripts/manylinux/docker_run_x64.sh build_llvmlite.sh cp313-cp313
To build and test llvmlite against a locally build llvmdev.
All tests passed! 🎉
This concludes my functional spot test and this PR now LGTM!
Backport #1099 to release branch: Fix manylinux wheel builds
llvmdev:
docker image:
misc: