Skip to content

{ai}[GCCcore/13.3.0] ollama v0.5.12, Go v1.23.6 w/ CUDA 12.6.0#22424

Merged
smoors merged 1 commit intoeasybuilders:developfrom
lexming:20250228154955_new_pr_ollama0512
Mar 3, 2025
Merged

{ai}[GCCcore/13.3.0] ollama v0.5.12, Go v1.23.6 w/ CUDA 12.6.0#22424
smoors merged 1 commit intoeasybuilders:developfrom
lexming:20250228154955_new_pr_ollama0512

Conversation

@lexming
Copy link
Copy Markdown
Contributor

@lexming lexming commented Feb 28, 2025

(created using eb --new-pr)

@github-actions
Copy link
Copy Markdown

Updated software Go-1.23.6.eb

Diff against Go-1.22.1.eb

easybuild/easyconfigs/g/Go/Go-1.22.1.eb

diff --git a/easybuild/easyconfigs/g/Go/Go-1.22.1.eb b/easybuild/easyconfigs/g/Go/Go-1.23.6.eb
index 0432c4bc21..ed7efbddf5 100644
--- a/easybuild/easyconfigs/g/Go/Go-1.22.1.eb
+++ b/easybuild/easyconfigs/g/Go/Go-1.23.6.eb
@@ -1,7 +1,7 @@
 easyblock = 'Tarball'
 
 name = 'Go'
-version = '1.22.1'
+version = '1.23.6'
 
 homepage = 'https://www.golang.org'
 description = """Go is an open source programming language that makes it easy to build
@@ -13,8 +13,8 @@ source_urls = ['https://storage.googleapis.com/golang/']
 local_archs = {'aarch64': 'arm64', 'x86_64': 'amd64'}
 sources = ['go%%(version)s.linux-%s.tar.gz' % local_archs[ARCH]]
 checksums = [{
-    'go%(version)s.linux-amd64.tar.gz': 'aab8e15785c997ae20f9c88422ee35d962c4562212bb0f879d052a35c8307c7f',
-    'go%(version)s.linux-arm64.tar.gz': 'e56685a245b6a0c592fc4a55f0b7803af5b3f827aaa29feab1f40e491acf35b8',
+    'go%(version)s.linux-amd64.tar.gz': '9379441ea310de000f33a4dc767bd966e72ab2826270e038e78b2c53c2e7802d',
+    'go%(version)s.linux-arm64.tar.gz': '561c780e8f4a8955d32bf72e46af0b5ee5e0debe1e4633df9a03781878219202',
 }]
 
 sanity_check_paths = {
Diff against Go-1.21.6.eb

easybuild/easyconfigs/g/Go/Go-1.21.6.eb

diff --git a/easybuild/easyconfigs/g/Go/Go-1.21.6.eb b/easybuild/easyconfigs/g/Go/Go-1.23.6.eb
index 7db3587245..ed7efbddf5 100644
--- a/easybuild/easyconfigs/g/Go/Go-1.21.6.eb
+++ b/easybuild/easyconfigs/g/Go/Go-1.23.6.eb
@@ -1,7 +1,7 @@
 easyblock = 'Tarball'
 
 name = 'Go'
-version = '1.21.6'
+version = '1.23.6'
 
 homepage = 'https://www.golang.org'
 description = """Go is an open source programming language that makes it easy to build
