You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by mh...@apache.org on 2022/02/17 10:25:41 UTC

[incubator-datalab] branch 2.5.1-tensor-jupyterlab updated: Jupyterlab, tensorflow, tflite pip install

This is an automated email from the ASF dual-hosted git repository.

mhladun pushed a commit to branch 2.5.1-tensor-jupyterlab
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git


The following commit(s) were added to refs/heads/2.5.1-tensor-jupyterlab by this push:
     new 0e25f80  Jupyterlab,tensorflow,tflite pip install
0e25f80 is described below

commit 0e25f800ff5bffcdf60bca5fe0d3fce3f3257eea
Author: Marian_Hladun <ma...@epam.com>
AuthorDate: Thu Feb 17 11:18:47 2022 +0200

    Jupyterlab,tensorflow,tflite pip install
---
 .../src/general/lib/os/debian/notebook_lib.py            | 12 ------------
 .../general/scripts/aws/tensor-jupyterlab_configure.py   |  6 +++---
 .../scripts/configure_tensor-jupyterlab_node.py          | 16 +++++-----------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
index 3bf46f2..cfa4c97 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -400,18 +400,6 @@ def ensure_venv_libs(os_user, libs):
         datalab.fab.install_venv_pip_pkg(libs)
         datalab.fab.conn.sudo('touch /home/' + os_user + '/.ensure_dir/venv_libs_ensured')
 
-
-def ensure_venv_juplab(os_user, libs):
-    if not exists(datalab.fab.conn, '/home/' + os_user + '/.ensure_dir/venv_juplab_ensured'):
-        datalab.fab.install_venv_pip_pkg(libs, '3.2.9')
-        datalab.fab.conn.sudo('touch /home/' + os_user + '/.ensure_dir/venv_libs_ensured')
-
-def ensure_venv_tensorlite(os_user, libs):
-    if not exists(datalab.fab.conn, '/home/' + os_user + '/.ensure_dir/venv_juplab_ensured'):
-        datalab.fab.install_venv_pip_pkg(libs, '2.5.0')
-        datalab.fab.conn.sudo('touch /home/' + os_user + '/.ensure_dir/venv_libs_ensured')
-
-
 def ensure_pytorch(os_user, gpu=True):
     if not exists(datalab.fab.conn, '/home/' + os_user + '/.ensure_dir/pytorch_ensured'):
         if gpu:
diff --git a/infrastructure-provisioning/src/general/scripts/aws/tensor-jupyterlab_configure.py b/infrastructure-provisioning/src/general/scripts/aws/tensor-jupyterlab_configure.py
index cdd3f86..19b870f 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/tensor-jupyterlab_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/tensor-jupyterlab_configure.py
@@ -318,12 +318,12 @@ if __name__ == "__main__":
                    "notebook_image_name": notebook_config['notebook_image_name'],
                    "Action": "Create new notebook server",
                    "exploratory_url": [
-                       {"description": "Jupyter",
+                       {"description": "Jupyterlab",
                         "url": jupyter_notebook_access_url},
-                       {"description": "TensorBoard",
-                        "url": tensorboard_access_url},
                        {"description": "Ungit",
                         "url": jupyter_ungit_access_url}#,
+                       # {"description": "TensorBoard",
+                       #  "url": tensorboard_access_url},
                        #{"description": "Jupyter (via tunnel)",
                        # "url": jupyter_ip_url},
                        #{"description": "TensorBoard (via tunnel)",
diff --git a/infrastructure-provisioning/src/tensor-jupyterlab/scripts/configure_tensor-jupyterlab_node.py b/infrastructure-provisioning/src/tensor-jupyterlab/scripts/configure_tensor-jupyterlab_node.py
index a74faff..150fe13 100644
--- a/infrastructure-provisioning/src/tensor-jupyterlab/scripts/configure_tensor-jupyterlab_node.py
+++ b/infrastructure-provisioning/src/tensor-jupyterlab/scripts/configure_tensor-jupyterlab_node.py
@@ -71,7 +71,7 @@ cuda_version = os.environ['notebook_cuda_version']
 cuda_file_name = os.environ['notebook_cuda_file_name']
 cudnn_version = os.environ['notebook_cudnn_version']
 cudnn_file_name = os.environ['notebook_cudnn_file_name']
-venv_libs = 'numpy scipy matplotlib pandas scikit-learn opencv-python' # python3-opencv
+venv_libs = 'numpy scipy matplotlib pandas scikit-learn opencv-python jupyterlab==3.2.9 tensorflow==2.5.0 tflite==2.5.0' # python3-opencv
 jupyterlab_pip = 'jupyterlab'
 
 ##############
@@ -103,10 +103,10 @@ if __name__ == "__main__":
     ensure_python_venv(python_venv_version)
 
     # INSTALL TENSORFLOW AND OTHER DEEP LEARNING LIBRARIES
-    print("Install TensorFlow")
-    install_tensor(args.os_user, cuda_version, cuda_file_name,
-                   cudnn_version, cudnn_file_name, tensorflow_version,
-                   templates_dir, nvidia_version)
+    #print("Install TensorFlow")
+    #install_tensor(args.os_user, cuda_version, cuda_file_name,
+    #               cudnn_version, cudnn_file_name, tensorflow_version,
+    #               templates_dir, nvidia_version)
     print("Install Theano")
     install_theano(args.os_user, theano_version)
     print("Installing Keras")
@@ -154,12 +154,6 @@ if __name__ == "__main__":
     print("Install python venv required libs")
     ensure_venv_libs(args.os_user, venv_libs)
 
-    print("Install jupyterlab")
-    ensure_venv_juplab(args.os_user, 'jupyterlab')
-
-    print("Install tensorflow lite")
-    ensure_venv_tensorlite(args.os_user, 'tflite')
-
     #POST INSTALLATION PROCESS
     print("Updating pyOpenSSL library")
     update_pyopenssl_lib(args.os_user)

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org