From 46b7c5646ffb5ca9a61494cf1512754879aa34ba Mon Sep 17 00:00:00 2001 From: JesusPoderoso Date: Tue, 21 May 2024 10:20:56 +0200 Subject: [PATCH 1/7] Refs #21066: Re-order module requirements alphabetically Signed-off-by: JesusPoderoso --- sustainml_modules/sustainml_modules/sustainml-wp3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sustainml_modules/sustainml_modules/sustainml-wp3 b/sustainml_modules/sustainml_modules/sustainml-wp3 index 8f60542..a8c09e6 160000 --- a/sustainml_modules/sustainml_modules/sustainml-wp3 +++ b/sustainml_modules/sustainml_modules/sustainml-wp3 @@ -1 +1 @@ -Subproject commit 8f605427cfe1af0215ac6f0029d5f199274f3bc8 +Subproject commit a8c09e6e811e29bc0a3997c85e626da888151b9d From f2793baec42ac4e2818c34ae29b4d58ff99fea1b Mon Sep 17 00:00:00 2001 From: JesusPoderoso Date: Tue, 21 May 2024 10:21:21 +0200 Subject: [PATCH 2/7] Refs #21066: Add carbon tracker dependency Signed-off-by: JesusPoderoso --- sustainml_modules/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/sustainml_modules/requirements.txt b/sustainml_modules/requirements.txt index 1e425ba..783d416 100644 --- a/sustainml_modules/requirements.txt +++ b/sustainml_modules/requirements.txt @@ -1,3 +1,4 @@ +carbontracker flask flask-socketio==5.2.0 kaggle From 6aa54658c1c05b19532bbc3007c90a3b4366db55 Mon Sep 17 00:00:00 2001 From: JesusPoderoso Date: Mon, 5 Aug 2024 14:41:15 +0200 Subject: [PATCH 3/7] Refs #21066: Add `onnxruntime` as module requirement Signed-off-by: JesusPoderoso From d4a83d775d0db3656f27a1d08cae9133dee92530 Mon Sep 17 00:00:00 2001 From: eProsima Date: Tue, 5 Nov 2024 08:22:06 +0100 Subject: [PATCH 4/7] Revert "Refs #21066: Re-order module requirements alphabetically" This reverts commit eaf414c26d55a5c36ee5a5f13d74040f29d245c2. --- sustainml_modules/sustainml_modules/sustainml-wp3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sustainml_modules/sustainml_modules/sustainml-wp3 b/sustainml_modules/sustainml_modules/sustainml-wp3 index a8c09e6..8f60542 160000 --- a/sustainml_modules/sustainml_modules/sustainml-wp3 +++ b/sustainml_modules/sustainml_modules/sustainml-wp3 @@ -1 +1 @@ -Subproject commit a8c09e6e811e29bc0a3997c85e626da888151b9d +Subproject commit 8f605427cfe1af0215ac6f0029d5f199274f3bc8 From 08b19d381ecd6645fd2771c399c008680487407f Mon Sep 17 00:00:00 2001 From: eProsima Date: Tue, 5 Nov 2024 08:23:03 +0100 Subject: [PATCH 5/7] Refs #21066: Update WP3 submodule Signed-off-by: eProsima --- sustainml_modules/sustainml_modules/sustainml-wp3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sustainml_modules/sustainml_modules/sustainml-wp3 b/sustainml_modules/sustainml_modules/sustainml-wp3 index 8f60542..a1fffdb 160000 --- a/sustainml_modules/sustainml_modules/sustainml-wp3 +++ b/sustainml_modules/sustainml_modules/sustainml-wp3 @@ -1 +1 @@ -Subproject commit 8f605427cfe1af0215ac6f0029d5f199274f3bc8 +Subproject commit a1fffdb40a12b548b9e3748ddf93a49d0e300840 From 3ef50477e2fe7d5e35f8b3aa6dcc74bffbf1c56f Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Tue, 19 Nov 2024 10:35:59 +0100 Subject: [PATCH 6/7] Temporal fix ollama installation Signed-off-by: Mario Dominguez --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dad0fe6..99c5c28 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -75,7 +75,7 @@ jobs: upgrade: false - name: Install ollama - run: curl -fsSL https://ollama.com/install.sh | sh + run: curl -fsSL https://ollama.com/install.sh | TERM=xterm sh - name: Fetch SustainML repositories uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0 @@ -140,7 +140,7 @@ jobs: upgrade: false - name: Install ollama - run: curl -fsSL https://ollama.com/install.sh | sh + run: curl -fsSL https://ollama.com/install.sh | TERM=xterm sh - name: Fetch SustainML repositories uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0 From 01d01c1c7628e9223305edbaae4c6ad5dbe35c45 Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Tue, 19 Nov 2024 11:10:23 +0100 Subject: [PATCH 7/7] Update wp3 Signed-off-by: Mario Dominguez --- sustainml_modules/sustainml_modules/sustainml-wp3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sustainml_modules/sustainml_modules/sustainml-wp3 b/sustainml_modules/sustainml_modules/sustainml-wp3 index a1fffdb..c5247a9 160000 --- a/sustainml_modules/sustainml_modules/sustainml-wp3 +++ b/sustainml_modules/sustainml_modules/sustainml-wp3 @@ -1 +1 @@ -Subproject commit a1fffdb40a12b548b9e3748ddf93a49d0e300840 +Subproject commit c5247a980296b0e66c4438987134561c5740f73f