Merge pull request #108607 from cpcloud/update-nvidia-runtime
This commit is contained in:
commit
2f2d887664
@ -1,47 +1,61 @@
|
|||||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, callPackage, makeWrapper
|
{ stdenv
|
||||||
, buildGoPackage, runc, glibc }:
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
|
, callPackage
|
||||||
|
, makeWrapper
|
||||||
|
, buildGoModule
|
||||||
|
, buildGoPackage
|
||||||
|
, git
|
||||||
|
, glibc
|
||||||
|
}:
|
||||||
|
|
||||||
with lib; let
|
with lib; let
|
||||||
|
|
||||||
libnvidia-container = callPackage ./libnvc.nix { };
|
libnvidia-container = callPackage ./libnvc.nix { };
|
||||||
|
|
||||||
nvidia-container-runtime = fetchFromGitHub {
|
nvidia-container-runtime = buildGoPackage rec {
|
||||||
owner = "NVIDIA";
|
pname = "nvidia-container-toolkit";
|
||||||
repo = "nvidia-container-runtime";
|
version = "3.4.0";
|
||||||
rev = "runtime-v2.0.0";
|
|
||||||
sha256 = "0jcj5xxbg7x7gyhbb67h3ds6vly62gx7j02zm6lg102h34jajj7a";
|
|
||||||
};
|
|
||||||
|
|
||||||
nvidia-container-runtime-hook = buildGoPackage {
|
|
||||||
pname = "nvidia-container-runtime-hook";
|
|
||||||
version = "1.4.0";
|
|
||||||
|
|
||||||
goPackagePath = "nvidia-container-runtime-hook";
|
|
||||||
|
|
||||||
src = "${nvidia-container-runtime}/hook/nvidia-container-runtime-hook";
|
|
||||||
};
|
|
||||||
|
|
||||||
nvidia-runc = runc.overrideAttrs (oldAttrs: rec {
|
|
||||||
name = "nvidia-runc";
|
|
||||||
version = "1.0.0-rc6";
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "opencontainers";
|
owner = "NVIDIA";
|
||||||
repo = "runc";
|
repo = "nvidia-container-runtime";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1jwacb8xnmx5fr86gximhbl9dlbdwj3rpf27hav9q1si86w5pb1j";
|
sha256 = "095mks0r4079vawi50pk4zb5jk0g6s9idg2s1w55a0d27jkknldr";
|
||||||
};
|
};
|
||||||
patches = [ "${nvidia-container-runtime}/runtime/runc/3f2f8b84a77f73d38244dd690525642a72156c64/0001-Add-prestart-hook-nvidia-container-runtime-hook-to-t.patch" ];
|
goPackagePath = "github.com/nvidia-container-runtime/src";
|
||||||
});
|
buildFlagsArray = [ "-ldflags=" "-s -w" ];
|
||||||
|
postInstall = ''
|
||||||
|
mv $out/bin/{src,nvidia-container-runtime}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
nvidia-container-toolkit = buildGoModule rec {
|
||||||
|
pname = "nvidia-container-toolkit";
|
||||||
|
version = "1.3.0";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "NVIDIA";
|
||||||
|
repo = "nvidia-container-toolkit";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn";
|
||||||
|
};
|
||||||
|
vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7";
|
||||||
|
buildFlagsArray = [ "-ldflags=" "-s -w" ];
|
||||||
|
postInstall = ''
|
||||||
|
mv $out/bin/{pkg,${pname}}
|
||||||
|
cp $out/bin/{${pname},nvidia-container-runtime-hook}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
pname = "nvidia-docker";
|
pname = "nvidia-docker";
|
||||||
version = "2.0.3";
|
version = "2.5.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "NVIDIA";
|
owner = "NVIDIA";
|
||||||
repo = "nvidia-docker";
|
repo = "nvidia-docker";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1vx5m591mnvcb9vy0196x5lh3r8swjsk0fnlv5h62m7m4m07v6wx";
|
sha256 = "1n1k7fnimky67s12p2ycaq9mgk245fchq62vgd7bl3bzfcbg0z4h";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
@ -50,8 +64,8 @@ in stdenv.mkDerivation rec {
|
|||||||
mkdir bin
|
mkdir bin
|
||||||
cp nvidia-docker bin
|
cp nvidia-docker bin
|
||||||
cp ${libnvidia-container}/bin/nvidia-container-cli bin
|
cp ${libnvidia-container}/bin/nvidia-container-cli bin
|
||||||
cp ${nvidia-container-runtime-hook}/bin/nvidia-container-runtime-hook bin
|
cp ${nvidia-container-toolkit}/bin/nvidia-container-{toolkit,runtime-hook} bin
|
||||||
cp ${nvidia-runc}/bin/runc bin/nvidia-container-runtime
|
cp ${nvidia-container-runtime}/bin/nvidia-container-runtime bin
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
@ -68,5 +82,6 @@ in stdenv.mkDerivation rec {
|
|||||||
description = "NVIDIA container runtime for Docker";
|
description = "NVIDIA container runtime for Docker";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
|
maintainers = with lib.maintainers; [ cpcloud ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -86,7 +86,7 @@ index 30e3cfd..6d12a50 100644
|
|||||||
if (info->libs == NULL)
|
if (info->libs == NULL)
|
||||||
goto fail;
|
goto fail;
|
||||||
if (ldcache_resolve(&ld, LIB_ARCH, root, libs,
|
if (ldcache_resolve(&ld, LIB_ARCH, root, libs,
|
||||||
- info->libs, info->nlibs, select_libraries, info) < 0)
|
- info->libs, info->nlibs, select_libraries_fn, info) < 0)
|
||||||
+ info->libs, info->nlibs, info->nvrm_version) < 0)
|
+ info->libs, info->nlibs, info->nvrm_version) < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
@ -95,7 +95,7 @@ index 30e3cfd..6d12a50 100644
|
|||||||
if (info->libs32 == NULL)
|
if (info->libs32 == NULL)
|
||||||
goto fail;
|
goto fail;
|
||||||
if (ldcache_resolve(&ld, LIB32_ARCH, root, libs,
|
if (ldcache_resolve(&ld, LIB32_ARCH, root, libs,
|
||||||
- info->libs32, info->nlibs32, select_libraries, info) < 0)
|
- info->libs32, info->nlibs32, select_libraries_fn, info) < 0)
|
||||||
+ info->libs32, info->nlibs32, info->nvrm_version) < 0)
|
+ info->libs32, info->nlibs32, info->nvrm_version) < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
rv = 0;
|
rv = 0;
|
||||||
|
@ -9,23 +9,23 @@
|
|||||||
, libtirpc
|
, libtirpc
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
modp-ver = "396.51";
|
modp-ver = "450.57";
|
||||||
nvidia-modprobe = fetchFromGitHub {
|
nvidia-modprobe = fetchFromGitHub {
|
||||||
owner = "NVIDIA";
|
owner = "NVIDIA";
|
||||||
repo = "nvidia-modprobe";
|
repo = "nvidia-modprobe";
|
||||||
rev = modp-ver;
|
rev = modp-ver;
|
||||||
sha256 = "1fw2qwc84k64agw6fx2v0mjf88aggph9c6qhs4cv7l3gmflv8qbk";
|
sha256 = "0r4f6lpbbqqs9932xd2mr7bxn6a3xdalcwq332fc1amrrkgzfyv7";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libnvidia-container";
|
pname = "libnvidia-container";
|
||||||
version = "1.0.6";
|
version = "1.3.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "NVIDIA";
|
owner = "NVIDIA";
|
||||||
repo = "libnvidia-container";
|
repo = "libnvidia-container";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1pnpc9knwh8d1zqb28zc3spkjc00w0z10vd3jna8ksvpl35jl7w3";
|
sha256 = "0j6b8z9x9hrrs4xp11zyjjd7kyl7fzcicpiis8k1qb1q2afnqsrq";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
@ -58,7 +58,10 @@ stdenv.mkDerivation rec {
|
|||||||
mkdir -p deps/src/nvidia-modprobe-${modp-ver}
|
mkdir -p deps/src/nvidia-modprobe-${modp-ver}
|
||||||
cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver}
|
cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver}
|
||||||
chmod -R u+w deps/src
|
chmod -R u+w deps/src
|
||||||
touch deps/src/nvidia-modprobe-${modp-ver}/.download_stamp
|
pushd deps/src
|
||||||
|
patch -p0 < ${./modprobe.patch}
|
||||||
|
touch nvidia-modprobe-${modp-ver}/.download_stamp
|
||||||
|
popd
|
||||||
'';
|
'';
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
|
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
|
||||||
|
@ -0,0 +1,29 @@
|
|||||||
|
diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c
|
||||||
|
--- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-07-09 17:06:05.000000000 +0000
|
||||||
|
+++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000
|
||||||
|
@@ -840,10 +840,10 @@
|
||||||
|
return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH);
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int nvidia_cap_get_device_file_attrs(const char* cap_file_path,
|
||||||
|
- int *major,
|
||||||
|
- int *minor,
|
||||||
|
- char *name)
|
||||||
|
+int nvidia_cap_get_device_file_attrs(const char* cap_file_path,
|
||||||
|
+ int *major,
|
||||||
|
+ int *minor,
|
||||||
|
+ char *name)
|
||||||
|
{
|
||||||
|
char field[32];
|
||||||
|
FILE *fp;
|
||||||
|
diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h
|
||||||
|
--- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-07-09 17:06:05.000000000 +0000
|
||||||
|
+++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000
|
||||||
|
@@ -81,6 +81,7 @@
|
||||||
|
int nvidia_nvswitch_get_file_state(int minor);
|
||||||
|
int nvidia_cap_mknod(const char* cap_file_path, int *minor);
|
||||||
|
int nvidia_cap_get_file_state(const char* cap_file_path);
|
||||||
|
+int nvidia_cap_get_device_file_attrs(const char* cap_file_path, int *major, int *minor, char *name);
|
||||||
|
int nvidia_get_chardev_major(const char *name);
|
||||||
|
|
||||||
|
#endif /* NV_LINUX */
|
Loading…
Reference in New Issue
Block a user