From d04e3010904d98bbf24b90825cc8e11c9fdf04f6 Mon Sep 17 00:00:00 2001 From: Evan Hallein Date: Wed, 3 Jul 2024 21:43:41 +0800 Subject: [PATCH 1/4] test fix --- gpu.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gpu.Dockerfile b/gpu.Dockerfile index 1c0a8db6c..ee286778d 100644 --- a/gpu.Dockerfile +++ b/gpu.Dockerfile @@ -21,8 +21,8 @@ RUN bash configure.sh clean ### Use a second image for the final asset to reduce the number and # size of the layers. -FROM nvidia/cuda:11.2.2-runtime-ubuntu20.04 -#FROM nvidia/cuda:11.2.0-devel-ubuntu20.04 +#FROM nvidia/cuda:11.2.2-runtime-ubuntu20.04 +FROM nvidia/cuda:11.2.0-devel-ubuntu20.04 # Env variables ENV DEBIAN_FRONTEND=noninteractive \ From 8864fcdd0393329285d9bcf0d0d59d404de49357 Mon Sep 17 00:00:00 2001 From: Evan Edward Hallein <32348557+ehallein@users.noreply.github.com> Date: Wed, 3 Jul 2024 21:50:49 +0800 Subject: [PATCH 2/4] Update publish-docker-gpu.yaml ubuntu-latest --- .github/workflows/publish-docker-gpu.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-docker-gpu.yaml b/.github/workflows/publish-docker-gpu.yaml index daa10c564..9ad834195 100644 --- a/.github/workflows/publish-docker-gpu.yaml +++ b/.github/workflows/publish-docker-gpu.yaml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: self-hosted + runs-on: ubuntu-latest timeout-minutes: 2880 steps: - name: Checkout @@ -36,4 +36,4 @@ jobs: - name: Dispatch NodeODM Build Event id: nodeodm_dispatch run: | - curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.everest-preview+json" -H "Content-Type: application/json" https://api.github.com/repos/OpenDroneMap/NodeODM/actions/workflows/publish-docker-gpu.yaml/dispatches --data '{"ref": "master"}' \ No newline at end of file + curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.everest-preview+json" -H "Content-Type: application/json" https://api.github.com/repos/OpenDroneMap/NodeODM/actions/workflows/publish-docker-gpu.yaml/dispatches --data '{"ref": "master"}' From 709afd16f33a5ebdac49d5615952e2af002f45fe Mon Sep 17 00:00:00 2001 From: Evan Hallein Date: Thu, 4 Jul 2024 21:39:11 +0800 Subject: [PATCH 3/4] working gpu docker build --- gpu.Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gpu.Dockerfile b/gpu.Dockerfile index ee286778d..c093bb301 100644 --- a/gpu.Dockerfile +++ b/gpu.Dockerfile @@ -22,7 +22,7 @@ RUN bash configure.sh clean ### Use a second image for the final asset to reduce the number and # size of the layers. #FROM nvidia/cuda:11.2.2-runtime-ubuntu20.04 -FROM nvidia/cuda:11.2.0-devel-ubuntu20.04 +#FROM nvidia/cuda:11.2.0-devel-ubuntu20.04 # Env variables ENV DEBIAN_FRONTEND=noninteractive \ @@ -30,21 +30,21 @@ ENV DEBIAN_FRONTEND=noninteractive \ LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib" \ PDAL_DRIVER_PATH="/code/SuperBuild/install/bin" -WORKDIR /code +#WORKDIR /code # Copy everything we built from the builder -COPY --from=builder /code /code +#COPY --from=builder /code /code # Copy the Python libraries installed via pip from the builder -COPY --from=builder /usr/local /usr/local +#COPY --from=builder /usr/local /usr/local # Install shared libraries that we depend on via APT, but *not* # the -dev packages to save space! # Also run a smoke test on ODM and OpenSfM -RUN bash configure.sh installruntimedepsonly \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ - && bash run.sh --help \ - && bash -c "eval $(python3 /code/opendm/context.py) && python3 -c 'from opensfm import io, pymap'" +#RUN bash configure.sh installruntimedepsonly \ +# && apt-get clean \ +# && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ +# && bash run.sh --help \ +# && bash -c "eval $(python3 /code/opendm/context.py) && python3 -c 'from opensfm import io, pymap'" # Entry point ENTRYPOINT ["python3", "/code/run.py"] From 8ce00e01aa51457eb2644c51ccb3c10fbf2836c6 Mon Sep 17 00:00:00 2001 From: ehallein Date: Fri, 5 Jul 2024 15:46:57 +0800 Subject: [PATCH 4/4] fixed gpu docker build (missing ffmeg) --- gpu.Dockerfile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gpu.Dockerfile b/gpu.Dockerfile index c093bb301..41290ba20 100644 --- a/gpu.Dockerfile +++ b/gpu.Dockerfile @@ -21,7 +21,7 @@ RUN bash configure.sh clean ### Use a second image for the final asset to reduce the number and # size of the layers. -#FROM nvidia/cuda:11.2.2-runtime-ubuntu20.04 +FROM nvidia/cuda:11.2.2-runtime-ubuntu20.04 #FROM nvidia/cuda:11.2.0-devel-ubuntu20.04 # Env variables @@ -30,21 +30,23 @@ ENV DEBIAN_FRONTEND=noninteractive \ LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib" \ PDAL_DRIVER_PATH="/code/SuperBuild/install/bin" -#WORKDIR /code +WORKDIR /code # Copy everything we built from the builder -#COPY --from=builder /code /code +COPY --from=builder /code /code # Copy the Python libraries installed via pip from the builder -#COPY --from=builder /usr/local /usr/local - +COPY --from=builder /usr/local /usr/local +#COPY --from=builder /usr/lib/x86_64-linux-gnu/libavcodec.so.58 /usr/lib/x86_64-linux-gnu/libavcodec.so.58 +RUN apt-get update -y \ + && apt-get install -y ffmpeg # Install shared libraries that we depend on via APT, but *not* # the -dev packages to save space! # Also run a smoke test on ODM and OpenSfM -#RUN bash configure.sh installruntimedepsonly \ -# && apt-get clean \ -# && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ -# && bash run.sh --help \ -# && bash -c "eval $(python3 /code/opendm/context.py) && python3 -c 'from opensfm import io, pymap'" +RUN bash configure.sh installruntimedepsonly \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ + && bash run.sh --help \ + && bash -c "eval $(python3 /code/opendm/context.py) && python3 -c 'from opensfm import io, pymap'" # Entry point ENTRYPOINT ["python3", "/code/run.py"]