UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-02-18 02:16:50 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'update-libnvidia-container' into 'main'

Browse Source 
Update libnvidia-container

See merge request nvidia/container-toolkit/container-toolkit!353
This commit is contained in:
Evan Lezar 2023-03-23 08:50:18 +00:00
commit 5e0684e99d
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -4,6 +4,9 @@
* Prefer /run over /var/run when locating nvidia-persistenced and nvidia-fabricmanager sockets. * Prefer /run over /var/run when locating nvidia-persistenced and nvidia-fabricmanager sockets.
* Only initialize NVML for modes that require it when runing `nvidia-ctk cdi generate` * Only initialize NVML for modes that require it when runing `nvidia-ctk cdi generate`
* [libnvidia-container] Fix segmentation fault when RPC initialization fails.
* [libnvidia-container] Build centos variants of the NVIDIA Container Library with static libtirpc v1.3.2.
* [libnvidia-container] Remove make targets for fedora35 as the centos8 packages are compatible.
## v1.13.0-rc.2 ## v1.13.0-rc.2

12
docker/docker.mk
View File

@ -14,10 +14,10 @@
# Supported OSs by architecture # Supported OSs by architecture
AMD64_TARGETS := ubuntu20.04 ubuntu18.04 ubuntu16.04 debian10 debian9 AMD64_TARGETS := ubuntu20.04 ubuntu18.04 ubuntu16.04 debian10 debian9
X86_64_TARGETS := fedora35 centos7 centos8 rhel7 rhel8 amazonlinux2 opensuse-leap15.1 X86_64_TARGETS := centos7 centos8 rhel7 rhel8 amazonlinux2 opensuse-leap15.1
PPC64LE_TARGETS := ubuntu18.04 ubuntu16.04 centos7 centos8 rhel7 rhel8 PPC64LE_TARGETS := ubuntu18.04 ubuntu16.04 centos7 centos8 rhel7 rhel8
ARM64_TARGETS := ubuntu20.04 ubuntu18.04 ARM64_TARGETS := ubuntu20.04 ubuntu18.04
AARCH64_TARGETS := fedora35 centos8 rhel8 amazonlinux2 AARCH64_TARGETS := centos8 rhel8 amazonlinux2
# Define top-level build targets # Define top-level build targets
docker%: SHELL:=/bin/bash docker%: SHELL:=/bin/bash
@ -102,14 +102,6 @@ LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)$(if $(LIBNVI
--centos%: CONFIG_TOML_SUFFIX := rpm-yum --centos%: CONFIG_TOML_SUFFIX := rpm-yum
--centos8%: BASEIMAGE = quay.io/centos/centos:stream8 --centos8%: BASEIMAGE = quay.io/centos/centos:stream8
# private fedora target
--fedora%: OS := fedora
--fedora%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.rpm-yum
--fedora%: CONFIG_TOML_SUFFIX := rpm-yum
# The fedora(35) base image has very slow performance when building aarch64 packages.
# Since our primary concern here is glibc versions, we use the older glibc version available in centos8.
--fedora35%: BASEIMAGE = quay.io/centos/centos:stream8
# private amazonlinux target # private amazonlinux target
--amazonlinux%: OS := amazonlinux --amazonlinux%: OS := amazonlinux
--amazonlinux%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.rpm-yum --amazonlinux%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.rpm-yum

2
third_party/libnvidia-container vendored

@ -1 +1 @@
Subproject commit d5e6cdc4c51ff97147cbc46c93fb7b01c8719734 Subproject commit 36259363e291694f9c246bd9012a9a9b04f2aae2