From b7e5e9e3e8617b39d415fccb637edab5ef8292a0 Mon Sep 17 00:00:00 2001
From: Martin Lang <martin.lang@mpsd.mpg.de>
Date: Thu, 9 Jan 2025 16:21:28 +0100
Subject: [PATCH] Consistently use ucx~vfs everywhere

---
 .../gcc-13_2_0-openmpi-4_1_6-cuda-12_6_2/spack.yaml.jinja       | 2 +-
 toolchains/gcc-13_2_0-openmpi-4_1_6/spack.yaml.jinja            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchains/gcc-13_2_0-openmpi-4_1_6-cuda-12_6_2/spack.yaml.jinja b/toolchains/gcc-13_2_0-openmpi-4_1_6-cuda-12_6_2/spack.yaml.jinja
index ec19e8b..1738a76 100644
--- a/toolchains/gcc-13_2_0-openmpi-4_1_6-cuda-12_6_2/spack.yaml.jinja
+++ b/toolchains/gcc-13_2_0-openmpi-4_1_6-cuda-12_6_2/spack.yaml.jinja
@@ -3,7 +3,7 @@ spack:
   - compilers:
     - "{{ toolchain_compiler }}"
   - mpis:
-    - openmpi@4.1.6+cuda cuda_arch={{ cuda_arch }} fabrics=ucx schedulers=slurm ^slurm@22-05-8-1+pmix^ucx@1.15.0+cma+cuda+dc+dm~gdrcopy+ib_hw_tm+knem+mlx5_dv+rc+rdmacm+thread_multiple+ud+verbs+vfs~xpmem
+    - openmpi@4.1.6+cuda cuda_arch={{ cuda_arch }} fabrics=ucx schedulers=slurm ^slurm@22-05-8-1+pmix^ucx@1.15.0+cma+cuda+dc+dm~gdrcopy+ib_hw_tm+knem+mlx5_dv+rc+rdmacm+thread_multiple+ud+verbs~vfs~xpmem
   - packages:
     - binutils@2.40+headers+ld
     - openblas@0.3.24
diff --git a/toolchains/gcc-13_2_0-openmpi-4_1_6/spack.yaml.jinja b/toolchains/gcc-13_2_0-openmpi-4_1_6/spack.yaml.jinja
index 18b0693..5c3870d 100644
--- a/toolchains/gcc-13_2_0-openmpi-4_1_6/spack.yaml.jinja
+++ b/toolchains/gcc-13_2_0-openmpi-4_1_6/spack.yaml.jinja
@@ -3,7 +3,7 @@ spack:
   - compilers:
     - "{{ toolchain_compiler }}"
   - mpis:
-    - openmpi@4.1.6~cuda fabrics=ucx schedulers=slurm ^slurm@22-05-8-1+pmix^ucx@1.15.0+cma~cuda+dc+dm~gdrcopy+ib_hw_tm+knem+mlx5_dv+rc+rdmacm+thread_multiple+ud+verbs+vfs~xpmem
+    - openmpi@4.1.6~cuda fabrics=ucx schedulers=slurm ^slurm@22-05-8-1+pmix^ucx@1.15.0+cma~cuda+dc+dm~gdrcopy+ib_hw_tm+knem+mlx5_dv+rc+rdmacm+thread_multiple+ud+verbs~vfs~xpmem
   - packages:
     - binutils@2.40+headers+ld
     - openblas@0.3.24
-- 
GitLab