Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 09fe0e2e9e |
@@ -48,8 +48,8 @@ while [ $# -gt 0 ]; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
case "$VARIANT" in
|
case "$VARIANT" in
|
||||||
nvidia|amd|all) ;;
|
nvidia|amd|nogpu|all) ;;
|
||||||
*) echo "unknown variant: $VARIANT (expected nvidia, amd, or all)" >&2; exit 1 ;;
|
*) echo "unknown variant: $VARIANT (expected nvidia, amd, nogpu, or all)" >&2; exit 1 ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [ "$CLEAN_CACHE" = "1" ]; then
|
if [ "$CLEAN_CACHE" = "1" ]; then
|
||||||
@@ -62,6 +62,7 @@ if [ "$CLEAN_CACHE" = "1" ]; then
|
|||||||
echo "=== cleaning live-build work dirs ==="
|
echo "=== cleaning live-build work dirs ==="
|
||||||
rm -rf "${REPO_ROOT}/dist/live-build-work-nvidia"
|
rm -rf "${REPO_ROOT}/dist/live-build-work-nvidia"
|
||||||
rm -rf "${REPO_ROOT}/dist/live-build-work-amd"
|
rm -rf "${REPO_ROOT}/dist/live-build-work-amd"
|
||||||
|
rm -rf "${REPO_ROOT}/dist/live-build-work-nogpu"
|
||||||
echo "=== caches cleared, proceeding with build ==="
|
echo "=== caches cleared, proceeding with build ==="
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -182,8 +183,12 @@ case "$VARIANT" in
|
|||||||
amd)
|
amd)
|
||||||
run_variant amd
|
run_variant amd
|
||||||
;;
|
;;
|
||||||
|
nogpu)
|
||||||
|
run_variant nogpu
|
||||||
|
;;
|
||||||
all)
|
all)
|
||||||
run_variant nvidia
|
run_variant nvidia
|
||||||
run_variant amd
|
run_variant amd
|
||||||
|
run_variant nogpu
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
@@ -27,8 +27,8 @@ while [ $# -gt 0 ]; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
case "$BEE_GPU_VENDOR" in
|
case "$BEE_GPU_VENDOR" in
|
||||||
nvidia|amd) ;;
|
nvidia|amd|nogpu) ;;
|
||||||
*) echo "unknown variant: $BEE_GPU_VENDOR (expected nvidia or amd)" >&2; exit 1 ;;
|
*) echo "unknown variant: $BEE_GPU_VENDOR (expected nvidia, amd, or nogpu)" >&2; exit 1 ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
BUILD_WORK_DIR="${DIST_DIR}/live-build-work-${BEE_GPU_VENDOR}"
|
BUILD_WORK_DIR="${DIST_DIR}/live-build-work-${BEE_GPU_VENDOR}"
|
||||||
@@ -249,8 +249,8 @@ rm -f \
|
|||||||
"${OVERLAY_STAGE_DIR}/usr/local/bin/bee-smoketest" \
|
"${OVERLAY_STAGE_DIR}/usr/local/bin/bee-smoketest" \
|
||||||
"${OVERLAY_STAGE_DIR}/usr/local/bin/all_reduce_perf"
|
"${OVERLAY_STAGE_DIR}/usr/local/bin/all_reduce_perf"
|
||||||
|
|
||||||
# Remove NVIDIA-specific overlay files for AMD variant
|
# Remove NVIDIA-specific overlay files for non-nvidia variants
|
||||||
if [ "$BEE_GPU_VENDOR" = "amd" ]; then
|
if [ "$BEE_GPU_VENDOR" != "nvidia" ]; then
|
||||||
rm -f "${OVERLAY_STAGE_DIR}/usr/local/bin/bee-nvidia-load"
|
rm -f "${OVERLAY_STAGE_DIR}/usr/local/bin/bee-nvidia-load"
|
||||||
rm -f "${OVERLAY_STAGE_DIR}/etc/systemd/system/bee-nvidia.service"
|
rm -f "${OVERLAY_STAGE_DIR}/etc/systemd/system/bee-nvidia.service"
|
||||||
fi
|
fi
|
||||||
@@ -387,9 +387,12 @@ CUBLAS_VERSION=${CUBLAS_VERSION}
|
|||||||
CUDA_USERSPACE_VERSION=${CUDA_USERSPACE_VERSION}
|
CUDA_USERSPACE_VERSION=${CUDA_USERSPACE_VERSION}
|
||||||
NCCL_TESTS_VERSION=${NCCL_TESTS_VERSION}"
|
NCCL_TESTS_VERSION=${NCCL_TESTS_VERSION}"
|
||||||
GPU_BUILD_INFO="nvidia:${NVIDIA_DRIVER_VERSION}"
|
GPU_BUILD_INFO="nvidia:${NVIDIA_DRIVER_VERSION}"
|
||||||
else
|
elif [ "$BEE_GPU_VENDOR" = "amd" ]; then
|
||||||
GPU_VERSION_LINE="ROCM_VERSION=${ROCM_VERSION}"
|
GPU_VERSION_LINE="ROCM_VERSION=${ROCM_VERSION}"
|
||||||
GPU_BUILD_INFO="rocm:${ROCM_VERSION}"
|
GPU_BUILD_INFO="rocm:${ROCM_VERSION}"
|
||||||
|
else
|
||||||
|
GPU_VERSION_LINE=""
|
||||||
|
GPU_BUILD_INFO="nogpu"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cat > "${OVERLAY_STAGE_DIR}/etc/bee-release" <<EOF
|
cat > "${OVERLAY_STAGE_DIR}/etc/bee-release" <<EOF
|
||||||
@@ -418,13 +421,19 @@ fi
|
|||||||
cp "${BUILD_WORK_DIR}/config/package-lists/bee-${BEE_GPU_VENDOR}.list.chroot" \
|
cp "${BUILD_WORK_DIR}/config/package-lists/bee-${BEE_GPU_VENDOR}.list.chroot" \
|
||||||
"${BUILD_WORK_DIR}/config/package-lists/bee-gpu.list.chroot"
|
"${BUILD_WORK_DIR}/config/package-lists/bee-gpu.list.chroot"
|
||||||
|
|
||||||
# --- remove archives for the other vendor ---
|
# --- remove archives for the other vendor(s) ---
|
||||||
if [ "$BEE_GPU_VENDOR" = "nvidia" ]; then
|
if [ "$BEE_GPU_VENDOR" = "nvidia" ]; then
|
||||||
rm -f "${BUILD_WORK_DIR}/config/archives/rocm.list.chroot" \
|
rm -f "${BUILD_WORK_DIR}/config/archives/rocm.list.chroot" \
|
||||||
"${BUILD_WORK_DIR}/config/archives/rocm.key.chroot"
|
"${BUILD_WORK_DIR}/config/archives/rocm.key.chroot"
|
||||||
else
|
elif [ "$BEE_GPU_VENDOR" = "amd" ]; then
|
||||||
rm -f "${BUILD_WORK_DIR}/config/archives/nvidia-cuda.list.chroot" \
|
rm -f "${BUILD_WORK_DIR}/config/archives/nvidia-cuda.list.chroot" \
|
||||||
"${BUILD_WORK_DIR}/config/archives/nvidia-cuda.key.chroot"
|
"${BUILD_WORK_DIR}/config/archives/nvidia-cuda.key.chroot"
|
||||||
|
else
|
||||||
|
# nogpu: remove both
|
||||||
|
rm -f "${BUILD_WORK_DIR}/config/archives/rocm.list.chroot" \
|
||||||
|
"${BUILD_WORK_DIR}/config/archives/rocm.key.chroot" \
|
||||||
|
"${BUILD_WORK_DIR}/config/archives/nvidia-cuda.list.chroot" \
|
||||||
|
"${BUILD_WORK_DIR}/config/archives/nvidia-cuda.key.chroot"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# --- substitute version placeholders in package list and archive ---
|
# --- substitute version placeholders in package list and archive ---
|
||||||
@@ -432,7 +441,7 @@ if [ "$BEE_GPU_VENDOR" = "nvidia" ]; then
|
|||||||
sed -i \
|
sed -i \
|
||||||
-e "s/%%DCGM_VERSION%%/${DCGM_VERSION}/g" \
|
-e "s/%%DCGM_VERSION%%/${DCGM_VERSION}/g" \
|
||||||
"${BUILD_WORK_DIR}/config/package-lists/bee-gpu.list.chroot"
|
"${BUILD_WORK_DIR}/config/package-lists/bee-gpu.list.chroot"
|
||||||
else
|
elif [ "$BEE_GPU_VENDOR" = "amd" ]; then
|
||||||
sed -i \
|
sed -i \
|
||||||
-e "s/%%ROCM_VERSION%%/${ROCM_VERSION}/g" \
|
-e "s/%%ROCM_VERSION%%/${ROCM_VERSION}/g" \
|
||||||
-e "s/%%ROCM_SMI_VERSION%%/${ROCM_SMI_VERSION}/g" \
|
-e "s/%%ROCM_SMI_VERSION%%/${ROCM_SMI_VERSION}/g" \
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ elif [ "$GPU_VENDOR" = "amd" ]; then
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
# nogpu: no GPU services needed
|
||||||
|
|
||||||
# Ensure scripts are executable
|
# Ensure scripts are executable
|
||||||
chmod +x /usr/local/bin/bee-network.sh 2>/dev/null || true
|
chmod +x /usr/local/bin/bee-network.sh 2>/dev/null || true
|
||||||
|
|||||||
1
iso/builder/config/package-lists/bee-nogpu.list.chroot
Normal file
1
iso/builder/config/package-lists/bee-nogpu.list.chroot
Normal file
@@ -0,0 +1 @@
|
|||||||
|
# No GPU variant — no NVIDIA, no AMD/ROCm packages
|
||||||
Reference in New Issue
Block a user