Skip to content

overlooked that this file still has conflicts #26

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.

Sign up for GitHub

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

Merged
edgargabriel merged 1 commit into from
Apr 1, 2026
Merged

overlooked that this file still has conflicts #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 8 additions & 26 deletions contrib/build-wheel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ set -x
# Build the wheel
TMP_DIR=$(mktemp -d)

<<<<<<< HEAD
if [[ -d "${ROCM_DIR}" ]]; then
PKG_NAME="rixl"
./contrib/tomlutil.py --wheel-name ${PKG_NAME} pyproject.toml
Expand Down Expand Up @@ -122,37 +121,20 @@ else
PKG_NAME="nixl-cu${CUDA_MAJOR}"

./contrib/tomlutil.py --wheel-name $PKG_NAME pyproject.toml
uv build --wheel --out-dir $TMP_DIR --python $PYTHON_VERSION
if [ "$BUILD_NIXL_EP" = "true" ]; then
uv build --wheel --out-dir $TMP_DIR --python $PYTHON_VERSION \
-Csetup-args=-Dbuild_nixl_ep=true \
-Csetup-args=-Dbuild_examples=true
else
uv build --wheel --out-dir $TMP_DIR --python $PYTHON_VERSION
fi

# Bundle libraries
mkdir $TMP_DIR/dist
auditwheel repair --exclude 'libcuda*' --exclude 'libcufile*' --exclude 'libssl*' --exclude 'libcrypto*' --exclude 'libefa*' --exclude 'libhwloc*' --exclude 'libfabric*' $TMP_DIR/nixl*.whl --plat $WHL_PLATFORM --wheel-dir $TMP_DIR/dist
auditwheel repair --exclude 'libcuda*' --exclude 'libcufile*' --exclude 'libssl*' --exclude 'libcrypto*' --exclude 'libefa*' --exclude 'libhwloc*' --exclude 'libfabric*' --exclude 'libtorch*' --exclude 'libc10*' --exclude 'libdoca*' $TMP_DIR/nixl*.whl --plat $WHL_PLATFORM --wheel-dir $TMP_DIR/dist
./contrib/wheel_add_ucx_plugins.py --ucx-plugins-dir $UCX_PLUGINS_DIR --nixl-plugins-dir $NIXL_PLUGINS_DIR $TMP_DIR/dist/*.whl
cp $TMP_DIR/dist/*.whl $OUTPUT_DIR
fi
=======
CUDA_MAJOR=$(nvcc --version | grep -Eo 'release [0-9]+\.[0-9]+' | cut -d' ' -f2 | cut -d'.' -f1)
# Must be 12 or 13
if [ "$CUDA_MAJOR" -ne 12 ] && [ "$CUDA_MAJOR" -ne 13 ]; then
echo "Invalid CUDA_MAJOR: '$CUDA_MAJOR'"
exit 1
fi
PKG_NAME="nixl-cu${CUDA_MAJOR}"
./contrib/tomlutil.py --wheel-name $PKG_NAME pyproject.toml
if [ "$BUILD_NIXL_EP" = "true" ]; then
uv build --wheel --out-dir $TMP_DIR --python $PYTHON_VERSION \
-Csetup-args=-Dbuild_nixl_ep=true \
-Csetup-args=-Dbuild_examples=true
else
uv build --wheel --out-dir $TMP_DIR --python $PYTHON_VERSION
fi

# Bundle libraries
mkdir $TMP_DIR/dist
auditwheel repair --exclude 'libcuda*' --exclude 'libcufile*' --exclude 'libssl*' --exclude 'libcrypto*' --exclude 'libefa*' --exclude 'libhwloc*' --exclude 'libfabric*' --exclude 'libtorch*' --exclude 'libc10*' --exclude 'libdoca*' $TMP_DIR/nixl*.whl --plat $WHL_PLATFORM --wheel-dir $TMP_DIR/dist
./contrib/wheel_add_ucx_plugins.py --ucx-plugins-dir $UCX_PLUGINS_DIR --nixl-plugins-dir $NIXL_PLUGINS_DIR $TMP_DIR/dist/*.whl
cp $TMP_DIR/dist/*.whl $OUTPUT_DIR
>>>>>>> nixl/main

# Clean up
rm -rf "$TMP_DIR"
Loading