@@ -13,8 +13,8 @@ source_urls = ['https://storage.googleapis.com/golang/']
 local_archs = {'aarch64': 'arm64', 'x86_64': 'amd64'}
 sources = ['go%%(version)s.linux-%s.tar.gz' % local_archs[ARCH]]
 checksums = [{
-    'go%(version)s.linux-amd64.tar.gz': '3f934f40ac360b9c01f616a9aa1796d227d8b0328bf64cb045c7b8c4ee9caea4',
-    'go%(version)s.linux-arm64.tar.gz': 'e2e8aa88e1b5170a0d495d7d9c766af2b2b6c6925a8f8956d834ad6b4cacbd9a',
+    'go%(version)s.linux-amd64.tar.gz': '9379441ea310de000f33a4dc767bd966e72ab2826270e038e78b2c53c2e7802d',
+    'go%(version)s.linux-arm64.tar.gz': '561c780e8f4a8955d32bf72e46af0b5ee5e0debe1e4633df9a03781878219202',
 }]
 
 sanity_check_paths = {
Diff against Go-1.21.2.eb

easybuild/easyconfigs/g/Go/Go-1.21.2.eb

diff --git a/easybuild/easyconfigs/g/Go/Go-1.21.2.eb b/easybuild/easyconfigs/g/Go/Go-1.23.6.eb
index f7d4022973..ed7efbddf5 100644
--- a/easybuild/easyconfigs/g/Go/Go-1.21.2.eb
+++ b/easybuild/easyconfigs/g/Go/Go-1.23.6.eb
@@ -1,7 +1,7 @@
 easyblock = 'Tarball'
 
 name = 'Go'
-version = '1.21.2'
+version = '1.23.6'
 
 homepage = 'https://www.golang.org'
 description = """Go is an open source programming language that makes it easy to build
@@ -13,8 +13,8 @@ source_urls = ['https://storage.googleapis.com/golang/']
 local_archs = {'aarch64': 'arm64', 'x86_64': 'amd64'}
 sources = ['go%%(version)s.linux-%s.tar.gz' % local_archs[ARCH]]
 checksums = [{
-    'go%(version)s.linux-amd64.tar.gz': 'f5414a770e5e11c6e9674d4cd4dd1f4f630e176d1828d3427ea8ca4211eee90d',
-    'go%(version)s.linux-arm64.tar.gz': '23e208ca44a3cb46cd4308e48a27c714ddde9c8c34f2e4211dbca95b6d456554',
+    'go%(version)s.linux-amd64.tar.gz': '9379441ea310de000f33a4dc767bd966e72ab2826270e038e78b2c53c2e7802d',
+    'go%(version)s.linux-arm64.tar.gz': '561c780e8f4a8955d32bf72e46af0b5ee5e0debe1e4633df9a03781878219202',
 }]
 
 sanity_check_paths = {

Updated software ollama-0.5.12-GCCcore-13.3.0-CUDA-12.6.0.eb

Diff against ollama-0.5.12-GCCcore-13.3.0.eb

easybuild/easyconfigs/o/ollama/ollama-0.5.12-GCCcore-13.3.0.eb

diff --git a/easybuild/easyconfigs/o/ollama/ollama-0.5.12-GCCcore-13.3.0.eb b/easybuild/easyconfigs/o/ollama/ollama-0.5.12-GCCcore-13.3.0-CUDA-12.6.0.eb
index d1eec49d89..8d1d702d6b 100644
--- a/easybuild/easyconfigs/o/ollama/ollama-0.5.12-GCCcore-13.3.0.eb
+++ b/easybuild/easyconfigs/o/ollama/ollama-0.5.12-GCCcore-13.3.0-CUDA-12.6.0.eb
@@ -2,6 +2,7 @@ easyblock = 'Bundle'
 
 name = 'ollama'
 version = '0.5.12'
+versionsuffix = '-CUDA-%(cudaver)s'
 
 homepage = 'https://ollama.com/'
 description = "Get up and running with large language models."
@@ -14,6 +15,13 @@ builddependencies = [
     ('CMake', '3.29.3'),
 ]
 
+dependencies = [
+    ('CUDA', '12.6.0', '', SYSTEM),
+]
+
+# default CUDA compute capabilities to use (override via --cuda-compute-capabilities)
+cuda_compute_capabilities = ['6.0', '7.0', '7.5', '8.0', '8.6', '9.0']
+
 default_component_specs = {
     'source_urls': ['https://github.com/ollama/ollama/archive'],
     'sources': ['v%(version)s.tar.gz'],
@@ -21,9 +29,10 @@ default_component_specs = {
     'start_dir': 'ollama-%(version)s',
 }
 components = [
-    ('ggml-cpu', version, {
+    ('ggml-cpu-cuda', version, {
+        # CPU and CUDA12 presets
         'easyblock': 'CMakeMake',
-        'buildopts': '%(name)s',
+        'buildopts': 'ggml-cpu ggml-cuda',
     }),
     ('ollama', version, {
         'easyblock': 'GoPackage',
@@ -31,8 +40,8 @@ components = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/ollama', f'lib/ollama/libggml-base.{SHLIB_EXT}'],
-    'dirs': ['lib/ollama'],
+    'files': ['bin/ollama', f'lib/ollama/libggml-base.{SHLIB_EXT}', f'lib/ollama/cuda_v12/libggml-cuda.{SHLIB_EXT}'],
+    'dirs': ['lib/ollama', 'lib/ollama/cuda_v12'],
 }
 
 sanity_check_commands = [
@@ -40,7 +49,7 @@ sanity_check_commands = [
 ]
 
 modextrapaths = {
-    'LD_LIBRARY_PATH': 'lib/ollama',
+    'LD_LIBRARY_PATH': ['lib/ollama', 'lib/ollama/cuda_v12'],
 }
 
 moduleclass = 'ai'

Updated software ollama-0.5.12-GCCcore-13.3.0.eb

Diff against ollama-0.5.12-GCCcore-13.3.0-CUDA-12.6.0.eb

easybuild/easyconfigs/o/ollama/ollama-0.5.12-GCCcore-13.3.0-CUDA-12.6.0.eb

diff --git a/easybuild/easyconfigs/o/ollama/ollama-0.5.12-GCCcore-13.3.0-CUDA-12.6.0.eb b/easybuild/easyconfigs/o/ollama/ollama-0.5.12-GCCcore-13.3.0.eb
index 8d1d702d6b..d1eec49d89 100644
--- a/easybuild/easyconfigs/o/ollama/ollama-0.5.12-GCCcore-13.3.0-CUDA-12.6.0.eb
+++ b/easybuild/easyconfigs/o/ollama/ollama-0.5.12-GCCcore-13.3.0.eb
@@ -2,7 +2,6 @@ easyblock = 'Bundle'
 
 name = 'ollama'
 version = '0.5.12'
-versionsuffix = '-CUDA-%(cudaver)s'
 
 homepage = 'https://ollama.com/'
 description = "Get up and running with large language models."
@@ -15,13 +14,6 @@ builddependencies = [
     ('CMake', '3.29.3'),
 ]
 
-dependencies = [
-    ('CUDA', '12.6.0', '', SYSTEM),
-]
-
-# default CUDA compute capabilities to use (override via --cuda-compute-capabilities)
-cuda_compute_capabilities = ['6.0', '7.0', '7.5', '8.0', '8.6', '9.0']
-
 default_component_specs = {
     'source_urls': ['https://github.com/ollama/ollama/archive'],
     'sources': ['v%(version)s.tar.gz'],
@@ -29,10 +21,9 @@ default_component_specs = {
     'start_dir': 'ollama-%(version)s',
 }
 components = [
-    ('ggml-cpu-cuda', version, {
-        # CPU and CUDA12 presets
+    ('ggml-cpu', version, {
         'easyblock': 'CMakeMake',
-        'buildopts': 'ggml-cpu ggml-cuda',
+        'buildopts': '%(name)s',
     }),
     ('ollama', version, {
         'easyblock': 'GoPackage',
@@ -40,8 +31,8 @@ components = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/ollama', f'lib/ollama/libggml-base.{SHLIB_EXT}', f'lib/ollama/cuda_v12/libggml-cuda.{SHLIB_EXT}'],
-    'dirs': ['lib/ollama', 'lib/ollama/cuda_v12'],
+    'files': ['bin/ollama', f'lib/ollama/libggml-base.{SHLIB_EXT}'],
+    'dirs': ['lib/ollama'],
 }
 
 sanity_check_commands = [
@@ -49,7 +40,7 @@ sanity_check_commands = [
 ]
 
 modextrapaths = {
-    'LD_LIBRARY_PATH': ['lib/ollama', 'lib/ollama/cuda_v12'],
+    'LD_LIBRARY_PATH': 'lib/ollama',
 }
 
 moduleclass = 'ai'

@lexming
Copy link
Copy Markdown
Contributor Author

lexming commented Mar 3, 2025

@boegelbot please test @ jsc-zen3

@boegelbot
Copy link
Copy Markdown
Collaborator

@lexming: 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=22424 EB_ARGS= EB_CONTAINER= EB_REPO=easybuild-easyconfigs EB_BRANCH=develop /opt/software/slurm/bin/sbatch --job-name test_PR_22424 --ntasks=8 ~/boegelbot/eb_from_pr_upload_jsc-zen3.sh' executed!

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

Test results coming soon (I hope)...

Details

- notification for comment with ID 2694520113 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
Copy Markdown
Collaborator

Test report by @boegelbot
SUCCESS
Build succeeded for 3 out of 3 (3 easyconfigs in total)
jsczen3c2.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/31d0481f92baaa9ff151790ab850cc55 for a full test report.

@smoors smoors added this to the release after 4.9.4 milestone Mar 3, 2025
Copy link
Copy Markdown
Contributor

@smoors smoors left a comment

Choose a reason for hiding this comment

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

lgtm

@smoors
Copy link
Copy Markdown
Contributor

smoors commented Mar 3, 2025

Going in, thanks @lexming!

@smoors smoors merged commit 746163b into easybuilders:develop Mar 3, 2025
@lexming lexming deleted the 20250228154955_new_pr_ollama0512 branch March 3, 2025 17:59
@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