diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ed4c618..e0df2c4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -244,7 +244,7 @@ jobs: - run: | source ./tool.sh build_image tf2-cuda112 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.2" --build-arg "ARG_PROFILE_PYTHON=tf2" - alias_image tf2-cuda112 latest torch latest + alias_image tf2-cuda112 latest tf2 latest push_image qpod_torch_cuda117: @@ -279,7 +279,7 @@ jobs: - run: | source ./tool.sh build_image paddle-cuda117 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.7" --build-arg "ARG_PROFILE_PYTHON=paddle,mkl" - alias_image paddle-cuda117 latest paddle latest + alias_image paddle-cuda117 latest paddle-cuda latest push_image qpod_paddle_cuda112: diff --git a/README.md b/README.md index 6a75edd..570d302 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # QPod - Docker Image Stack [![License](https://img.shields.io/badge/License-BSD%203--Clause-green.svg)](https://opensource.org/licenses/BSD-3-Clause) -[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/QPod/docker-images/qpod-docker-images)](https://github.com/QPod/docker-images/actions/workflows/docker.yml) +[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/QPod/docker-images/docker.yml?branch=main)](https://github.com/QPod/docker-images/actions/workflows/docker.yml) [![Join the Gitter Chat](https://img.shields.io/gitter/room/nwjs/nw.js.svg)](https://gitter.im/QPod/) [![Docker Pulls](https://img.shields.io/docker/pulls/qpod/qpod.svg)](https://hub.docker.com/r/qpod/qpod) [![Docker Starts](https://img.shields.io/docker/stars/qpod/qpod.svg)](https://hub.docker.com/r/qpod/qpod) @@ -84,17 +84,18 @@ Typically, you can choose `full` / `full-cuda` if you have enough disk space and
👉 Click here to see a list of Docker Images run on GPUs + CPUs -| Image Name (Feature Set) | DockerHub Link | Based On | Description | -|:---------------------------:|:-----------------------------------------:|:-------------------:|:-------------------------------------------------------------------------------------------------------------------------------------------------:| -| cuda_11.5, cuda | https://hub.docker.com/r/qpod/cuda_11.5 | qpod/base | Version 11.5 of NVIDIA cuda and cudnn libs, including runtime and devel. | -| cuda_10.2 | https://hub.docker.com/r/qpod/cuda_10.2 | qpod/base | Version 10.2 of NVIDIA cuda and cudnn libs, including runtime and devel. | -| cuda_10.0 | https://hub.docker.com/r/qpod/cuda_10.0 | qpod/base | Version 10.0 of NVIDIA cuda and cudnn libs, including runtime and devel. (Specifically retained for tensorflow 1.15) | -| tf1-cu100, tf1 | https://hub.docker.com/r/qpod/tf1 | qpod/cuda_10.0 | Tensorflow 1.1x environment with GPU (cuda 10.0). | -| tf2-cu115, tf2 | https://hub.docker.com/r/qpod/tf2 | qpod/cuda_11.5 | Tensorflow 2.x environment with GPU (cuda 11.5). | -| torch-cu115, torch | https://hub.docker.com/r/qpod/torch | qpod/torch | Pytorch 1.x environment with GPU (cuda 11.5). | -| torch-cu101, torch-cu102 | https://hub.docker.com/r/qpod/torch-cu102 | qpod/torch-cu102 | Pytorch 1.x environment with GPU (cuda 10.2). | -| core-cuda, full-cuda-11.5 | https://hub.docker.com/r/qpod/core-cuda | qpod/cuda_11.5 | Tensorflow 2.x + Pytorch 1.x environment with GPU (cuda 11.5). | -| cuda-dev, full-cuda | https://hub.docker.com/r/qpod/cuda-dev | qpod/full-cuda-10.1 | `core-cuda` + IDE tools: JupyterLab / Jupyter Notebook + VSCode Server. | +| Image Name (Feature Set) | DockerHub Link | Based On | Description | +|:-------------------------:|:-------------------------------------------:|:-----------------:|:--------------------------------------------------------------------------------------------------------------------:| +| cuda_11.7, cuda | https://hub.docker.com/r/qpod/cuda_11.7 | qpod/base | Version 11.7 of NVIDIA cuda and cudnn libs, including runtime and devel. | +| cuda_11.2 | https://hub.docker.com/r/qpod/cuda_11.2 | qpod/base | Version 11.2 of NVIDIA cuda and cudnn libs, including runtime and devel. | +| cuda_10.2 | https://hub.docker.com/r/qpod/cuda_10.2 | qpod/base | Version 10.2 of NVIDIA cuda and cudnn libs, including runtime and devel. | +| cuda_10.0 | https://hub.docker.com/r/qpod/cuda_10.0 | qpod/base | Version 10.0 of NVIDIA cuda and cudnn libs, including runtime and devel. (Specifically retained for tensorflow 1.15) | +| tf1-cuda100, tf1 | https://hub.docker.com/r/qpod/tf1 | qpod/cuda_10.0 | Tensorflow 1.1x environment with GPU (cuda 10.0). | +| tf2-cuda112, tf2 | https://hub.docker.com/r/qpod/tf2 | qpod/cuda_11.2 | Tensorflow 2.x environment with GPU (cuda 11.2). | +| torch-cuda117, torch | https://hub.docker.com/r/qpod/torch | qpod/torch | Pytorch 1.x environment with GPU (cuda 11.7). | +| torch-cuda112 | https://hub.docker.com/r/qpod/torch-cuda112 | qpod/torch-cuda12 | Pytorch 1.x environment with GPU (cuda 10.2). | +| core-cuda, full-cuda-11.7 | https://hub.docker.com/r/qpod/core-cuda | qpod/cuda_11.7 | Tensorflow 2.x + Pytorch environment with cuda. | +| cuda-dev, full-cuda | https://hub.docker.com/r/qpod/cuda-dev | qpod/coe-cuda | `core-cuda` + IDE tools: JupyterLab / Jupyter Notebook + VSCode Server. |
diff --git a/docker_atom/work/script-setup.sh b/docker_atom/work/script-setup.sh index 3637a87..315c6ff 100644 --- a/docker_atom/work/script-setup.sh +++ b/docker_atom/work/script-setup.sh @@ -78,22 +78,18 @@ setup_tini() { setup_nvtop() { - # Install Utilities "nvtop" - sudo apt-get -qq update --fix-missing && sudo apt-get -qq install -y --no-install-recommends libncurses5-dev - - DIRECTORY=$(pwd) - - cd /tmp \ + # Install Utilities "nvtop" from source: libdrm-dev libsystemd-dev used by AMD/Intel GPU support, libudev-dev used by ubuntu18.04 + LIB_PATH=$(find / -name "libnvidia-ml*" 2>/dev/null) \ + && DIRECTORY=$(pwd) && cd /tmp \ + && sudo apt-get -qq update --fix-missing \ + && sudo apt-get -qq install -y --no-install-recommends libncurses5-dev libdrm-dev libsystemd-dev libudev-dev \ && git clone https://github.com/Syllo/nvtop.git \ && mkdir -pv nvtop/build && cd nvtop/build \ - && LIB_PATH=$(find / -name "libnvidia-ml*" 2>/dev/null) \ - && cmake .. -DCMAKE_LIBRARY_PATH="$(dirname ${LIB_PATH})" .. \ + && cmake .. -DCMAKE_LIBRARY_PATH="$(dirname ${LIB_PATH})" -DNVIDIA_SUPPORT=ON -DAMDGPU_SUPPORT=ON -DINTEL_SUPPORT=ON \ && make && sudo make install \ + && cd "${DIRECTORY}" && rm -rf /tmp/nvtop \ + && sudo apt-get -qq remove -y libncurses5-dev libdrm-dev libsystemd-dev libudev-dev \ && nvtop --version - - cd "${DIRECTORY}" && rm -rf /tmp/nvtop - - sudo apt-get -qq remove -y libncurses5-dev }