Skip to content

Commit 689a5d6

Browse files
hephaexhephaex
committed
Merge branch 'master' of github.com:lablup/backend.ai-kernels
2 parents a3e2e20 + 91ae514 commit 689a5d6

File tree

9 files changed

+36
-30
lines changed

9 files changed

+36
-30
lines changed

‎commons/service-defs/jupyter.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"c.NotebookApp.ip = \"0.0.0.0\"\n",
99
"c.NotebookApp.port = {ports[0]}\n",
1010
"c.NotebookApp.token = \"\"\n",
11-
"c.FileContentsManager.delete_to_trash = False\n"
11+
"c.FileContentsManager.delete_to_trash = False\n",
12+
"c.NotebookApp.tornado_settings = {{'headers': {{'Content-Security-Policy': \"frame-ancestors * 'self' \"}}}}\n",
13+
"c.JupyterHub.tornado_settings = {{'headers': {{'Content-Security-Policy': \"frame-ancestors * 'self' \"}}}}\n"
1214
]
1315
},
1416
"ref": "jupyter_cfg"

‎python/service-defs/jupyter.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"c.NotebookApp.ip = \"0.0.0.0\"\n",
99
"c.NotebookApp.port = {ports[0]}\n",
1010
"c.NotebookApp.token = \"\"\n",
11-
"c.FileContentsManager.delete_to_trash = False\n"
11+
"c.FileContentsManager.delete_to_trash = False\n",
12+
"c.NotebookApp.tornado_settings = {{'headers': {{'Content-Security-Policy': \"frame-ancestors * 'self' \"}}}}\n",
13+
"c.JupyterHub.tornado_settings = {{'headers': {{'Content-Security-Policy': \"frame-ancestors * 'self' \"}}}}\n"
1214
]
1315
},
1416
"ref": "jupyter_cfg"

‎r-base/service-defs/jupyter.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
"c.NotebookApp.allow_root = True\n",
88
"c.NotebookApp.ip = \"0.0.0.0\"\n",
99
"c.NotebookApp.port = {ports[0]}\n",
10-
"c.ContentsManager.files_handler_class = None\n",
10+
"c.ContentsManager.files_handler_class = None\n",
1111
"c.NotebookApp.token = \"\"\n",
12-
"c.FileContentsManager.delete_to_trash = False\n"
12+
"c.FileContentsManager.delete_to_trash = False\n",
13+
"c.NotebookApp.tornado_settings = {{'headers': {{'Content-Security-Policy': \"frame-ancestors * 'self' \"}}}}\n",
14+
"c.JupyterHub.tornado_settings = {{'headers': {{'Content-Security-Policy': \"frame-ancestors * 'self' \"}}}}\n"
1315
]
1416
},
1517
"ref": "jupyter_cfg"

‎tensorflow-model-server/Dockerfile.tfserve.2.10

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ FROM tensorflow/serving:2.10.0
22
# Backend.AI specifics
33
LABEL ai.backend.kernelspec="1" \
44
ai.backend.envs.corecount="OPENBLAS_NUM_THREADS,OMP_NUM_THREADS,NPROC" \
5-
ai.backend.features="batch query uid-match user-input" \
6-
ai.backend.base-distro="ubuntu18.04" \
5+
ai.backend.features="batch uid-match" \
6+
ai.backend.base-distro="ubuntu20.04" \
77
ai.backend.resource.min.cpu="1" \
88
ai.backend.resource.min.mem="1g" \
9-
ai.backend.resource.min.cuda.device=0 \
10-
ai.backend.resource.min.cuda.shares=0 \
11-
ai.backend.runtime-type="python" \
12-
ai.backend.runtime-path="/usr/bin/python3" \
9+
ai.backend.runtime-type="app" \
1310
ai.backend.service-ports="tf-model-server-grpc:preopen:8500,tf-model-server-restapi:preopen:8501"
11+
ENV USER work
12+
WORKDIR /home/work

