From 0c520cb03444941365648486fa76a64ddc7a52fc Mon Sep 17 00:00:00 2001 From: Carlos Castillo Passi Date: Thu, 20 Jun 2024 16:44:18 -0400 Subject: [PATCH 01/16] Update README.md to include GPU backend compat --- README.md | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 2f681d5bc..e97b89d34 100644 --- a/README.md +++ b/README.md @@ -137,25 +137,32 @@ If you use this package, please cite our paper. ## Tested compatibility -We automatically test KomaMRICore's CPU multi-threading support on the most popular operating systems. Nevertheless, for GPU support, the process is more manual (until [#147](https://github.com/JuliaHealth/KomaMRI.jl/issues/147)). Here is a summary of our automatic CPU tests and local GPU tests for multiple versions of Julia: +All parallel backends are tested on Linux using the latest stable release of Julia (besides Apple silicon).
-| Julia (OS) | CPU | GPU (Nvidia) | -|:---------------------|:----------------------------------------------------------:|:------------:| -| Julia 1.9 (Windows) | [![][gh-actions-komamri]][gh-actions-url] | ✅ | -| Julia 1.9 (Linux) | [![][gh-actions-komamri]][gh-actions-url] | ✅ | -| Julia 1.9 (Mac) | [![][gh-actions-komamri]][gh-actions-url] | ➖ | -| Julia 1.10 (Windows) | [![][gh-actions-komamri]][gh-actions-url] | ✅ | -| Julia 1.10 (Linux) | [![][gh-actions-komamri]][gh-actions-url] | ✅ | -| Julia 1.10 (Mac) | [![][gh-actions-komamri]][gh-actions-url] | ➖ | -| Julia 1.11 (Windows) | [![][gh-actions-komamri-nightly]][gh-actions-nightly-url] | ❌ | -| Julia 1.11 (Linux) | [![][gh-actions-komamri-nightly]][gh-actions-nightly-url] | ❌ | -| Julia 1.11 (Mac) | [![][gh-actions-komamri-nightly]][gh-actions-nightly-url] | ➖ | +| KomaMRICore | CPU (multi-threaded) | GPU (Nvidia) | GPU (AMD) | GPU (Apple silicon) | GPU (Intel oneAPI) | +|:---------------------|:-----------------------------------:|:-----------------------------------:|:--------------------------------:|:----------------------------------:|:----------------------------------:| +| Julia 1 | [![][cpu-stable]][buildkite-url] | [![][nvidia-stable]][buildkite-url] | [![][amd-stable]][buildkite-url] | [![][apple-stable]][buildkite-url] | [![][intel-stable]][buildkite-url] |
-If you see any problem with this information, please let us know in the form of a GitHub issue. +Single-threaded compatibility is also tested using Julia 1.9 (compat) in all major operating systems (OS). + +
+ +| KomaMRI | CPU (single-threaded) | +|:---------------------|:-----------------------------------------:| +| Julia 1.9 (Windows) | [![][gh-actions-komamri]][gh-actions-url] | +| Julia 1.9 (Linux) | [![][gh-actions-komamri]][gh-actions-url] | +| Julia 1.9 (Mac OS) | [![][gh-actions-komamri]][gh-actions-url] | +| Julia 1 (Windows) | [![][gh-actions-komamri]][gh-actions-url] | +| Julia 1 (Linux) | [![][gh-actions-komamri]][gh-actions-url] | +| Julia 1 (Mac OS) | [![][gh-actions-komamri]][gh-actions-url] | + +
+ +If you see any problem with this information, please let us know in a GitHub issue. @@ -178,7 +185,12 @@ If you see any problem with this information, please let us know in the form of [docd-url]: https://juliahealth.github.io/KomaMRI.jl/dev/ [buildkite-badge]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg -[buildkite-url]: https://buildkite.com/julialang/komamri-dot-jl +[cpu-stable]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=CPU%3A%20Run%20tests%20on%20v1 +[nvidia-stable]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=CUDA%3A%20Run%20tests%20on%20v1 +[amd-stable]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=AMDGPU%3A%20Run%20tests%20on%20v1 +[apple-stable]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=Metal%3A%20Run%20tests%20on%20v1 +[intel-stable]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=oneAPI%3A%20Run%20tests%20on%20v1 +[buildkite-url]: https://buildkite.com/julialang/komamri-dot-jl/builds?branch=master [gh-actions-komamri]: https://github.com/JuliaHealth/KomaMRI.jl/workflows/CI/badge.svg [gh-actions-komabase]: https://github.com/JuliaHealth/KomaMRI.jl/workflows/CI/badge.svg From bf9a32a4d09d97277094f8a06a8f0fc20c405b4d Mon Sep 17 00:00:00 2001 From: Carlos Castillo Passi Date: Thu, 20 Jun 2024 16:49:31 -0400 Subject: [PATCH 02/16] Update pipeline.yml to add CPU backend and Julia 1 --- .buildkite/pipeline.yml | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index a71ced78e..e4acdb13e 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,9 +1,39 @@ steps: + - label: "CPU: Run tests on v{{matrix.version}}" + matrix: + setup: + version: + - "1.9" + - "1" + plugins: + - JuliaCI/julia#v1: + version: "{{matrix.version}}" + - JuliaCI/julia-coverage#v1: + codecov: true + dirs: + - KomaMRICore/src + - KomaMRICore/ext + command: | + julia -e 'println("--- :julia: Instantiating project") + using Pkg + Pkg.develop([ + PackageSpec(path=pwd(), subdir="."), + PackageSpec(path=pwd(), subdir="KomaMRIBase"), + PackageSpec(path=pwd(), subdir="KomaMRICore"), + ])' + + julia -e 'println("--- :julia: Running tests") + using Pkg + Pkg.test("KomaMRICore"; coverage=true, julia_args=[`--threads=auto`])' + agents: + queue: "juliagpu" + timeout_in_minutes: 120 + - label: "AMDGPU: Run tests on v{{matrix.version}}" matrix: setup: version: - - "1.10" + - "1" plugins: - JuliaCI/julia#v1: version: "{{matrix.version}}" @@ -34,6 +64,7 @@ steps: setup: version: - "1.9" + - "1" plugins: - JuliaCI/julia#v1: version: "{{matrix.version}}" @@ -64,6 +95,7 @@ steps: setup: version: - "1.9" + - "1" plugins: - JuliaCI/julia#v1: version: "{{matrix.version}}" @@ -90,6 +122,7 @@ steps: setup: version: - "1.9" + - "1" plugins: - JuliaCI/julia#v1: version: "{{matrix.version}}" @@ -119,4 +152,4 @@ env: CI: BUILDKITE CODECOV_FLAGS: core JULIA_PKG_SERVER: "" - SECRET_CODECOV_TOKEN: "lUmUVYkTlE8u0mR/ymv5rtE1A59wXZmQ3miRkmKciC/4+xHPNjpeIJ03FupuC1ElGBeX0m6DDFavZ9burLosGxbBYIPziBQZ5P9NdPDZjBdo7NM3QSSBeUfDsDYbHsYglfJZ35UL6Pd2YTAkJG0ePrTpfUaBb9rcll926NdqUP0vE2hbR2leKFFgBVNtK9Zf+NE7hO3meZQEZ+sN5tA7xGr24A3Ay7ckPg5HbPPD3KII2/fLtW+w0fQUfJdXNFrajJ0FyNE0kNLDlIzoYN6XM4yUeLBXoyXFHnqT5dSu7pqrByEk/ptYpjUzKFoRSnDQy+p8vrx9e/iAVf3lwwgwWA==;U2FsdGVkX1+IZLGTj2FNEy4XvUQbzkZFEwUpwIdRDCKrEea5O/OKGV5vYJufty3m9yniE+av4937HabS9dO1RA==" \ No newline at end of file + SECRET_CODECOV_TOKEN: "lUmUVYkTlE8u0mR/ymv5rtE1A59wXZmQ3miRkmKciC/4+xHPNjpeIJ03FupuC1ElGBeX0m6DDFavZ9burLosGxbBYIPziBQZ5P9NdPDZjBdo7NM3QSSBeUfDsDYbHsYglfJZ35UL6Pd2YTAkJG0ePrTpfUaBb9rcll926NdqUP0vE2hbR2leKFFgBVNtK9Zf+NE7hO3meZQEZ+sN5tA7xGr24A3Ay7ckPg5HbPPD3KII2/fLtW+w0fQUfJdXNFrajJ0FyNE0kNLDlIzoYN6XM4yUeLBXoyXFHnqT5dSu7pqrByEk/ptYpjUzKFoRSnDQy+p8vrx9e/iAVf3lwwgwWA==;U2FsdGVkX1+IZLGTj2FNEy4XvUQbzkZFEwUpwIdRDCKrEea5O/OKGV5vYJufty3m9yniE+av4937HabS9dO1RA==" From 2b71ec12bb3f57b40be8d28354039b0348d5d879 Mon Sep 17 00:00:00 2001 From: Carlos Castillo Passi Date: Thu, 20 Jun 2024 16:56:52 -0400 Subject: [PATCH 03/16] Update README.md adding Julia 1.9 --- README.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e97b89d34..12d4345bc 100644 --- a/README.md +++ b/README.md @@ -137,17 +137,18 @@ If you use this package, please cite our paper. ## Tested compatibility -All parallel backends are tested on Linux using the latest stable release of Julia (besides Apple silicon). +All parallel backends are tested on Linux (besides Apple silicon) using the latest stable release, Julia 1 (stable), and Julia 1.9 (compat).
-| KomaMRICore | CPU (multi-threaded) | GPU (Nvidia) | GPU (AMD) | GPU (Apple silicon) | GPU (Intel oneAPI) | +| KomaMRICore | CPU (multi-threaded) | GPU (Nvidia) | GPU (AMD) | GPU (Apple) | GPU (Intel) | |:---------------------|:-----------------------------------:|:-----------------------------------:|:--------------------------------:|:----------------------------------:|:----------------------------------:| +| Julia 1.9 | [![][cpu-compat]][buildkite-url] | [![][nvidia-compat]][buildkite-url] | [![][amd-compat]][buildkite-url] | [![][apple-compat]][buildkite-url] | [![][intel-compat]][buildkite-url] | | Julia 1 | [![][cpu-stable]][buildkite-url] | [![][nvidia-stable]][buildkite-url] | [![][amd-stable]][buildkite-url] | [![][apple-stable]][buildkite-url] | [![][intel-stable]][buildkite-url] |
-Single-threaded compatibility is also tested using Julia 1.9 (compat) in all major operating systems (OS). +Single-threaded compatibility is tested in all major operating systems (OS).
@@ -190,6 +191,13 @@ If you see any problem with this information, please let us know in a GitHub iss [amd-stable]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=AMDGPU%3A%20Run%20tests%20on%20v1 [apple-stable]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=Metal%3A%20Run%20tests%20on%20v1 [intel-stable]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=oneAPI%3A%20Run%20tests%20on%20v1 + +[cpu-compat]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=CPU%3A%20Run%20tests%20on%20v1.9 +[nvidia-compat]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=CUDA%3A%20Run%20tests%20on%20v1.9 +[amd-compat]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=AMDGPU%3A%20Run%20tests%20on%20v1.9 +[apple-compat]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=Metal%3A%20Run%20tests%20on%20v1.9 +[intel-compat]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=oneAPI%3A%20Run%20tests%20on%20v1.9 + [buildkite-url]: https://buildkite.com/julialang/komamri-dot-jl/builds?branch=master [gh-actions-komamri]: https://github.com/JuliaHealth/KomaMRI.jl/workflows/CI/badge.svg From a97fa1e6040efdf44a5c7c2d76beb062c0fb7f4a Mon Sep 17 00:00:00 2001 From: Carlos Castillo Passi Date: Thu, 20 Jun 2024 16:58:04 -0400 Subject: [PATCH 04/16] Update README.md [skip ci] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 12d4345bc..728ba608f 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ All parallel backends are tested on Linux (besides Apple silicon) using the late
-| KomaMRICore | CPU (multi-threaded) | GPU (Nvidia) | GPU (AMD) | GPU (Apple) | GPU (Intel) | +| KomaMRICore | CPU | GPU (Nvidia) | GPU (AMD) | GPU (Apple) | GPU (Intel) | |:---------------------|:-----------------------------------:|:-----------------------------------:|:--------------------------------:|:----------------------------------:|:----------------------------------:| | Julia 1.9 | [![][cpu-compat]][buildkite-url] | [![][nvidia-compat]][buildkite-url] | [![][amd-compat]][buildkite-url] | [![][apple-compat]][buildkite-url] | [![][intel-compat]][buildkite-url] | | Julia 1 | [![][cpu-stable]][buildkite-url] | [![][nvidia-stable]][buildkite-url] | [![][amd-stable]][buildkite-url] | [![][apple-stable]][buildkite-url] | [![][intel-stable]][buildkite-url] | From 0392a9f377e797e5f22f3c09cc15ba8623788444 Mon Sep 17 00:00:00 2001 From: Carlos Castillo Passi Date: Thu, 20 Jun 2024 17:04:20 -0400 Subject: [PATCH 05/16] Buildkite: Fixed multi-threaded CPU backend --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index e4acdb13e..84c220ae9 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -24,7 +24,7 @@ steps: julia -e 'println("--- :julia: Running tests") using Pkg - Pkg.test("KomaMRICore"; coverage=true, julia_args=[`--threads=auto`])' + Pkg.test("KomaMRICore"; coverage=true, julia_args=`--threads=auto`)' agents: queue: "juliagpu" timeout_in_minutes: 120 From ebfaead1a34c182bb92f9ada229ec6b560a7573a Mon Sep 17 00:00:00 2001 From: Carlos Castillo Passi Date: Thu, 20 Jun 2024 17:15:33 -0400 Subject: [PATCH 06/16] Update README.md [skip ci] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 728ba608f..bb4a5349b 100644 --- a/README.md +++ b/README.md @@ -194,7 +194,7 @@ If you see any problem with this information, please let us know in a GitHub iss [cpu-compat]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=CPU%3A%20Run%20tests%20on%20v1.9 [nvidia-compat]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=CUDA%3A%20Run%20tests%20on%20v1.9 -[amd-compat]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=AMDGPU%3A%20Run%20tests%20on%20v1.9 +[amd-compat]: https://img.shields.io/badge/build-failing-red?logo=buildkite&logoColor=white [apple-compat]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=Metal%3A%20Run%20tests%20on%20v1.9 [intel-compat]: https://badge.buildkite.com/f3c2e589ac0c1310cda3c2092814e33ac9db15b4f103eb572b.svg?step=oneAPI%3A%20Run%20tests%20on%20v1.9 From e3b97621e23d69e38dc6f038f0f09920e6262c49 Mon Sep 17 00:00:00 2001 From: Carlos Castillo Passi Date: Thu, 20 Jun 2024 18:37:28 -0400 Subject: [PATCH 07/16] Testing Metal dev --- .buildkite/pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 84c220ae9..06910472c 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -106,6 +106,7 @@ steps: PackageSpec(path=pwd(), subdir="."), PackageSpec(path=pwd(), subdir="KomaMRIBase"), PackageSpec(path=pwd(), subdir="KomaMRICore"), + PackageSpec("Metal") ])' julia -e 'println("--- :julia: Running tests") From 91da3a3e8f79fd9687e7313ac8c2059bfe349382 Mon Sep 17 00:00:00 2001 From: Carlos Castillo Passi Date: Thu, 20 Jun 2024 18:55:40 -0400 Subject: [PATCH 08/16] Testing DiffEqGPU approach --- .buildkite/pipeline.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 06910472c..a2d6ee839 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -106,9 +106,9 @@ steps: PackageSpec(path=pwd(), subdir="."), PackageSpec(path=pwd(), subdir="KomaMRIBase"), PackageSpec(path=pwd(), subdir="KomaMRICore"), - PackageSpec("Metal") - ])' - + ]) + Pkg.add(; name = "Metal")' + rm test/Manifest.toml julia -e 'println("--- :julia: Running tests") using Pkg Pkg.test("KomaMRICore"; test_args=["Metal"])' From 52b2103bfb17eafbedea784857a646f46c24100f Mon Sep 17 00:00:00 2001 From: Carlos Castillo Passi Date: Thu, 20 Jun 2024 19:01:56 -0400 Subject: [PATCH 09/16] Fixed typo rm KomaMRICore/test --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index a2d6ee839..c3c3d8673 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -108,7 +108,7 @@ steps: PackageSpec(path=pwd(), subdir="KomaMRICore"), ]) Pkg.add(; name = "Metal")' - rm test/Manifest.toml + rm KomaMRICore/test/Manifest.toml julia -e 'println("--- :julia: Running tests") using Pkg Pkg.test("KomaMRICore"; test_args=["Metal"])' From 3d2c439d0981e25b2f8a6b9f3089d2e33477b17c Mon Sep 17 00:00:00 2001 From: Carlos Castillo Passi Date: Thu, 20 Jun 2024 19:07:36 -0400 Subject: [PATCH 10/16] removed rm Manifest.toml --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index c3c3d8673..a7ee01b09 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -108,7 +108,7 @@ steps: PackageSpec(path=pwd(), subdir="KomaMRICore"), ]) Pkg.add(; name = "Metal")' - rm KomaMRICore/test/Manifest.toml + julia -e 'println("--- :julia: Running tests") using Pkg Pkg.test("KomaMRICore"; test_args=["Metal"])' From 290d023193c019af5d0163d239c8e009787a1c6a Mon Sep 17 00:00:00 2001 From: Carlos Castillo Passi Date: Thu, 20 Jun 2024 19:25:26 -0400 Subject: [PATCH 11/16] Removed GPU backend Pkg.add's in initialize --- .buildkite/pipeline.yml | 7 +++++-- KomaMRICore/test/initialize.jl | 12 ++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index a7ee01b09..5b0cf4a73 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -53,6 +53,7 @@ steps: julia -e 'println("--- :julia: Running tests") using Pkg + Pkg.add("AMDGPU") Pkg.test("KomaMRICore"; coverage=true, test_args=["AMDGPU"])' agents: queue: "juliagpu" @@ -84,6 +85,7 @@ steps: julia -e 'println("--- :julia: Running tests") using Pkg + Pkg.add("CUDA") Pkg.test("KomaMRICore"; coverage=true, test_args=["CUDA"])' agents: queue: "juliagpu" @@ -107,10 +109,10 @@ steps: PackageSpec(path=pwd(), subdir="KomaMRIBase"), PackageSpec(path=pwd(), subdir="KomaMRICore"), ]) - Pkg.add(; name = "Metal")' - + julia -e 'println("--- :julia: Running tests") using Pkg + Pkg.add("Metal") Pkg.test("KomaMRICore"; test_args=["Metal"])' agents: queue: "juliaecosystem" @@ -143,6 +145,7 @@ steps: julia -e 'println("--- :julia: Running tests") using Pkg + Pkg.add("oneAPI") Pkg.test("KomaMRICore"; coverage=true, test_args=["oneAPI"])' agents: queue: "juliagpu" diff --git a/KomaMRICore/test/initialize.jl b/KomaMRICore/test/initialize.jl index 6cc2ae321..8a8ffc979 100644 --- a/KomaMRICore/test/initialize.jl +++ b/KomaMRICore/test/initialize.jl @@ -2,23 +2,19 @@ using Pkg using Suppressor const USE_GPU = if "AMDGPU" in ARGS - @suppress Pkg.add("AMDGPU") - using AMDGPU + using AMDGPU # ] add AMDGPU to KomaMRICore/test/Project.toml @info "Testing AMD" maxlog=1 true elseif "CUDA" in ARGS - @suppress Pkg.add("CUDA") - using CUDA + using CUDA # ] add CUDA to KomaMRICore/test/Project.toml @info "Testing CUDA" maxlog=1 true elseif "Metal" in ARGS - @suppress Pkg.add("Metal") - using Metal + using Metal # ] add Metal to KomaMRICore/test/Project.toml @info "Testing Metal" maxlog=1 true elseif "oneAPI" in ARGS - @suppress Pkg.add("oneAPI") - using oneAPI + using oneAPI # ] add oneAPI to KomaMRICore/test/Project.toml @info "Testing oneAPI" maxlog=1 true else From 4c0f1f8229abf609a9793bb9b2b6d20dbafb78d0 Mon Sep 17 00:00:00 2001 From: Carlos Castillo Passi Date: Thu, 20 Jun 2024 19:28:04 -0400 Subject: [PATCH 12/16] Fixed missing ' --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 5b0cf4a73..878e40cfe 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -108,7 +108,7 @@ steps: PackageSpec(path=pwd(), subdir="."), PackageSpec(path=pwd(), subdir="KomaMRIBase"), PackageSpec(path=pwd(), subdir="KomaMRICore"), - ]) + ])' julia -e 'println("--- :julia: Running tests") using Pkg From e9bcd44347262d4e4d3d25db3e95e386135da98c Mon Sep 17 00:00:00 2001 From: Carlos Castillo Passi Date: Thu, 20 Jun 2024 19:35:57 -0400 Subject: [PATCH 13/16] Moved add backend --- .buildkite/pipeline.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 878e40cfe..cb6a819ef 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -49,11 +49,11 @@ steps: PackageSpec(path=pwd(), subdir="."), PackageSpec(path=pwd(), subdir="KomaMRIBase"), PackageSpec(path=pwd(), subdir="KomaMRICore"), - ])' + ]) + Pkg.add("AMDGPU")' julia -e 'println("--- :julia: Running tests") using Pkg - Pkg.add("AMDGPU") Pkg.test("KomaMRICore"; coverage=true, test_args=["AMDGPU"])' agents: queue: "juliagpu" @@ -81,11 +81,11 @@ steps: PackageSpec(path=pwd(), subdir="."), PackageSpec(path=pwd(), subdir="KomaMRIBase"), PackageSpec(path=pwd(), subdir="KomaMRICore"), - ])' + ]) + Pkg.add("CUDA")' julia -e 'println("--- :julia: Running tests") using Pkg - Pkg.add("CUDA") Pkg.test("KomaMRICore"; coverage=true, test_args=["CUDA"])' agents: queue: "juliagpu" @@ -108,11 +108,11 @@ steps: PackageSpec(path=pwd(), subdir="."), PackageSpec(path=pwd(), subdir="KomaMRIBase"), PackageSpec(path=pwd(), subdir="KomaMRICore"), - ])' + ]) + Pkg.add("Metal")' julia -e 'println("--- :julia: Running tests") using Pkg - Pkg.add("Metal") Pkg.test("KomaMRICore"; test_args=["Metal"])' agents: queue: "juliaecosystem" @@ -141,11 +141,11 @@ steps: PackageSpec(path=pwd(), subdir="."), PackageSpec(path=pwd(), subdir="KomaMRIBase"), PackageSpec(path=pwd(), subdir="KomaMRICore"), - ])' + ]) + Pkg.add("oneAPI")' julia -e 'println("--- :julia: Running tests") using Pkg - Pkg.add("oneAPI") Pkg.test("KomaMRICore"; coverage=true, test_args=["oneAPI"])' agents: queue: "juliagpu" From 53da6d9876b4ab91b1e0223083602731d88af599 Mon Sep 17 00:00:00 2001 From: Carlos Castillo Passi Date: Thu, 20 Jun 2024 19:55:21 -0400 Subject: [PATCH 14/16] Adding packages to test environment --- .buildkite/pipeline.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index cb6a819ef..0391b8f4d 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -14,14 +14,13 @@ steps: - KomaMRICore/src - KomaMRICore/ext command: | - julia -e 'println("--- :julia: Instantiating project") + julia --project=KomaMRICore/test -e 'println("--- :julia: Instantiating project") using Pkg Pkg.develop([ - PackageSpec(path=pwd(), subdir="."), PackageSpec(path=pwd(), subdir="KomaMRIBase"), PackageSpec(path=pwd(), subdir="KomaMRICore"), ])' - + julia -e 'println("--- :julia: Running tests") using Pkg Pkg.test("KomaMRICore"; coverage=true, julia_args=`--threads=auto`)' @@ -43,10 +42,9 @@ steps: - KomaMRICore/src - KomaMRICore/ext command: | - julia -e 'println("--- :julia: Instantiating project") + julia --project=KomaMRICore/test -e 'println("--- :julia: Instantiating project") using Pkg Pkg.develop([ - PackageSpec(path=pwd(), subdir="."), PackageSpec(path=pwd(), subdir="KomaMRIBase"), PackageSpec(path=pwd(), subdir="KomaMRICore"), ]) @@ -75,10 +73,9 @@ steps: - KomaMRICore/src - KomaMRICore/ext command: | - julia -e 'println("--- :julia: Instantiating project") + julia --project=KomaMRICore/test -e 'println("--- :julia: Instantiating project") using Pkg Pkg.develop([ - PackageSpec(path=pwd(), subdir="."), PackageSpec(path=pwd(), subdir="KomaMRIBase"), PackageSpec(path=pwd(), subdir="KomaMRICore"), ]) @@ -102,10 +99,9 @@ steps: - JuliaCI/julia#v1: version: "{{matrix.version}}" command: | - julia -e 'println("--- :julia: Instantiating project") + julia --project=KomaMRICore/test -e 'println("--- :julia: Instantiating project") using Pkg Pkg.develop([ - PackageSpec(path=pwd(), subdir="."), PackageSpec(path=pwd(), subdir="KomaMRIBase"), PackageSpec(path=pwd(), subdir="KomaMRICore"), ]) @@ -135,10 +131,9 @@ steps: - KomaMRICore/src - KomaMRICore/ext command: | - julia -e 'println("--- :julia: Instantiating project") + julia --project=KomaMRICore/test -e 'println("--- :julia: Instantiating project") using Pkg Pkg.develop([ - PackageSpec(path=pwd(), subdir="."), PackageSpec(path=pwd(), subdir="KomaMRIBase"), PackageSpec(path=pwd(), subdir="KomaMRICore"), ]) From 06922244035bc71f7e2b777701934cc7657917a1 Mon Sep 17 00:00:00 2001 From: Carlos Castillo Passi Date: Thu, 20 Jun 2024 20:10:01 -0400 Subject: [PATCH 15/16] Fixed test packages again --- .buildkite/pipeline.yml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 0391b8f4d..c831cf9f0 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -14,7 +14,7 @@ steps: - KomaMRICore/src - KomaMRICore/ext command: | - julia --project=KomaMRICore/test -e 'println("--- :julia: Instantiating project") + julia -e 'println("--- :julia: Instantiating project") using Pkg Pkg.develop([ PackageSpec(path=pwd(), subdir="KomaMRIBase"), @@ -42,12 +42,14 @@ steps: - KomaMRICore/src - KomaMRICore/ext command: | - julia --project=KomaMRICore/test -e 'println("--- :julia: Instantiating project") + julia -e 'println("--- :julia: Instantiating project") using Pkg Pkg.develop([ PackageSpec(path=pwd(), subdir="KomaMRIBase"), PackageSpec(path=pwd(), subdir="KomaMRICore"), - ]) + ])' + + julia --project=KomaMRICore/test -e 'println("--- :julia: Add AMDGPU to test environment") Pkg.add("AMDGPU")' julia -e 'println("--- :julia: Running tests") @@ -73,12 +75,14 @@ steps: - KomaMRICore/src - KomaMRICore/ext command: | - julia --project=KomaMRICore/test -e 'println("--- :julia: Instantiating project") + julia -e 'println("--- :julia: Instantiating project") using Pkg Pkg.develop([ PackageSpec(path=pwd(), subdir="KomaMRIBase"), PackageSpec(path=pwd(), subdir="KomaMRICore"), - ]) + ])' + + julia --project=KomaMRICore/test -e 'println("--- :julia: Add CUDA to test environment") Pkg.add("CUDA")' julia -e 'println("--- :julia: Running tests") @@ -99,12 +103,14 @@ steps: - JuliaCI/julia#v1: version: "{{matrix.version}}" command: | - julia --project=KomaMRICore/test -e 'println("--- :julia: Instantiating project") + julia -e 'println("--- :julia: Instantiating project") using Pkg Pkg.develop([ PackageSpec(path=pwd(), subdir="KomaMRIBase"), PackageSpec(path=pwd(), subdir="KomaMRICore"), - ]) + ])' + + julia --project=KomaMRICore/test -e 'println("--- :julia: Add Metal to test environment") Pkg.add("Metal")' julia -e 'println("--- :julia: Running tests") @@ -131,12 +137,14 @@ steps: - KomaMRICore/src - KomaMRICore/ext command: | - julia --project=KomaMRICore/test -e 'println("--- :julia: Instantiating project") + julia -e 'println("--- :julia: Instantiating project") using Pkg Pkg.develop([ PackageSpec(path=pwd(), subdir="KomaMRIBase"), PackageSpec(path=pwd(), subdir="KomaMRICore"), - ]) + ])' + + julia --project=KomaMRICore/test -e 'println("--- :julia: Add oneAPI to test environment") Pkg.add("oneAPI")' julia -e 'println("--- :julia: Running tests") From 0f47f366110c522fb7e66cad31cef8e708b9b5c7 Mon Sep 17 00:00:00 2001 From: Carlos Castillo Passi Date: Thu, 20 Jun 2024 20:15:01 -0400 Subject: [PATCH 16/16] Fixed buildkite test environment again --- .buildkite/pipeline.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index c831cf9f0..4bf62cd01 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -50,6 +50,7 @@ steps: ])' julia --project=KomaMRICore/test -e 'println("--- :julia: Add AMDGPU to test environment") + using Pkg Pkg.add("AMDGPU")' julia -e 'println("--- :julia: Running tests") @@ -83,6 +84,7 @@ steps: ])' julia --project=KomaMRICore/test -e 'println("--- :julia: Add CUDA to test environment") + using Pkg Pkg.add("CUDA")' julia -e 'println("--- :julia: Running tests") @@ -111,6 +113,7 @@ steps: ])' julia --project=KomaMRICore/test -e 'println("--- :julia: Add Metal to test environment") + using Pkg Pkg.add("Metal")' julia -e 'println("--- :julia: Running tests") @@ -145,6 +148,7 @@ steps: ])' julia --project=KomaMRICore/test -e 'println("--- :julia: Add oneAPI to test environment") + using Pkg Pkg.add("oneAPI")' julia -e 'println("--- :julia: Running tests")