Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

notebook関連のissue #468 の対応 #471

Merged
merged 2 commits into from
Apr 30, 2021
Merged

notebook関連のissue #468 の対応 #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c520184
notebook関連のissue #468 の対応
ozota1 Apr 28, 2021
5f26c46
notebook機能でのpythonバージョン取得の修正
ozota1 Apr 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions web-api/platypus/platypus/Controllers/spa/NotebookController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ public async Task<IActionResult> Create([FromBody]CreateInputModel model)
//コンテナイメージの設定がない場合デフォルトのイメージを設定
notebookHistory.ContainerRegistryId = null;
notebookHistory.ContainerImage = "tensorflow/tensorflow";
notebookHistory.ContainerTag = "1.13.1-gpu-py3";
notebookHistory.ContainerTag = "1.15.2-gpu";
}

//gitが指定されているかチェック
Expand Down Expand Up @@ -779,7 +779,7 @@ public async Task<IActionResult> Rerun(long? id, [FromBody]RerunInputModel model
// コンテナイメージの設定がない場合デフォルトのイメージを設定
notebookHistory.ContainerRegistryId = null;
notebookHistory.ContainerImage = "tensorflow/tensorflow";
notebookHistory.ContainerTag = "1.13.1-gpu-py3";
notebookHistory.ContainerTag = "1.15.2-gpu";
}
// gitが指定されているかチェック
if (model.GitModel != null)
Expand Down
13 changes: 13 additions & 0 deletions ...latypus/platypus/ServiceModels/KubernetesModels/Templates/ConfigMap/notebook_scripts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,19 @@ data:
if [ $? -ne 0 ]; then
echo "You need to change the name of '/kqi/output/inference' or delete it. After that, please run again."
fi
fi
if which python3 > /dev/null 2>&1; then
PYTHON_MINOR_VER=$(python3 -c "import sys; print(sys.version_info[1])")
else
PYTHON_MINOR_VER=$(python -c "import sys; print(sys.version_info[1])")
fi
# workaround for jupyter bug(https://github.com/KAMONOHASHI/kamonohashi/issues/468)
if [ $PYTHON_MINOR_VER -le 5 ]; then
if which pip3 > /dev/null 2>&1; then
pip3 install jupyter-client==6.1.12
else
pip install jupyter-client==6.1.12
fi
fi
cd /kqi/git
@Raw(Model.EntryPoint)
Expand Down