Skip to content

Commit d655a71

Browse files
haobibohaobibo
authored
🐛Bugfix: nvtop install (#78)
* Update script-setup.sh * update docs
1 parent ac7b0e7 commit d655a71

File tree

3 files changed

+23
-26
lines changed

3 files changed

+23
-26
lines changed

‎.github/workflows/docker.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ jobs:
244244
- run: |
245245
source ./tool.sh
246246
build_image tf2-cuda112 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.2" --build-arg "ARG_PROFILE_PYTHON=tf2"
247-
alias_image tf2-cuda112 latest torch latest
247+
alias_image tf2-cuda112 latest tf2 latest
248248
push_image
249249
250250
qpod_torch_cuda117:
@@ -279,7 +279,7 @@ jobs:
279279
- run: |
280280
source ./tool.sh
281281
build_image paddle-cuda117 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.7" --build-arg "ARG_PROFILE_PYTHON=paddle,mkl"
282-
alias_image paddle-cuda117 latest paddle latest
282+
alias_image paddle-cuda117 latest paddle-cuda latest
283283
push_image
284284
285285
qpod_paddle_cuda112:

‎README.md

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# QPod - Docker Image Stack
22

33
[![License](https://img.shields.io/badge/License-BSD%203--Clause-green.svg)](https://opensource.org/licenses/BSD-3-Clause)
4-
[![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)
4+
[![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)
55
[![Join the Gitter Chat](https://img.shields.io/gitter/room/nwjs/nw.js.svg)](https://gitter.im/QPod/)
66
[![Docker Pulls](https://img.shields.io/docker/pulls/qpod/qpod.svg)](https://hub.docker.com/r/qpod/qpod)
77
[![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
8484
<details>
8585
<summary> 👉 Click here to see a list of Docker Images run on GPUs + CPUs</summary>
8686

87-
| Image Name (Feature Set) | DockerHub Link | Based On | Description |
88-
|:---------------------------:|:-----------------------------------------:|:-------------------:|:-------------------------------------------------------------------------------------------------------------------------------------------------:|
89-
| 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. |
90-
| 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. |
91-
| 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) |
92-
| tf1-cu100, tf1 | https://hub.docker.com/r/qpod/tf1 | qpod/cuda_10.0 | Tensorflow 1.1x environment with GPU (cuda 10.0). |
93-
| tf2-cu115, tf2 | https://hub.docker.com/r/qpod/tf2 | qpod/cuda_11.5 | Tensorflow 2.x environment with GPU (cuda 11.5). |
94-
| torch-cu115, torch | https://hub.docker.com/r/qpod/torch | qpod/torch | Pytorch 1.x environment with GPU (cuda 11.5). |
95-
| torch-cu101, torch-cu102 | https://hub.docker.com/r/qpod/torch-cu102 | qpod/torch-cu102 | Pytorch 1.x environment with GPU (cuda 10.2). |
96-
| 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). |
97-
| 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. |
87+
| Image Name (Feature Set) | DockerHub Link | Based On | Description |
88+
|:-------------------------:|:-------------------------------------------:|:-----------------:|:--------------------------------------------------------------------------------------------------------------------:|
89+
| 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. |
90+
| 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. |
91+
| 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. |
92+
| 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) |
93+
| tf1-cuda100, tf1 | https://hub.docker.com/r/qpod/tf1 | qpod/cuda_10.0 | Tensorflow 1.1x environment with GPU (cuda 10.0). |
94+
| tf2-cuda112, tf2 | https://hub.docker.com/r/qpod/tf2 | qpod/cuda_11.2 | Tensorflow 2.x environment with GPU (cuda 11.2). |
95+
| torch-cuda117, torch | https://hub.docker.com/r/qpod/torch | qpod/torch | Pytorch 1.x environment with GPU (cuda 11.7). |
96+
| torch-cuda112 | https://hub.docker.com/r/qpod/torch-cuda112 | qpod/torch-cuda12 | Pytorch 1.x environment with GPU (cuda 10.2). |
97+
| 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. |
98+
| cuda-dev, full-cuda | https://hub.docker.com/r/qpod/cuda-dev | qpod/coe-cuda | `core-cuda` + IDE tools: JupyterLab / Jupyter Notebook + VSCode Server. |
9899

99100
</details>
100101

‎docker_atom/work/script-setup.sh

+8-12
Original file line numberDiff line numberDiff line change
@@ -78,22 +78,18 @@ setup_tini() {
7878

7979

8080
setup_nvtop() {
81-
# Install Utilities "nvtop"
82-
sudo apt-get -qq update --fix-missing && sudo apt-get -qq install -y --no-install-recommends libncurses5-dev
83-
84-
DIRECTORY=$(pwd)
85-
86-
cd /tmp \
81+
# Install Utilities "nvtop" from source: libdrm-dev libsystemd-dev used by AMD/Intel GPU support, libudev-dev used by ubuntu18.04
82+
LIB_PATH=$(find / -name "libnvidia-ml*" 2>/dev/null) \
83+
&& DIRECTORY=$(pwd) && cd /tmp \
84+
&& sudo apt-get -qq update --fix-missing \
85+
&& sudo apt-get -qq install -y --no-install-recommends libncurses5-dev libdrm-dev libsystemd-dev libudev-dev \
8786
&& git clone https://github.com/Syllo/nvtop.git \
8887
&& mkdir -pv nvtop/build && cd nvtop/build \
89-
&& LIB_PATH=$(find / -name "libnvidia-ml*" 2>/dev/null) \
90-
&& cmake .. -DCMAKE_LIBRARY_PATH="$(dirname ${LIB_PATH})" .. \
88+
&& cmake .. -DCMAKE_LIBRARY_PATH="$(dirname ${LIB_PATH})" -DNVIDIA_SUPPORT=ON -DAMDGPU_SUPPORT=ON -DINTEL_SUPPORT=ON \
9189
&& make && sudo make install \
90+
&& cd "${DIRECTORY}" && rm -rf /tmp/nvtop \
91+
&& sudo apt-get -qq remove -y libncurses5-dev libdrm-dev libsystemd-dev libudev-dev \
9292
&& nvtop --version
93-
94-
cd "${DIRECTORY}" && rm -rf /tmp/nvtop
95-
96-
sudo apt-get -qq remove -y libncurses5-dev
9793
}
9894

9995

0 commit comments

Comments
 (0)