Skip to content

Commit

Permalink
Merge pull request #33 from 4paradigm/withoutlib
Browse files Browse the repository at this point in the history
adjust
  • Loading branch information
archlitchi authored Feb 8, 2024
2 parents d37e81f + 8a10d19 commit 6138472
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 14 deletions.
12 changes: 0 additions & 12 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,6 @@ ARG GOPROXY=https://goproxy.cn,direct
RUN apt-get update && apt-get -y install libhwloc-dev libdrm-dev
RUN cd /k8s-vgpu && make all

FROM $NVIDIA_IMAGE AS NVBUILD
COPY ./libvgpu /libvgpu
WORKDIR /libvgpu
RUN apt-get -y update; apt-get -y install wget
RUN wget https://cmake.org/files/v3.19/cmake-3.19.8-Linux-x86_64.tar.gz
RUN tar -xf cmake-3.19.8-Linux-x86_64.tar.gz
RUN cp /libvgpu/cmake-3.19.8-Linux-x86_64/bin/cmake /libvgpu/cmake-3.19.8-Linux-x86_64/bin/cmake3
ENV PATH="/libvgpu/cmake-3.19.8-Linux-x86_64/bin:${PATH}"
RUN apt-get -y install openssl libssl-dev
RUN bash ./build.sh

FROM nvidia/cuda:12.2.0-base-ubuntu22.04
ENV NVIDIA_DISABLE_REQUIRE="true"
ENV NVIDIA_VISIBLE_DEVICES=all
Expand All @@ -31,7 +20,6 @@ COPY ./LICENSE /k8s-vgpu/LICENSE
COPY --from=GOBUILD /k8s-vgpu/bin /k8s-vgpu/bin
COPY ./docker/entrypoint.sh /k8s-vgpu/bin/entrypoint.sh
COPY ./lib /k8s-vgpu/lib
COPY --from=NVBUILD /libvgpu/build/libvgpu.so /k8s-vgpu/lib/nvidia/
COPY ./lib/mlu/cntopo /usr/bin/
COPY ./lib/mlu/libcndev.so /usr/lib/

Expand Down
2 changes: 1 addition & 1 deletion hack/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export GOLANG_IMAGE="golang:1.21-bullseye"
export NVIDIA_IMAGE="nvidia/cuda:12.2.0-devel-ubuntu20.04"
export DEST_DIR="/usr/local"

IMAGE=${IMAGE-"projecthami/hami"}
IMAGE=${IMAGE-"4pdosc/k8s-vdevice"}

function go_build() {
[[ -z "$J" ]] && J=$(nproc | awk '{print int(($0 + 1)/ 2)}')
Expand Down
1 change: 0 additions & 1 deletion libvgpu
Submodule libvgpu deleted from 8360ab

0 comments on commit 6138472

Please sign in to comment.