diff --git a/README.ipynb b/README.ipynb index 04afd5038d8ff23c548e825596abd07af8aa432a..962b9c14fee42d82ac9a2b2a061d02ee0f4e3eaa 100644 --- a/README.ipynb +++ b/README.ipynb @@ -3,13 +3,13 @@ { "cell_type": "code", "execution_count": 1, - "id": "e6482f7c", + "id": "916506c0", "metadata": { "execution": { - "iopub.execute_input": "2022-10-17T17:16:07.599553Z", - "iopub.status.busy": "2022-10-17T17:16:07.599306Z", - "iopub.status.idle": "2022-10-17T17:16:07.612204Z", - "shell.execute_reply": "2022-10-17T17:16:07.611282Z" + "iopub.execute_input": "2022-12-19T09:48:07.260059Z", + "iopub.status.busy": "2022-12-19T09:48:07.259179Z", + "iopub.status.idle": "2022-12-19T09:48:07.274680Z", + "shell.execute_reply": "2022-12-19T09:48:07.273954Z" }, "jupyter": { "source_hidden": true @@ -52,14 +52,14 @@ "For more information, you can contact us at : \n", "[<img width=\"200px\" style=\"vertical-align:middle\" src=\"fidle/img/00-Mail_contact.svg\"></img>](#top)\n", "\n", - "Current Version : <!-- VERSION_BEGIN -->2.2.2<!-- VERSION_END -->\n", + "Current Version : <!-- VERSION_BEGIN -->2.2.3<!-- VERSION_END -->\n", "\n", "\n", "## Course materials\n", "\n", "| | | | |\n", "|:--:|:--:|:--:|:--:|\n", - "| **[<img width=\"50px\" src=\"fidle/img/00-Fidle-pdf.svg\"></img><br>Course slides](https://fidle.cnrs.fr/supports)**<br>The course in pdf format<br>(12 Mo)| **[<img width=\"50px\" src=\"fidle/img/00-Notebooks.svg\"></img><br>Notebooks](https://fidle.cnrs.fr/notebooks)**<br> Get a Zip or clone this repository <br>(40 Mo)| **[<img width=\"50px\" src=\"fidle/img/00-Datasets-tar.svg\"></img><br>Datasets](https://fidle.cnrs.fr/fidle-datasets.tar)**<br>All the needed datasets<br>(1.2 Go)|**[<img width=\"50px\" src=\"fidle/img/00-Videos.svg\"></img><br>Videos](https://fidle.cnrs.fr/youtube)**<br> Our Youtube channel <br> |\n", + "| **[<img width=\"50px\" src=\"fidle/img/00-Fidle-pdf.svg\"></img><br>Course slides](https://fidle.cnrs.fr/supports)**<br>The course in pdf format<br>(12 Mo)| **[<img width=\"50px\" src=\"fidle/img/00-Notebooks.svg\"></img><br>Notebooks](https://fidle.cnrs.fr/notebooks)**<br> Get a Zip or clone this repository <br>(40 Mo)| **[<img width=\"50px\" src=\"fidle/img/00-Datasets-tar.svg\"></img><br>Datasets](https://fidle.cnrs.fr/datasets-fidle.tar)**<br>All the needed datasets<br>(1.2 Go)|**[<img width=\"50px\" src=\"fidle/img/00-Videos.svg\"></img><br>Videos](https://fidle.cnrs.fr/youtube)**<br> Our Youtube channel <br> |\n", "\n", "Have a look about **[How to get and install](https://fidle.cnrs.fr/installation)** these notebooks and datasets.\n", "\n", @@ -67,7 +67,7 @@ "## Jupyter notebooks\n", "\n", "<!-- TOC_BEGIN -->\n", - "<!-- Automatically generated on : 17/10/22 19:16:06 -->\n", + "<!-- Automatically generated on : 19/12/22 10:48:06 -->\n", "\n", "### Linear and logistic regression\n", "- **[LINR1](LinearReg/01-Linear-Regression.ipynb)** - [Linear regression with direct resolution](LinearReg/01-Linear-Regression.ipynb) \n", @@ -233,7 +233,7 @@ "from IPython.display import display,Markdown\n", "display(Markdown(open('README.md', 'r').read()))\n", "#\n", - "# This README is visible under Jupiter Lab ;-)# Automatically generated on : 17/10/22 19:16:06" + "# This README is visible under Jupiter Lab ;-)# Automatically generated on : 19/12/22 10:48:06" ] } ], diff --git a/README.md b/README.md index efc002303ee59f7314b344b962db56e89ab74356..4ae66bb7e198ce29204fe80d1ddf843a9e0c3e58 100644 --- a/README.md +++ b/README.md @@ -31,14 +31,14 @@ For more information, see **https://fidle.cnrs.fr** : For more information, you can contact us at : [<img width="200px" style="vertical-align:middle" src="fidle/img/00-Mail_contact.svg"></img>](#top) -Current Version : <!-- VERSION_BEGIN -->2.2.2<!-- VERSION_END --> +Current Version : <!-- VERSION_BEGIN -->2.2.3<!-- VERSION_END --> ## Course materials | | | | | |:--:|:--:|:--:|:--:| -| **[<img width="50px" src="fidle/img/00-Fidle-pdf.svg"></img><br>Course slides](https://fidle.cnrs.fr/supports)**<br>The course in pdf format<br>(12 Mo)| **[<img width="50px" src="fidle/img/00-Notebooks.svg"></img><br>Notebooks](https://fidle.cnrs.fr/notebooks)**<br> Get a Zip or clone this repository <br>(40 Mo)| **[<img width="50px" src="fidle/img/00-Datasets-tar.svg"></img><br>Datasets](https://fidle.cnrs.fr/fidle-datasets.tar)**<br>All the needed datasets<br>(1.2 Go)|**[<img width="50px" src="fidle/img/00-Videos.svg"></img><br>Videos](https://fidle.cnrs.fr/youtube)**<br> Our Youtube channel <br> | +| **[<img width="50px" src="fidle/img/00-Fidle-pdf.svg"></img><br>Course slides](https://fidle.cnrs.fr/supports)**<br>The course in pdf format<br>(12 Mo)| **[<img width="50px" src="fidle/img/00-Notebooks.svg"></img><br>Notebooks](https://fidle.cnrs.fr/notebooks)**<br> Get a Zip or clone this repository <br>(40 Mo)| **[<img width="50px" src="fidle/img/00-Datasets-tar.svg"></img><br>Datasets](https://fidle.cnrs.fr/datasets-fidle.tar)**<br>All the needed datasets<br>(1.2 Go)|**[<img width="50px" src="fidle/img/00-Videos.svg"></img><br>Videos](https://fidle.cnrs.fr/youtube)**<br> Our Youtube channel <br> | Have a look about **[How to get and install](https://fidle.cnrs.fr/installation)** these notebooks and datasets. @@ -46,7 +46,7 @@ Have a look about **[How to get and install](https://fidle.cnrs.fr/installation) ## Jupyter notebooks <!-- TOC_BEGIN --> -<!-- Automatically generated on : 17/10/22 19:16:06 --> +<!-- Automatically generated on : 19/12/22 10:48:06 --> ### Linear and logistic regression - **[LINR1](LinearReg/01-Linear-Regression.ipynb)** - [Linear regression with direct resolution](LinearReg/01-Linear-Regression.ipynb) diff --git a/docker/fidle_python_pip.dockerfile b/docker/fidle_python_pip.dockerfile index 87666c87351f47f67066a25ec569d2747424f0f7..427f415cfca81d52dcb15db007b589e6941a0a8f 100644 --- a/docker/fidle_python_pip.dockerfile +++ b/docker/fidle_python_pip.dockerfile @@ -1,19 +1,22 @@ # # -ARG PYTHON_VERSION=3.8 +ARG PYTHON_VERSION=3.7 ARG docker_image_base=python:${PYTHON_VERSION}-slim FROM ${docker_image_base} LABEL maintainer=soraya.arias@inria.fr # Ensure a sane environment -ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 DEBIAN_FRONTEND=noninteractive +ENV TZ=Europe/Paris LANG=C.UTF-8 LC_ALL=C.UTF-8 DEBIAN_FRONTEND=noninteractive -RUN apt update --fix-missing && \ - apt install -y --no-install-recommends apt-utils \ - python3-venv \ - python3-pip && \ +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \ + apt update --fix-missing && \ + apt install -y --no-install-recommends apt-utils &&\ + apt install -y wget curl git \ + python3-venv python3-pip && \ apt -y dist-upgrade && \ + curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \ + apt install -y nodejs && \ apt clean && \ rm -fr /var/lib/apt/lists/* @@ -39,6 +42,8 @@ COPY notebook.json /root/.jupyter/nbconfig/notebook.json # Jupyter notebook uses 8888 EXPOSE 8888 +# Tensor board uses 6006 +EXPOSE 6006 VOLUME /notebooks WORKDIR /notebooks diff --git a/docker/jupyter_lab_config.py b/docker/jupyter_lab_config.py index dcc8405eaba2caf1a761a27daba88ce042988a32..672a6556562cee86811ab0b98e2009b76d2d17ab 100644 --- a/docker/jupyter_lab_config.py +++ b/docker/jupyter_lab_config.py @@ -902,6 +902,7 @@ c.ServerApp.quit_button = True # Default: '' c.ServerApp.root_dir = '/notebooks/fidle-master' + ## The session manager class to use. # Default: 'jupyter_server.services.sessions.sessionmanager.SessionManager' # c.ServerApp.session_manager_class = 'jupyter_server.services.sessions.sessionmanager.SessionManager' diff --git a/docker/requirements.txt b/docker/requirements.txt new file mode 100644 index 0000000000000000000000000000000000000000..0118e42cdd8a5c205bc0af1b0501861e47cc6b43 --- /dev/null +++ b/docker/requirements.txt @@ -0,0 +1,11 @@ +tensorflow_cpu +Scikit-image +Scikit-learn +Matplotlib +Pandas +Pandoc +pyyaml +torch +torchvision +torchaudio +Jupyterlab diff --git a/fidle/about.yml b/fidle/about.yml index f066d55d34d06c7ef31baa27f43679bfc179ee1d..101115aa24b2a257da817f4a3f85be552d935477 100644 --- a/fidle/about.yml +++ b/fidle/about.yml @@ -13,7 +13,7 @@ # # This file describes the notebooks used by the Fidle training. -version: 2.2.2 +version: 2.2.3 content: notebooks name: Notebooks Fidle description: All notebooks used by the Fidle training diff --git a/fidle/ci/default.yml b/fidle/ci/default.yml index a8533fd56b21d3ce031063caa74a5f48afa21b2b..9b2d3393832190bd4f71e3039d105b5469105ca3 100644 --- a/fidle/ci/default.yml +++ b/fidle/ci/default.yml @@ -1,6 +1,6 @@ campain: version: '1.0' - description: Automatically generated ci profile (17/10/22 19:16:06) + description: Automatically generated ci profile (19/12/22 10:48:06) directory: ./campains/default existing_notebook: 'remove # remove|skip' report_template: 'fidle # fidle|default'