From 03322a09a5f66df64e4e73951c58e4e92a3f7302 Mon Sep 17 00:00:00 2001
From: Matthias Krack <matthias.krack@psi.ch>
Date: Wed, 25 Feb 2026 09:19:26 +0100
Subject: [PATCH] Revise CUDA activation for libfabric

---
 make_cp2k.sh                    | 3 ++-
 tools/spack/cp2k_deps_psmp.yaml | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/make_cp2k.sh b/make_cp2k.sh
index d099a2c27e..04046d03a2 100755
--- a/make_cp2k.sh
+++ b/make_cp2k.sh
@@ -847,8 +847,9 @@ if [[ ! -d "${SPACK_BUILD_PATH}" ]]; then
     sed -E \
       -e "0,/~cuda/s//+cuda cuda_arch=${CUDA_ARCH}/" \
       -e '/\s*#\s*-\s+"\+cuda\s+\+gpu_direct"/ s/#/ /' \
+      -e 's/"~cuda\s+~gdrcopy"/"\+cuda \+gdrcopy"/' \
+      -e '/\s*#\s*-\s+"fabrics=efa,ucx"/ s/#/ /' \
       -i "${CP2K_CONFIG_FILE}"
-    # -e '/\s*#\s*-\s+"\+cuda\s+\+gdrcopy"/ s/#/ /' \
     if [[ -n "${CUDA_VERSION:-}" ]]; then
       sed -E -e "s/spec:\s+cuda@[.0-9]*/spec: cuda@${CUDA_VERSION}/" -i "${CP2K_CONFIG_FILE}"
     fi
diff --git a/tools/spack/cp2k_deps_psmp.yaml b/tools/spack/cp2k_deps_psmp.yaml
index 417a0347ee..712310d09e 100644
--- a/tools/spack/cp2k_deps_psmp.yaml
+++ b/tools/spack/cp2k_deps_psmp.yaml
@@ -114,9 +114,8 @@ spack:
 
     libfabric:
       require:
-        - "~cuda"
-#       - "+cuda +gdrcopy"
-#       - "fabrics=cxi"
+        - "~cuda ~gdrcopy"
+#       - "fabrics=efa,ucx"
 
     libint:
       require: