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

Fix cufinufft wheel building #332

Merged
merged 5 commits into from
Aug 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion tools/cufinufft/build-library.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#!/usr/bin/env bash
set -e -u -x

mkdir -p /io/build
rm -rf /io/build
mkdir /io/build
cd /io/build

cmake -D FINUFFT_USE_CUDA=ON \
-D FINUFFT_USE_CPU=OFF \
-D FINUFFT_BUILD_TESTS=ON \
-D CMAKE_CUDA_ARCHITECTURES="35;50;60;70;75;80" \
-D CMAKE_CUDA_FLAGS="-Wno-deprecated-gpu-targets" \
-D BUILD_TESTING=ON \
..

Expand Down
2 changes: 1 addition & 1 deletion tools/cufinufft/build-wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ done
for py_version in ${py_versions[@]}; do
py_binary=$(get_python_binary ${py_version})

"${py_binary}/pip" install cufinufft -f /io/wheelhouse
"${py_binary}/pip" install --pre cufinufft -f /io/wheelhouse
"${py_binary}/pip" install pytest
"${py_binary}/pytest" /io/python/cufinufft/tests
done
12 changes: 6 additions & 6 deletions tools/cufinufft/distribution_helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

# Helper Script For Building Wheels

cufinufft_version=1.3
cufinufft_version=2.2
manylinux_version=manylinux2014
cuda_version=11.0
dockerhub=janden


echo "# build the wheel"
echo "# Build the docker image"
docker build \
--file tools/cufinufft/docker/cuda${cuda_version}/Dockerfile-x86_64 \
--tag ${dockerhub}/cufinufft-${cufinufft_version}-${manylinux_version} .
Expand All @@ -21,14 +21,16 @@ docker create \
--tty \
--volume $(pwd)/wheelhouse:/io/wheelhouse \
--env PLAT=${manylinux_version}_x86_64 \
--env LIBRARY_PATH="/io/build" \
--env LD_LIBRARY_PATH="/io/build" \
--name cufinufft \
${dockerhub}/cufinufft-${cufinufft_version}-${manylinux_version}

docker start cufinufft

echo "# Build the library and install it"
echo "# Copy the code and build the library"
docker cp . cufinufft:/io
docker exec cufinufft /io/tools/cufinufft/build-library.sh
docker exec cufinufft cp /io/build/libcufinufft.so /usr/lib

echo "# Build the wheels"
docker exec cufinufft /io/tools/cufinufft/build-wheels.sh
Expand All @@ -41,10 +43,8 @@ echo "# Copy the wheels we care about to the dist folder"
mkdir -p dist
cp -v wheelhouse/cufinufft-${cufinufft_version}-cp3*${manylinux_version}* dist


echo "The following steps should be performed manually for now.\n"


echo "# Push to Test PyPI for review/testing"
echo "#twine upload -r testpypi dist/*"
echo
Expand Down
Loading