‎tensorflow-model-server/Dockerfile.tfserve.2.7

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ FROM tensorflow/serving:2.7.4
22
# Backend.AI specifics
33
LABEL ai.backend.kernelspec="1" \
44
ai.backend.envs.corecount="OPENBLAS_NUM_THREADS,OMP_NUM_THREADS,NPROC" \
5-
ai.backend.features="batch query uid-match user-input" \
6-
ai.backend.base-distro="ubuntu18.04" \
5+
ai.backend.features="batch uid-match" \
6+
ai.backend.base-distro="ubuntu20.04" \
77
ai.backend.resource.min.cpu="1" \
88
ai.backend.resource.min.mem="1g" \
9-
ai.backend.resource.min.cuda.device=0 \
10-
ai.backend.resource.min.cuda.shares=0 \
11-
ai.backend.runtime-type="python" \
12-
ai.backend.runtime-path="/usr/bin/python3" \
9+
ai.backend.runtime-type="app" \
1310
ai.backend.service-ports="tf-model-server-grpc:preopen:8500,tf-model-server-restapi:preopen:8501"
11+
ENV USER work
12+
WORKDIR /home/work

‎tensorflow-model-server/Dockerfile.tfserve.2.8

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ FROM tensorflow/serving:2.8.3
22
# Backend.AI specifics
33
LABEL ai.backend.kernelspec="1" \
44
ai.backend.envs.corecount="OPENBLAS_NUM_THREADS,OMP_NUM_THREADS,NPROC" \
5-
ai.backend.features="batch query uid-match user-input" \
6-
ai.backend.base-distro="ubuntu18.04" \
5+
ai.backend.features="batch uid-match" \
6+
ai.backend.base-distro="ubuntu20.04" \
77
ai.backend.resource.min.cpu="1" \
88
ai.backend.resource.min.mem="1g" \
9-
ai.backend.resource.min.cuda.device=0 \
10-
ai.backend.resource.min.cuda.shares=0 \
11-
ai.backend.runtime-type="python" \
12-
ai.backend.runtime-path="/usr/bin/python3" \
9+
ai.backend.runtime-type="app" \
1310
ai.backend.service-ports="tf-model-server-grpc:preopen:8500,tf-model-server-restapi:preopen:8501"
11+
ENV USER work
12+
WORKDIR /home/work

‎tensorflow-model-server/Dockerfile.tfserve.2.9

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ FROM tensorflow/serving:2.9.2
22
# Backend.AI specifics
33
LABEL ai.backend.kernelspec="1" \
44
ai.backend.envs.corecount="OPENBLAS_NUM_THREADS,OMP_NUM_THREADS,NPROC" \
5-
ai.backend.features="batch query uid-match user-input" \
6-
ai.backend.base-distro="ubuntu18.04" \
5+
ai.backend.features="batch uid-match" \
6+
ai.backend.base-distro="ubuntu20.04" \
77
ai.backend.resource.min.cpu="1" \
88
ai.backend.resource.min.mem="1g" \
9-
ai.backend.resource.min.cuda.device=0 \
10-
ai.backend.resource.min.cuda.shares=0 \
11-
ai.backend.runtime-type="python" \
12-
ai.backend.runtime-path="/usr/bin/python3" \
9+
ai.backend.runtime-type="app" \
1310
ai.backend.service-ports="tf-model-server-grpc:preopen:8500,tf-model-server-restapi:preopen:8501"
11+
ENV USER work
12+
WORKDIR /home/work

‎vendor/ngc-tensorflow/service-defs/jupyter.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"c.NotebookApp.ip = \"0.0.0.0\"\n",
99
"c.NotebookApp.port = {ports[0]}\n",
1010
"c.NotebookApp.token = \"\"\n",
11-
"c.FileContentsManager.delete_to_trash = False\n"
11+
"c.FileContentsManager.delete_to_trash = False\n",
12+
"c.NotebookApp.tornado_settings = {{'headers': {{'Content-Security-Policy': \"frame-ancestors * 'self' \"}}}}\n",
13+
"c.JupyterHub.tornado_settings = {{'headers': {{'Content-Security-Policy': \"frame-ancestors * 'self' \"}}}}\n"
1214
]
1315
},
1416
"ref": "jupyter_cfg"

‎vendor/ngc-tensorflow/service-defs/jupyterlab.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"c.NotebookApp.ip = \"0.0.0.0\"\n",
99
"c.NotebookApp.port = {ports[0]}\n",
1010
"c.NotebookApp.token = \"\"\n",
11-
"c.FileContentsManager.delete_to_trash = False\n"
11+
"c.FileContentsManager.delete_to_trash = False\n",
12+
"c.NotebookApp.tornado_settings = {{'headers': {{'Content-Security-Policy': \"frame-ancestors * 'self' \"}}}}\n",
13+
"c.JupyterHub.tornado_settings = {{'headers': {{'Content-Security-Policy': \"frame-ancestors * 'self' \"}}}}\n"
1214
]
1315
},
1416
"ref": "jupyter_cfg"

0 commit comments

Comments
 (0)