zishuo/ascend-docker-runtime
1
0
Fork 0
mirror of https://github.com/Ascend/ascend-docker-runtime.git synced 2025-10-12 04:30:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Match-id-aa5b2e239bdd603ef626ea24fd7a4323c0d288cf

Browse Source
This commit is contained in:
BianTanggui
2020-06-16 16:28:37 +08:00
parent 0ff3bfe544
commit c71cdf7038
8 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/build.sh
View File

@@ -21,7 +21,7 @@ RUNTIMEDIR=${ROOT}/runtime
RUNTIMESRCNAME="main.go"
DEBPACK=${ROOT}/debpack
BINDIR=${DEBPACK}/usr/local/bin
BINDIR=${DEBPACK}/usr/bin
DEBDIR=${DEBPACK}/DEBIAN
RPMPACK=${ROOT}/rpmpack

8
cli/src/main.c
View File

@@ -22,6 +22,7 @@
#define DEVMM_SVM_PATH "/dev/devmm_svm"
#define HISI_HDC_PATH "/dev/hisi_hdc"
#define ASCEND_DRIVER_PATH "/usr/local/Ascend/driver"
#define ASCEND_ADDONS_PATH "/usr/local/Ascend/add-ons"
#define DEFAULT_DIR_MODE 0755
#define BUF_SIZE 1024
#define ALLOW_PATH "/devices.allow"
@@ -328,6 +329,13 @@ int DoDirectoryMounting(const char *rootfs)
fprintf(stderr, "error: failed to do mount %s\n", ASCEND_DRIVER_PATH);
return -1;
}
ret = MountFiles(rootfs, ASCEND_ADDONS_PATH, reMountRwFlag);
if (ret < 0) {
fprintf(stderr, "error: failed to do mount %s\n", ASCEND_ADDONS_PATH);
return -1;
}
return 0;
}

2
hook/main.go
View File

@@ -24,7 +24,7 @@ const (
loggingPrefix = "ascend-docker-hook"
ascendVisibleDevices = "ASCEND_VISIBLE_DEVICES"
ascendDockerCli = "ascend-docker-cli"
defaultAscendDockerCli = "/usr/local/bin/ascend-docker-cli"
defaultAscendDockerCli = "/usr/bin/ascend-docker-cli"
borderNum = 2
kvPairSize = 2

2
install/deb/scripts/postinst
View File

@@ -5,7 +5,7 @@ mkdir ${DIR}
fi
SRC="${DIR}/daemon.json.${PPID}"
DST="${DIR}/daemon.json"
BINDIR=/usr/local/bin
BINDIR=/usr/bin
${BINDIR}/ascend-docker-plugin-install-helper add ${DST} ${SRC}
if [ "$?" != "0" ]; then
echo "create damon.json failed\n"

2
install/deb/scripts/prerm
View File

@@ -5,7 +5,7 @@ mkdir ${DIR}
fi
SRC="${DIR}/daemon.json.${PPID}"
DST="${DIR}/daemon.json"
BINDIR=/usr/local/bin
BINDIR=/usr/bin
${BINDIR}/ascend-docker-plugin-install-helper rm ${DST} ${SRC}
if [ "$?" != "0" ]; then
echo "del damon.json failed\n"

2
install/deb/src/main.c
View File

@@ -15,7 +15,7 @@
#define CMD_INDEX 1
#define FINAL_FILE_INDEX 2
#define TEMP_FILE_INDEX 3
#define ASCEND_RUNTIME_PATH_VALUE "/usr/local/bin/ascend-docker-runtime"
#define ASCEND_RUNTIME_PATH_VALUE "/usr/bin/ascend-docker-runtime"
#define ASCEND_RUNTIME_PATH_KEY "path"
#define ASCEND_RUNTIME_ARGS_KEY "runtimeArgs"
#define RUNTIME_KEY "runtimes"

10
install/rpm/ascend-docker-plgugin.spec
View File

@@ -14,8 +14,8 @@ ascend-docker-plugin helps usrs to use NPU in docker
%build
%install
mkdir -p %{buildroot}/usr/local/bin/
cp -rf %{buildroot}/../../SOURCES/ascend* %{buildroot}/usr/local/bin/
mkdir -p %{buildroot}/usr/bin/
cp -rf %{buildroot}/../../SOURCES/ascend* %{buildroot}/usr/bin/
%pre
@@ -24,7 +24,7 @@ cp -rf %{buildroot}/../../SOURCES/ascend* %{buildroot}/usr/local/bin/
DIR=/etc/docker
SRC="${DIR}/daemon.json.${PPID}"
DST="${DIR}/daemon.json"
BINDIR=/usr/local/bin
BINDIR=/usr/bin
if [ ! -d "${DIR}" ]; then
mkdir ${DIR}
fi
@@ -39,7 +39,7 @@ echo "create damom.json success\n"
%preun
#!/bin/bash
DIR=/etc/docker
BINDIR=/usr/local/bin
BINDIR=/usr/bin
SRC="${DIR}/daemon.json.${PPID}"
DST="${DIR}/daemon.json"
${BINDIR}/ascend-docker-plugin-install-helper rm ${DST} ${SRC}
@@ -56,4 +56,4 @@ echo "del damom.json success\n"
%files
%defattr(0755,root,root,0755)
/usr/local/bin/*
/usr/bin/*

3
runtime/main.go
View File

@@ -20,7 +20,7 @@ import (
const (
loggingPrefix = "ascend-docker-runtime"
hookCli = "ascend-docker-hook"
hookDefaultFilePath = "/usr/local/bin/ascend-docker-hook"
hookDefaultFilePath = "/usr/bin/ascend-docker-hook"
dockerRuncFile = "docker-runc"
runcFile = "runc"
)
@@ -165,7 +165,6 @@ func doProcess() error {
func main() {
log.SetPrefix(loggingPrefix)
if err := doProcess(); err != nil {
log.Fatal(err)
}