This is an automated email from the ASF dual-hosted git repository.
mhladun pushed a commit to branch gcp-jupyter-highgpu-template-1
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/gcp-jupyter-highgpu-template-1
by this push:
new a561a7d Updated files for jupyter-gpu-conda(template 2)
a561a7d is described below
commit a561a7d4cdd2b13e4f8d49d633566ffd765fe4cc
Author: Marian_Hladun <[email protected]>
AuthorDate: Mon Mar 7 15:35:17 2022 +0200
Updated files for jupyter-gpu-conda(template 2)
---
.../templates/locations/jupyter-gpu-conda.conf | 29 ++++++++++++++++++++++
.../general/scripts/gcp/common_prepare_notebook.py | 2 +-
.../templates/locations/jupyter-gpu-conda.conf | 29 ++++++++++++++++++++++
.../service/impl/LibraryServiceImpl.java | 2 +-
4 files changed, 60 insertions(+), 2 deletions(-)
diff --git
a/infrastructure-provisioning/src/edge/templates/locations/jupyter-gpu-conda.conf
b/infrastructure-provisioning/src/edge/templates/locations/jupyter-gpu-conda.conf
new file mode 100644
index 0000000..56f98ed
--- /dev/null
+++
b/infrastructure-provisioning/src/edge/templates/locations/jupyter-gpu-conda.conf
@@ -0,0 +1,29 @@
+# *****************************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
******************************************************************************
+location ~* /{{ NAME }}/.* {
+ proxy_pass http://{{ IP }}:8888;
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection "upgrade";
+}
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
b/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
index a13d1bb..a1e45d2 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
@@ -163,7 +163,7 @@ if __name__ == "__main__":
# notebook_config['gpu_accelerator_type'] == 'nvidia-tesla-a100'
# notebook_config['gpu_accelerator_count'] == '1'
- if os.environ['application'] in ('tensor', 'tensor-rstudio',
'deeplearning', 'jupyter-gpu') or os.environ[
+ if os.environ['application'] in ('tensor', 'tensor-rstudio',
'deeplearning', 'jupyter-gpu', 'jupyter-gpu-conda') or os.environ[
'gpu_enabled'] == 'True':
if os.environ['gpuType'] != '':
notebook_config['gpu_accelerator_type'] = os.environ['gpuType']
diff --git
a/infrastructure-provisioning/src/project/templates/locations/jupyter-gpu-conda.conf
b/infrastructure-provisioning/src/project/templates/locations/jupyter-gpu-conda.conf
new file mode 100644
index 0000000..56f98ed
--- /dev/null
+++
b/infrastructure-provisioning/src/project/templates/locations/jupyter-gpu-conda.conf
@@ -0,0 +1,29 @@
+# *****************************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
******************************************************************************
+location ~* /{{ NAME }}/.* {
+ proxy_pass http://{{ IP }}:8888;
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection "upgrade";
+}
diff --git
a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java
b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java
index 6ba4139..9d035c9 100644
---
a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java
@@ -160,7 +160,7 @@ public class LibraryServiceImpl implements LibraryService {
final String templateName = userInstanceDTO.getTemplateName();
List<LibraryGroups> groups = new ArrayList<>(Arrays.asList(GROUP_PIP3,
GROUP_OTHERS, GROUP_OS_PKG));
- if (isTemplateGroup(templateName, Stream.of(JUPYTER, ZEPPELIN,
JUPYTER_GPU))) {
+ if (isTemplateGroup(templateName, Stream.of(JUPYTER, ZEPPELIN,
JUPYTER_GPU, JUPYTER_GPU_CONDA))) {
groups.addAll(Arrays.asList(GROUP_R_PKG, GROUP_JAVA));
}
if (isTemplateGroup(templateName, Stream.of(DEEP_LEARNING, TENSOR,
TENSOR_GCP,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
