diff --git a/iso/builder/build-in-container.sh b/iso/builder/build-in-container.sh index 9f33778..2f2cdbb 100755 --- a/iso/builder/build-in-container.sh +++ b/iso/builder/build-in-container.sh @@ -48,8 +48,8 @@ while [ $# -gt 0 ]; do done case "$VARIANT" in - nvidia|amd|all) ;; - *) echo "unknown variant: $VARIANT (expected nvidia, amd, or all)" >&2; exit 1 ;; + nvidia|amd|nogpu|all) ;; + *) echo "unknown variant: $VARIANT (expected nvidia, amd, nogpu, or all)" >&2; exit 1 ;; esac if [ "$CLEAN_CACHE" = "1" ]; then @@ -62,6 +62,7 @@ if [ "$CLEAN_CACHE" = "1" ]; then echo "=== cleaning live-build work dirs ===" 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-nogpu" echo "=== caches cleared, proceeding with build ===" fi @@ -182,8 +183,12 @@ case "$VARIANT" in amd) run_variant amd ;; + nogpu) + run_variant nogpu + ;; all) run_variant nvidia run_variant amd + run_variant nogpu ;; esac diff --git a/iso/builder/build.sh b/iso/builder/build.sh index 3a7541a..3c07e2f 100755 --- a/iso/builder/build.sh +++ b/iso/builder/build.sh @@ -27,8 +27,8 @@ while [ $# -gt 0 ]; do done case "$BEE_GPU_VENDOR" in - nvidia|amd) ;; - *) echo "unknown variant: $BEE_GPU_VENDOR (expected nvidia or amd)" >&2; exit 1 ;; + nvidia|amd|nogpu) ;; + *) echo "unknown variant: $BEE_GPU_VENDOR (expected nvidia, amd, or nogpu)" >&2; exit 1 ;; esac 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/all_reduce_perf" -# Remove NVIDIA-specific overlay files for AMD variant -if [ "$BEE_GPU_VENDOR" = "amd" ]; then +# Remove NVIDIA-specific overlay files for non-nvidia variants +if [ "$BEE_GPU_VENDOR" != "nvidia" ]; then rm -f "${OVERLAY_STAGE_DIR}/usr/local/bin/bee-nvidia-load" rm -f "${OVERLAY_STAGE_DIR}/etc/systemd/system/bee-nvidia.service" fi @@ -387,9 +387,12 @@ CUBLAS_VERSION=${CUBLAS_VERSION} CUDA_USERSPACE_VERSION=${CUDA_USERSPACE_VERSION} NCCL_TESTS_VERSION=${NCCL_TESTS_VERSION}" GPU_BUILD_INFO="nvidia:${NVIDIA_DRIVER_VERSION}" -else +elif [ "$BEE_GPU_VENDOR" = "amd" ]; then GPU_VERSION_LINE="ROCM_VERSION=${ROCM_VERSION}" GPU_BUILD_INFO="rocm:${ROCM_VERSION}" +else + GPU_VERSION_LINE="" + GPU_BUILD_INFO="nogpu" fi cat > "${OVERLAY_STAGE_DIR}/etc/bee-release" </dev/null || true diff --git a/iso/builder/config/package-lists/bee-nogpu.list.chroot b/iso/builder/config/package-lists/bee-nogpu.list.chroot new file mode 100644 index 0000000..79f5fc3 --- /dev/null +++ b/iso/builder/config/package-lists/bee-nogpu.list.chroot @@ -0,0 +1 @@ +# No GPU variant — no NVIDIA, no AMD/ROCm packages