This commit is contained in:
Caubet Serrabou Marc
2024-09-05 09:55:03 +02:00
parent 6a8cb7825b
commit d3e38214d2
6 changed files with 81 additions and 49 deletions

View File

@@ -4,8 +4,12 @@ pbuild::install_docfiles 'AUTHORS' 'LICENSE' 'NEWS' 'README'
pbuild::pre_configure() {
pbuild::add_configure_args "--prefix=${PREFIX}"
pbuild::add_configure_args "--enable-mpi-cxx"
pbuild::add_configure_args "--enable-mpi-cxx-seek"
if (( V_MAJOR < 5 )); then
pbuild::add_configure_args "--enable-mpi-cxx"
pbuild::add_configure_args "--enable-mpi-cxx-seek"
fi
pbuild::add_configure_args "--enable-orterun-prefix-by-default"
pbuild::add_configure_args "--enable-shared"
pbuild::add_configure_args "--enable-static"
@@ -48,10 +52,12 @@ pbuild::pre_configure() {
pbuild::add_configure_args "LDFLAGS=-Wc,-static-intel,-O0"
fi
if pbuild::use_flag slurm || pbuild::use_flag dgx || pbuild::use_flag merlin6; then
if pbuild::use_flag slurm || pbuild::use_flag dgx || pbuild::use_flag merlin6 || pbuild::use_flag merlin7; then
pbuild::add_configure_args "--with-gpfs=/usr/lpp/mmfs"
pbuild::add_configure_args "--with-pmi"
# pbuild::add_configure_args "--with-pmi-libdir=/usr/lib64/"
if (( V_MAJOR < 5 )); then
pbuild::add_configure_args "--with-pmi"
# pbuild::add_configure_args "--with-pmi-libdir=/usr/lib64/"
fi
if pbuild::use_flag "libpmix"; then
pbuild::add_configure_args "--enable-install-libpmix"
@@ -72,7 +78,7 @@ pbuild::pre_configure() {
}
pbuild::post_install() {
if ! pbuild::use_flag slurm && ! pbuild::use_flag dgx && ! pbuild::use_flag merlin6; then
if ! pbuild::use_flag slurm && ! pbuild::use_flag dgx && ! pbuild::use_flag merlin6 && ! pbuild::use_flag merlin7; then
mkdir -p "${PREFIX}/lib/fallback"
local -r binary=$(ls "${PREFIX}"/lib/libmpi.so.*.*.*)
pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libuc[mpst].so'

View File

@@ -55,6 +55,14 @@ openmpi:
openmpi-4.1.6.tar.bz2: f740994485516deb63b5311af122c265179f5328a0d857a567b85db00b11e415
versions:
5.0.5:
variants:
- systems: [login001*,login002*]
suffix: _merlin7
group_deps:
compiler: {gcc: [12.3.0]}
build_requires: [pmix/4.2.4, ucx/1.15.1_slurm, hwloc/2.9.1, patchelf/0.14.5]
runtime_deps: [cuda/12.1.1]
4.1.6:
variants:
- systems: [merlin-*, ra-*]

View File

@@ -0,0 +1,50 @@
openmpi/3.1.4_merlin6 deprecated gcc/{7.4.0,8.3.0}
openmpi/3.1.5_merlin6 deprecated gcc/{7.3.0,7.4.0,8.3.0,9.2.0}
openmpi/3.1.5_merlin6 deprecated intel/{15.2,17.4,18.4}
openmpi/3.1.5-1_merlin6 deprecated gcc/{7.3.0,7.4.0,8.3.0,9.2.0}
openmpi/3.1.5-1_merlin6 deprecated intel/{15.2,17.4,18.4}
openmpi/2.1.6_slurm deprecated gcc/{4.9.4,5.5.0,6.5.0,7.4.0,8.3.0,9.2.0}
openmpi/2.1.6_slurm deprecated intel/{15.2,17.4,18.4}
openmpi/3.0.5_slurm deprecated gcc/{4.9.4,5.5.0,6.5.0,7.4.0,8.3.0,9.2.0}
openmpi/3.0.5_slurm deprecated intel/{15.2,17.4,18.4}
openmpi/3.1.6_slurm deprecated gcc/{4.9.4,5.5.0,6.5.0}
openmpi/3.1.6_slurm stable gcc/{7.5.0,8.4.0,9.3.0}
openmpi/3.1.6_slurm deprecated intel/{15.2,17.4,18.4,20.1}
openmpi/3.1.6_slurm deprecated intel/20.4 cuda/11.1.0
openmpi/4.0.3_slurm deprecated gcc/{4.9.4,5.5.0,6.5.0,7.5.0,8.4.0,9.3.0}
openmpi/4.0.3_slurm deprecated intel/{15.2,17.4,18.4,20.1}
openmpi/4.0.4_slurm deprecated gcc/{4.9.4,5.5.0,6.5.0,7.5.0,8.4.0,9.3.0}
openmpi/4.0.4_slurm deprecated intel/{15.2,17.4}
openmpi/4.0.4_slurm deprecated intel/{18.4,20.1}
openmpi/4.0.5_slurm stable gcc/9.2.0 cuda/11.0.3
openmpi/4.0.5_slurm stable gcc/{8.4.0,9.3.0} cuda/11.1.0
openmpi/4.0.5_slurm stable intel/20.4 cuda/11.1.0
openmpi/4.0.5-1_slurm stable gcc/{8.4.0,9.3.0,10.2.0,10.3.0} cuda/11.2.2 b:ucx/1.10.0-1_slurm
openmpi/4.0.5-2_slurm stable gcc/10.2.0 cuda/11.3.0 b:ucx/1.11.0_slurm
openmpi/4.0.7_slurm stable gcc/10.2.0 cuda/11.5.1 b:ucx/1.11.2-2_slurm
openmpi/4.0.7-1_slurm stable gcc/10.2.0 cuda/11.4.3 b:ucx/1.11.2-1_slurm
openmpi/4.1.1_slurm unstable gcc/10.2.0 cuda/11.3.0 b:ucx/1.11.2_slurm
openmpi/4.1.1-1_slurm unstable gcc/10.2.0 cuda/11.3.0 b:ucx/1.10.0_slurm
openmpi/4.1.3_slurm stable gcc/{9.3.0,10.3.0,11.2.0} cuda/11.5.1 b:ucx/1.12.1_slurm
openmpi/4.1.4_slurm stable gcc/10.4.0 cuda/11.5.1 b:ucx/1.12.1_slurm
openmpi/4.1.5_slurm stable gcc/{9.5.0,10.4.0,11.4.0,12.3.0,13.1.0} b:cuda/12.1.1 b:pmix/4.2.4 b:ucx/1.14.1_slurm b:libfabric/1.18.0 b:hwloc/2.9.1 b:patchelf/0.14.5
openmpi/4.1.5_slurm unstable intelcc/22.2 b:cuda/12.1.1 b:pmix/4.2.4 b:ucx/1.14.1_slurm b:libfabric/1.18.0 b:hwloc/2.9.1 b:patchelf/0.14.5
openmpi/4.0.5-1_dgx deprecated gcc/{8.4.0,9.3.0,10.2.0} cuda/11.2.2 b:ucx/1.10.0-1_dgx
openmpi/4.1.0-1_dgx deprecated gcc/10.2.0 cuda/11.2.2 b:ucx/1.10.0-1_dgx
openmpi/4.0.4_slurm_libpmix deprecated gcc/9.3.0

View File

@@ -1,29 +1,15 @@
#!/usr/bin/env modbuild
echo "https://github.com/openpmix/openpmix/releases/download/v${V_PKG}/$P-${V_PKG}.tar.gz"
pbuild::set_download_url "https://github.com/openpmix/openpmix/releases/download/v${V_PKG}/$P-${V_PKG}.tar.gz"
pbuild::add_to_group 'Libraries'
(( version = (${V_MAJOR} * 100 + ${V_MINOR}) * 100 + V_PATCHLVL ))
if (( V_MAJOR > 1 )); then
pbuild::install_docfiles AUTHORS README.md LICENSE NEWS VERSION
else
pbuild::install_docfiles README LICENSE NEWS VERSION
fi
pbuild::compile_in_sourcetree
pbuild::pre_configure() {
if [[ -n "${HWLOC_PREFIX}" ]]; then
if [[ -v HWLOC_PREFIX ]]; then
pbuild::add_configure_args "--with-hwloc=${HWLOC_PREFIX}"
fi
if [[ -n "${LIBEVENT_PREFIX}" ]]; then
if [[ -v LIBEVENT_PREFIX ]]; then
pbuild::add_configure_args "--with-libevent=${LIBEVENT_PREFIX}"
fi
if [[ -n "${INTEL_VERSION}" ]]; then
if [[ -v INTEL_VERSION ]]; then
pbuild::add_configure_args "CC=icc"
pbuild::add_configure_args "CXX=icpc"
pbuild::add_configure_args "FC=ifort"

View File

@@ -1,24 +0,0 @@
#!/usr/bin/env modbuild
pbuild::pre_configure() {
if [[ -v HWLOC_PREFIX ]]; then
pbuild::add_configure_args "--with-hwloc=${HWLOC_PREFIX}"
fi
if [[ -v LIBEVENT_PREFIX ]]; then
pbuild::add_configure_args "--with-libevent=${LIBEVENT_PREFIX}"
fi
if [[ -v INTEL_VERSION ]]; then
pbuild::add_configure_args "CC=icc"
pbuild::add_configure_args "CXX=icpc"
pbuild::add_configure_args "FC=ifort"
pbuild::add_configure_args "F77=ifort"
pbuild::add_configure_args "F90=ifort"
# pbuild::add_configure_args "LDFLAGS=-Wc,-static-intel"
fi
# pbuild::add_configure_args "--enable-pmi-backward-compatibility"
pbuild::add_configure_args "--enable-shared"
pbuild::add_configure_args "--enable-static"
}

View File

@@ -19,6 +19,7 @@ pmix:
pmix-4.1.2.tar.gz: a7a6d5b322c261999ce0a6395c0ac7dc359c0ff61380ed4c6935430fb9f5f6e6
pmix-4.2.3.tar.gz: fd45e18e483e42089d4059df9753d9be3cfb68297a05981b1d937e09f7716d5a
pmix-4.2.4.tar.gz: f1fe5fe817ac447ce8d3d88486a1c0d22227efd186e11062aa1f7b0f093089c6
pmix-5.0.3.tar.gz: c98afa8ec5a2495b82fae5eff731c4fc6371e0b0
versions:
1.2.5:
config:
@@ -33,12 +34,12 @@ pmix:
relstage: unstable
4.1.2:
config:
relstage: unstable
relstage: stable
runtime_deps: [libevent/2.1.12]
build_requires: [hwloc/2.7.1]
4.2.3:
config:
relstage: unstable
relstage: stable
runtime_deps: [libevent/2.1.12]
build_requires: [hwloc/2.9.1]
4.2.4:
@@ -46,3 +47,8 @@ pmix:
relstage: stable
runtime_deps: [libevent/2.1.12]
build_requires: [gcc/10.4.0, hwloc/2.9.1]
5.0.3:
config:
relstate: unstable
runtime_deps: [libevent/2.1.12]
build_requires: [hwloc/2.11.1]