From 251a2e24d718f3f9633d93e05f63f7fc86f5b7ad Mon Sep 17 00:00:00 2001 From: Dustin Kaiser Date: Thu, 23 Jan 2025 15:48:38 +0100 Subject: [PATCH 1/6] Remove AIRAM generic resource, bump minor version --- .osparc/jupyter-ml-pytorch/metadata.yml | 2 +- .osparc/jupyter-ml-pytorch/runtime.yml | 2 +- .osparc/jupyter-ml-tensorflow/metadata.yml | 2 +- .osparc/jupyter-ml-tensorflow/runtime.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.osparc/jupyter-ml-pytorch/metadata.yml b/.osparc/jupyter-ml-pytorch/metadata.yml index 7f9d80b..e887ced 100644 --- a/.osparc/jupyter-ml-pytorch/metadata.yml +++ b/.osparc/jupyter-ml-pytorch/metadata.yml @@ -2,7 +2,7 @@ name: Jupyter ML PyTorch thumbnail: https://imgur.com/0ndE7uX.png description: "JupyterLab with PyTorch installed. No other scientific tools are provided." key: simcore/services/dynamic/jupyter-ml-pytorch -version: 2.0.2 +version: 2.1.0 integration-version: "2.0.0" type: dynamic authors: diff --git a/.osparc/jupyter-ml-pytorch/runtime.yml b/.osparc/jupyter-ml-pytorch/runtime.yml index 7ba05ab..aca3190 100644 --- a/.osparc/jupyter-ml-pytorch/runtime.yml +++ b/.osparc/jupyter-ml-pytorch/runtime.yml @@ -17,7 +17,7 @@ settings: MemoryBytes: 536870912 GenericResources: - DiscreteResourceSpec: - Kind: AIRAM + Kind: VRAM Value: 1 paths-mapping: inputs_path: /home/jovyan/work/inputs diff --git a/.osparc/jupyter-ml-tensorflow/metadata.yml b/.osparc/jupyter-ml-tensorflow/metadata.yml index 1d33402..18b77f7 100644 --- a/.osparc/jupyter-ml-tensorflow/metadata.yml +++ b/.osparc/jupyter-ml-tensorflow/metadata.yml @@ -2,7 +2,7 @@ name: Jupyter ML Tensorflow thumbnail: https://i.imgur.com/iKoFIN0.png description: "JupyterLab with Tensorflow installed. No other scientific tools are provided." key: simcore/services/dynamic/jupyter-ml-tensorflow -version: 2.0.2 +version: 2.1.0 integration-version: "2.0.0" type: dynamic authors: diff --git a/.osparc/jupyter-ml-tensorflow/runtime.yml b/.osparc/jupyter-ml-tensorflow/runtime.yml index 7ba05ab..aca3190 100644 --- a/.osparc/jupyter-ml-tensorflow/runtime.yml +++ b/.osparc/jupyter-ml-tensorflow/runtime.yml @@ -17,7 +17,7 @@ settings: MemoryBytes: 536870912 GenericResources: - DiscreteResourceSpec: - Kind: AIRAM + Kind: VRAM Value: 1 paths-mapping: inputs_path: /home/jovyan/work/inputs From dde2315f8eb24309c24e867f4c9fe3f5ab4dcb92 Mon Sep 17 00:00:00 2001 From: Dustin Kaiser Date: Thu, 23 Jan 2025 15:49:54 +0100 Subject: [PATCH 2/6] Add Tensorflow envvar TF_FORCE_GPU_ALLOW_GROWTH --- jupyter-ml-tensorflow/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jupyter-ml-tensorflow/Dockerfile b/jupyter-ml-tensorflow/Dockerfile index 2d107a0..bfd7ca5 100644 --- a/jupyter-ml-tensorflow/Dockerfile +++ b/jupyter-ml-tensorflow/Dockerfile @@ -11,4 +11,5 @@ USER $NB_USER RUN $HOME/.pyenv/versions/lab-venv/bin/pip --no-cache install \ -r ${NOTEBOOK_BASE_DIR}/requirements.txt -USER root \ No newline at end of file +USER root +ENV TF_FORCE_GPU_ALLOW_GROWTH=true From 52d01d8bc052c03a6d2a9e72527d579433ab76ed Mon Sep 17 00:00:00 2001 From: Andrei Neagu <5694077+GitHK@users.noreply.github.com> Date: Thu, 23 Jan 2025 16:32:48 +0100 Subject: [PATCH 3/6] trigger CI --- jupyter-ml-tensorflow/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyter-ml-tensorflow/Dockerfile b/jupyter-ml-tensorflow/Dockerfile index bfd7ca5..7cbfda5 100644 --- a/jupyter-ml-tensorflow/Dockerfile +++ b/jupyter-ml-tensorflow/Dockerfile @@ -12,4 +12,4 @@ RUN $HOME/.pyenv/versions/lab-venv/bin/pip --no-cache install \ -r ${NOTEBOOK_BASE_DIR}/requirements.txt USER root -ENV TF_FORCE_GPU_ALLOW_GROWTH=true +ENV TF_FORCE_GPU_ALLOW_GROWTH=true \ No newline at end of file From a4e87289e681bbf1318f5d8ef698b2c095c20b9c Mon Sep 17 00:00:00 2001 From: Andrei Neagu <5694077+GitHK@users.noreply.github.com> Date: Thu, 23 Jan 2025 16:34:56 +0100 Subject: [PATCH 4/6] revert --- jupyter-ml-tensorflow/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyter-ml-tensorflow/Dockerfile b/jupyter-ml-tensorflow/Dockerfile index 7cbfda5..bfd7ca5 100644 --- a/jupyter-ml-tensorflow/Dockerfile +++ b/jupyter-ml-tensorflow/Dockerfile @@ -12,4 +12,4 @@ RUN $HOME/.pyenv/versions/lab-venv/bin/pip --no-cache install \ -r ${NOTEBOOK_BASE_DIR}/requirements.txt USER root -ENV TF_FORCE_GPU_ALLOW_GROWTH=true \ No newline at end of file +ENV TF_FORCE_GPU_ALLOW_GROWTH=true From 106d3728680ba8af7612c28cc5e6e00c556caf41 Mon Sep 17 00:00:00 2001 From: Andrei Neagu <5694077+GitHK@users.noreply.github.com> Date: Fri, 24 Jan 2025 14:47:50 +0100 Subject: [PATCH 5/6] retrigger CI --- jupyter-ml-tensorflow/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/jupyter-ml-tensorflow/Dockerfile b/jupyter-ml-tensorflow/Dockerfile index bfd7ca5..70b862d 100644 --- a/jupyter-ml-tensorflow/Dockerfile +++ b/jupyter-ml-tensorflow/Dockerfile @@ -13,3 +13,4 @@ RUN $HOME/.pyenv/versions/lab-venv/bin/pip --no-cache install \ USER root ENV TF_FORCE_GPU_ALLOW_GROWTH=true + From 81f7ea115bd3491927174006bca495958204a5af Mon Sep 17 00:00:00 2001 From: Andrei Neagu <5694077+GitHK@users.noreply.github.com> Date: Fri, 24 Jan 2025 14:52:38 +0100 Subject: [PATCH 6/6] hopefully triggers build form fork --- .github/workflows/check-image.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-image.yml b/.github/workflows/check-image.yml index 152a7df..6eccce9 100644 --- a/.github/workflows/check-image.yml +++ b/.github/workflows/check-image.yml @@ -1,6 +1,17 @@ name: Build and check image -on: push +on: + # Run the workflow for pushes to the main branch + push: + branches: + - main + + # Run the workflow for pull requests (from forks or within the repo) + pull_request: + types: + - opened + - synchronize + - reopened jobs: verify-image-build: