Skip to content

{data}[foss/2023a] scikit-learn v0.20.4 w/ Python 2.7.18#22405

Merged
verdurin merged 1 commit intoeasybuilders:developfrom
PetrKralCZ:20250226155913_new_pr_scikit-learn0204
Feb 27, 2025
Merged

{data}[foss/2023a] scikit-learn v0.20.4 w/ Python 2.7.18#22405
verdurin merged 1 commit intoeasybuilders:developfrom
PetrKralCZ:20250226155913_new_pr_scikit-learn0204

Conversation

@PetrKralCZ
Copy link
Collaborator

No description provided.

@github-actions
Copy link

Updated software scikit-learn-0.20.4-foss-2023a-Python-2.7.18.eb

Diff against scikit-learn-1.5.2-gfbf-2024a.eb

easybuild/easyconfigs/s/scikit-learn/scikit-learn-1.5.2-gfbf-2024a.eb

diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-1.5.2-gfbf-2024a.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.20.4-foss-2023a-Python-2.7.18.eb
index be9c3fd844..ddcbb85406 100644
--- a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-1.5.2-gfbf-2024a.eb
+++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.20.4-foss-2023a-Python-2.7.18.eb
@@ -1,7 +1,8 @@
 easyblock = 'PythonBundle'
 
 name = 'scikit-learn'
-version = '1.5.2'
+version = '0.20.4'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'https://scikit-learn.org/stable/index.html'
 description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world,
@@ -9,17 +10,12 @@ building upon numpy, scipy, and matplotlib. As a machine-learning module,
 it provides versatile tools for data mining and analysis in any field of science and engineering.
 It strives to be simple and efficient, accessible to everybody, and reusable in various contexts."""
 
-toolchain = {'name': 'gfbf', 'version': '2024a'}
-
-builddependencies = [
-    ('Cython', '3.0.10'),
-    ('meson-python', '0.16.0'),
-]
+toolchain = {'name': 'foss', 'version': '2023a'}
 
 dependencies = [
-    ('Python', '3.12.3'),
-    ('Python-bundle-PyPI', '2024.06'),
-    ('SciPy-bundle', '2024.05'),
+    ('Python', '2.7.18'),
+    ('numpy', '1.16.6', versionsuffix),
+    ('SciPy-bundle', '2024.06', versionsuffix),
 ]
 
 use_pip = True
@@ -27,9 +23,13 @@ sanity_pip_check = True
 
 exts_list = [
     (name, version, {
+        'patches': ['scikit-learn-0.20.3_fix-cd_fast.patch'],
+        'checksums': [
+            {'scikit-learn-0.20.4.tar.gz': 'dfa8a3f33907614030cdfbc8b6f553dacbecaf09f922244f128af3060a137cfc'},
+            {'scikit-learn-0.20.3_fix-cd_fast.patch':
+             '9a98785a99bde000a58048ccbe382ea362aa8cf644171097e8ae755cddddeb75'},
+        ],
         'modulename': 'sklearn',
-        'sources': ['scikit_learn-%(version)s.tar.gz'],
-        'checksums': ['b4237ed7b3fdd0a4882792e68ef2545d5baa50aca3bb45aa7df468138ad8f94d'],
     }),
     ('sklearn', '0.0', {
         'checksums': ['e23001573aa194b834122d2b9562459bf5ae494a2d59ca6b8aa22c85a44c0e31'],
Diff against scikit-learn-1.4.2-gfbf-2023a.eb

easybuild/easyconfigs/s/scikit-learn/scikit-learn-1.4.2-gfbf-2023a.eb

diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-1.4.2-gfbf-2023a.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.20.4-foss-2023a-Python-2.7.18.eb
index c94ab50744..ddcbb85406 100644
--- a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-1.4.2-gfbf-2023a.eb
+++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.20.4-foss-2023a-Python-2.7.18.eb
@@ -1,7 +1,8 @@
 easyblock = 'PythonBundle'
 
 name = 'scikit-learn'
-version = '1.4.2'
+version = '0.20.4'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'https://scikit-learn.org/stable/index.html'
 description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world,
@@ -9,15 +10,12 @@ building upon numpy, scipy, and matplotlib. As a machine-learning module,
 it provides versatile tools for data mining and analysis in any field of science and engineering.
 It strives to be simple and efficient, accessible to everybody, and reusable in various contexts."""
 
-toolchain = {'name': 'gfbf', 'version': '2023a'}
+toolchain = {'name': 'foss', 'version': '2023a'}
 
 dependencies = [
-    ('Python', '3.11.3'),
-    ('Python-bundle-PyPI', '2023.06'),
-    # Build requires "Cython>=3.0.8"
-    # Cython included with Python-bundle-PyPI (0.29.35) is too old
-    ('Cython', '3.0.8'),
-    ('SciPy-bundle', '2023.07'),
+    ('Python', '2.7.18'),
+    ('numpy', '1.16.6', versionsuffix),
+    ('SciPy-bundle', '2024.06', versionsuffix),
 ]
 
 use_pip = True
