Add optional external openmpi and ucx

envs/dtk25.04.4.yaml

@@ -49,6 +49,18 @@ packages:
   berkeley-db:
     require:
     - ~cxx~stl
+  openmpi:
+    require:
+    - '@5'
+    - fabrics=ucx
+    - ~rocm
+    - ~cuda~java~memchecker~internal-hwloc
+    prefer:
+    - "%gcc_all"
+    buildable: true
+    externals:
+    - spec: openmpi@5.0.8+atomics~cuda~debug+fortran~gpfs~internal-hwloc~internal-libevent~internal-pmix~ipv6~java~lustre~memchecker~openshmem+rocm~romio+rsh~static~two_level_namespace+vt+wrapper-rpath build_system=autotools fabrics:=ucx romio-filesystem:=none schedulers:=none amdgpu_target:=gfx936
+      prefix: /opt/mpi
   ucx:
     require:
     - '@1'
@@ -57,14 +69,10 @@ packages:
     - +cma+rc+ud+dc+mlx5_dv+ib_hw_tm
     - +thread_multiple+dm
     - ~cuda~java~gdrcopy~xpmem~knem
-  openmpi:
-    require:
-    - '@5'
-    - fabrics:=ucx
-    - +rocm amdgpu_target:=gfx936
-    - ~cuda~java~memchecker~internal-hwloc
-    prefer:
-    - ~fortran
+    buildable: true
+    externals:
+    - spec: ucx@1.20.0~cuda~java~memchecker~gdrcopy~xpmem~knem+rocm+verbs+rdmacm+cma+rc+ud+dc+mlx5_dv+ib_hw_tm+thread_multiple+dm
+      prefix: /opt/ucx
   gcc:
     buildable: false
     externals:

scripts/install-mpi.sh

@@ -135,6 +135,8 @@ install_openmpi( )
   ompi_build_cmd="./configure --prefix=${ompi_prefix} \
     --with-ucx=${ucx_prefix} \
     --with-rocm=${with_rocm} \
+    --enable-builtin-atomics \
+    --enable-wrapper-rpath \
     --without-verbs --enable-mca-no-build=btl-uct"
 
   if [ ! -d "./openmpi" ]; then