diff --git a/.ci_support/linux_64_cuda_compiler_version11.8mpi_typeconda.yaml b/.ci_support/linux_64_cuda_compiler_version11.8mpi_typeconda.yaml index 3b5652c..a64570e 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.8mpi_typeconda.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.8mpi_typeconda.yaml @@ -32,6 +32,8 @@ libfabric: - '1.19' libhwloc: - 2.11.2 +libpmix_devel: +- '5' mpi_type: - conda openmpi: diff --git a/.ci_support/linux_64_cuda_compiler_version11.8mpi_typeexternal.yaml b/.ci_support/linux_64_cuda_compiler_version11.8mpi_typeexternal.yaml index 54d798b..986460b 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.8mpi_typeexternal.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.8mpi_typeexternal.yaml @@ -32,6 +32,8 @@ libfabric: - '1.19' libhwloc: - 2.11.2 +libpmix_devel: +- '5' mpi_type: - external openmpi: diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.8mpi_typeconda.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.8mpi_typeconda.yaml index 8a052c6..45f38f7 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_version11.8mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_version11.8mpi_typeconda.yaml @@ -32,6 +32,8 @@ libfabric: - '1.19' libhwloc: - 2.11.2 +libpmix_devel: +- '5' mpi_type: - conda openmpi: diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.8mpi_typeexternal.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.8mpi_typeexternal.yaml index fd6bf2a..c1d342d 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_version11.8mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_version11.8mpi_typeexternal.yaml @@ -32,6 +32,8 @@ libfabric: - '1.19' libhwloc: - 2.11.2 +libpmix_devel: +- '5' mpi_type: - external openmpi: diff --git a/.ci_support/linux_ppc64le_cuda_compiler_version11.8mpi_typeconda.yaml b/.ci_support/linux_ppc64le_cuda_compiler_version11.8mpi_typeconda.yaml index 045278c..15a47e2 100644 --- a/.ci_support/linux_ppc64le_cuda_compiler_version11.8mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_cuda_compiler_version11.8mpi_typeconda.yaml @@ -32,6 +32,8 @@ libfabric: - '1.19' libhwloc: - 2.11.2 +libpmix_devel: +- '5' mpi_type: - conda openmpi: diff --git a/.ci_support/linux_ppc64le_cuda_compiler_version11.8mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_cuda_compiler_version11.8mpi_typeexternal.yaml index f148981..fbbd25d 100644 --- a/.ci_support/linux_ppc64le_cuda_compiler_version11.8mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_cuda_compiler_version11.8mpi_typeexternal.yaml @@ -32,6 +32,8 @@ libfabric: - '1.19' libhwloc: - 2.11.2 +libpmix_devel: +- '5' mpi_type: - external openmpi: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index dd79271..87dea46 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -14,8 +14,6 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -cuda_compiler: -- None cuda_compiler_version: - None cxx_compiler: @@ -32,6 +30,8 @@ libfabric: - '1.19' libhwloc: - 2.11.2 +libpmix_devel: +- '5' macos_machine: - x86_64-apple-darwin13.4.0 mpi_type: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 73f7b09..ec40a3c 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -14,8 +14,6 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -cuda_compiler: -- None cuda_compiler_version: - None cxx_compiler: @@ -32,6 +30,8 @@ libfabric: - '1.19' libhwloc: - 2.11.2 +libpmix_devel: +- '5' macos_machine: - arm64-apple-darwin20.0.0 mpi_type: diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 2ace99a..774d2f5 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -3,3 +3,5 @@ mpi_type: - conda libfabric: - "1.19" +libpmix_devel: + - "5" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bcdce17..a0d3039 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.7" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 1 %} +{% set build = 2 %} # give conda package a higher build number {% if mpi_type == 'conda' %} @@ -37,12 +37,12 @@ outputs: - openmpi_{{ mpi_type }} {% endif %} ignore_run_exports_from: - - {{ compiler('cuda') }} # [cuda_compiler != "None"] + - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - - {{ compiler('cuda') }} # [cuda_compiler != "None"] + - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] - {{ compiler('fortran') }} - {{ stdlib('c') }} - pkg-config @@ -55,14 +55,14 @@ outputs: - zlib - ucc # [linux and not ppc64le] - ucx # [linux and not ppc64le] - - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] + - cuda-version {{ cuda_compiler_version }} # [cuda_compiler_version != "None"] run: - mpi 1.0 openmpi run_constrained: # Open MPI only uses CUDA Driver APIs, set the minimal driver version - - __cuda >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] + - __cuda >= {{ cuda_major ~ ".0" }} # [cuda_compiler_version != "None"] # Ensure a consistent CUDA environment - - cuda-version >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] + - cuda-version >= {{ cuda_major ~ ".0" }} # [cuda_compiler_version != "None"] # conflict with prrte # openmpi (starting with 6) # bundles its own fork of prrte