From f3cd59cebb17e724152b6f818deaa03016935b78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 23 Jan 2025 10:00:33 +0100 Subject: [PATCH 1/4] add bunch of dependencies for PyTorch 2.1.2 --- .../sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/easystacks/software.eessi.io/2023.06/sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml b/easystacks/software.eessi.io/2023.06/sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml index 7661bf3166..c995222178 100644 --- a/easystacks/software.eessi.io/2023.06/sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml @@ -17,3 +17,11 @@ easyconfigs: - Rivet-3.1.9-gompi-2023a-HepMC3-3.2.6.eb: options: from-pr: 19679 + - Pillow-10.0.0-GCCcore-12.3.0.eb + - sympy-1.12-gfbf-2023a.eb + - networkx-3.1-gfbf-2023a.eb + - expecttest-0.1.5-GCCcore-12.3.0.eb + - PyYAML-6.0-GCCcore-12.3.0.eb + - pytest-flakefinder-1.1.0-GCCcore-12.3.0.eb + - pytest-rerunfailures-12.0-GCCcore-12.3.0.eb + - pytest-shard-0.1.2-GCCcore-12.3.0.eb From 2ab2b6f60fb2278adb9918138343ffca4647df8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 23 Jan 2025 11:08:42 +0100 Subject: [PATCH 2/4] use pytest-* easyconfigs from PR 20164 --- .../eessi-2023.06-eb-4.9.0-2023a.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml b/easystacks/software.eessi.io/2023.06/sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml index c995222178..79b371f229 100644 --- a/easystacks/software.eessi.io/2023.06/sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml @@ -22,6 +22,15 @@ easyconfigs: - networkx-3.1-gfbf-2023a.eb - expecttest-0.1.5-GCCcore-12.3.0.eb - PyYAML-6.0-GCCcore-12.3.0.eb - - pytest-flakefinder-1.1.0-GCCcore-12.3.0.eb - - pytest-rerunfailures-12.0-GCCcore-12.3.0.eb - - pytest-shard-0.1.2-GCCcore-12.3.0.eb + - pytest-flakefinder-1.1.0-GCCcore-12.3.0.eb: + options: + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20164 + from-pr: 20164 + - pytest-rerunfailures-12.0-GCCcore-12.3.0.eb: + options: + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20164 + from-pr: 20164 + - pytest-shard-0.1.2-GCCcore-12.3.0.eb: + options: + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20164 + from-pr: 20164 From 522b2cad7a3e7220307a3c50e062dd99ef083d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 23 Jan 2025 11:11:07 +0100 Subject: [PATCH 3/4] actually, use the PyTorch PR itself for its dependencies --- .../sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml b/easystacks/software.eessi.io/2023.06/sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml index 79b371f229..9717a1a039 100644 --- a/easystacks/software.eessi.io/2023.06/sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml @@ -24,13 +24,13 @@ easyconfigs: - PyYAML-6.0-GCCcore-12.3.0.eb - pytest-flakefinder-1.1.0-GCCcore-12.3.0.eb: options: - # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20164 - from-pr: 20164 + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/19573 + from-pr: 19573 - pytest-rerunfailures-12.0-GCCcore-12.3.0.eb: options: - # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20164 - from-pr: 20164 + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/19573 + from-pr: 19573 - pytest-shard-0.1.2-GCCcore-12.3.0.eb: options: - # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20164 - from-pr: 20164 + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/19573 + from-pr: 19573 From 5e06dffc08d7da047451c2b7de67f20c7994c4a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 23 Jan 2025 13:45:55 +0100 Subject: [PATCH 4/4] using the PyTorch PR for deps doesn't work, stick to the original PR --- .../eessi-2023.06-eb-4.9.0-2023a.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml b/easystacks/software.eessi.io/2023.06/sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml index 9717a1a039..bd2d75744f 100644 --- a/easystacks/software.eessi.io/2023.06/sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/sapphire_rapids/eessi-2023.06-eb-4.9.0-2023a.yml @@ -24,13 +24,10 @@ easyconfigs: - PyYAML-6.0-GCCcore-12.3.0.eb - pytest-flakefinder-1.1.0-GCCcore-12.3.0.eb: options: - # see https://github.com/easybuilders/easybuild-easyconfigs/pull/19573 - from-pr: 19573 - - pytest-rerunfailures-12.0-GCCcore-12.3.0.eb: - options: - # see https://github.com/easybuilders/easybuild-easyconfigs/pull/19573 - from-pr: 19573 + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/19480 + from-pr: 19480 + - pytest-rerunfailures-12.0-GCCcore-12.3.0.eb - pytest-shard-0.1.2-GCCcore-12.3.0.eb: options: - # see https://github.com/easybuilders/easybuild-easyconfigs/pull/19573 - from-pr: 19573 + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/19480 + from-pr: 19480