@@ -25,8 +23,13 @@ sanity_pip_check = True
 
 exts_list = [
     (name, version, {
+        'patches': ['scikit-learn-0.20.3_fix-cd_fast.patch'],
+        'checksums': [
+            {'scikit-learn-0.20.4.tar.gz': 'dfa8a3f33907614030cdfbc8b6f553dacbecaf09f922244f128af3060a137cfc'},
+            {'scikit-learn-0.20.3_fix-cd_fast.patch':
+             '9a98785a99bde000a58048ccbe382ea362aa8cf644171097e8ae755cddddeb75'},
+        ],
         'modulename': 'sklearn',
-        'checksums': ['daa1c471d95bad080c6e44b4946c9390a4842adc3082572c20e4f8884e39e959'],
     }),
     ('sklearn', '0.0', {
         'checksums': ['e23001573aa194b834122d2b9562459bf5ae494a2d59ca6b8aa22c85a44c0e31'],
Diff against scikit-learn-1.4.0-gfbf-2023b.eb

easybuild/easyconfigs/s/scikit-learn/scikit-learn-1.4.0-gfbf-2023b.eb

diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-1.4.0-gfbf-2023b.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.20.4-foss-2023a-Python-2.7.18.eb
index 75efad093b..ddcbb85406 100644
--- a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-1.4.0-gfbf-2023b.eb
+++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.20.4-foss-2023a-Python-2.7.18.eb
@@ -1,7 +1,8 @@
 easyblock = 'PythonBundle'
 
 name = 'scikit-learn'
-version = '1.4.0'
+version = '0.20.4'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'https://scikit-learn.org/stable/index.html'
 description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world,
@@ -9,26 +10,30 @@ building upon numpy, scipy, and matplotlib. As a machine-learning module,
 it provides versatile tools for data mining and analysis in any field of science and engineering.
 It strives to be simple and efficient, accessible to everybody, and reusable in various contexts."""
 
-toolchain = {'name': 'gfbf', 'version': '2023b'}
+toolchain = {'name': 'foss', 'version': '2023a'}
 
 dependencies = [
-    ('Python', '3.11.5'),
-    ('Python-bundle-PyPI', '2023.10'),
-    ('SciPy-bundle', '2023.11'),
+    ('Python', '2.7.18'),
+    ('numpy', '1.16.6', versionsuffix),
+    ('SciPy-bundle', '2024.06', versionsuffix),
 ]
 
 use_pip = True
+sanity_pip_check = True
 
 exts_list = [
     (name, version, {
+        'patches': ['scikit-learn-0.20.3_fix-cd_fast.patch'],
+        'checksums': [
+            {'scikit-learn-0.20.4.tar.gz': 'dfa8a3f33907614030cdfbc8b6f553dacbecaf09f922244f128af3060a137cfc'},
+            {'scikit-learn-0.20.3_fix-cd_fast.patch':
+             '9a98785a99bde000a58048ccbe382ea362aa8cf644171097e8ae755cddddeb75'},
+        ],
         'modulename': 'sklearn',
-        'checksums': ['d4373c984eba20e393216edd51a3e3eede56cbe93d4247516d205643c3b93121'],
     }),
     ('sklearn', '0.0', {
         'checksums': ['e23001573aa194b834122d2b9562459bf5ae494a2d59ca6b8aa22c85a44c0e31'],
     }),
 ]
 
-sanity_pip_check = True
-
 moduleclass = 'data'

@PetrKralCZ
Copy link
Collaborator Author

@boegelbot please test @ jsc-zen3

@boegelbot
Copy link
Collaborator

@PetrKralCZ: Request for testing this PR well received on jsczen3l1.int.jsc-zen3.fz-juelich.de

PR test command 'if [[ develop != 'develop' ]]; then EB_BRANCH=develop ./easybuild_develop.sh 2> /dev/null 1>&2; EB_PREFIX=/home/boegelbot/easybuild/develop source init_env_easybuild_develop.sh; fi; EB_PR=22405 EB_ARGS= EB_CONTAINER= EB_REPO=easybuild-easyconfigs EB_BRANCH=develop /opt/software/slurm/bin/sbatch --job-name test_PR_22405 --ntasks=8 ~/boegelbot/eb_from_pr_upload_jsc-zen3.sh' executed!

  • exit code: 0
  • output:
Submitted batch job 5809

Test results coming soon (I hope)...

Details

- notification for comment with ID 2687241333 processed

Message to humans: this is just bookkeeping information for me,
it is of no use to you (unless you think I have a bug, which I don't).

@boegelbot
Copy link
Collaborator

Test report by @boegelbot
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in total)
jsczen3c1.int.jsc-zen3.fz-juelich.de - Linux Rocky Linux 9.5, x86_64, AMD EPYC-Milan Processor (zen3), Python 3.9.21
See https://gist.github.com/boegelbot/b1f493e2a0c1d5b8db2de1e3e9b1bf07 for a full test report.

@verdurin
Copy link
Member

Test report by @verdurin
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in total)
easybuild-el8.cloud.in.bmrc.ox.ac.uk - Linux Rocky Linux 8.10, x86_64, Intel Xeon Processor (Skylake, IBRS), Python 3.6.8
See https://gist.github.com/verdurin/ad80cd9b7528583d488933cbbdf82b4d for a full test report.

Copy link
Member

@verdurin verdurin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine.

@verdurin verdurin added this to the release after 4.9.4 milestone Feb 27, 2025
@verdurin
Copy link
Member

Going in, thanks @PetrKralCZ!

@verdurin verdurin merged commit 6fddd9c into easybuilders:develop Feb 27, 2025
10 checks passed
@boegel boegel modified the milestones: release after 4.9.4, 5.0.0 Mar 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants