From 61458791c9fc7911b4b98e32225b600d7b8ba78e Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 10:15:25 +0000 Subject: [PATCH 001/224] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 09748340..2aad7f7a 100644 --- a/README.md +++ b/README.md @@ -232,3 +232,6 @@ Feedstock Maintainers * [@msarahan](https://github.com/msarahan/) * [@ocefpaf](https://github.com/ocefpaf/) + + + From a77e1ba83ebdc8760dad8c7a1e08aa0d3a1b8d83 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 10:17:04 +0000 Subject: [PATCH 002/224] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.03.28.09.32.54 --- .ci_support/migrations/ucx1410.yaml | 7 ------- README.md | 3 --- 2 files changed, 10 deletions(-) delete mode 100644 .ci_support/migrations/ucx1410.yaml diff --git a/.ci_support/migrations/ucx1410.yaml b/.ci_support/migrations/ucx1410.yaml deleted file mode 100644 index ac6a7726..00000000 --- a/.ci_support/migrations/ucx1410.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -ucx: -- '1.14.0' -migrator_ts: 1679152574.207815 diff --git a/README.md b/README.md index 2aad7f7a..09748340 100644 --- a/README.md +++ b/README.md @@ -232,6 +232,3 @@ Feedstock Maintainers * [@msarahan](https://github.com/msarahan/) * [@ocefpaf](https://github.com/ocefpaf/) - - - From abf743b406e2054b4832df0e0338ced81b7f41c0 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 28 Mar 2023 03:20:06 -0700 Subject: [PATCH 003/224] Always use `ucx` Can drop `enable_cuda` conditioning of `ucx` as the package works with or without CUDA now. --- recipe/meta.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4b1dbe1c..dc51208c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,10 +28,6 @@ outputs: build: run_exports: - {{ pin_subpackage('openmpi', min_pin='x.x.x', max_pin='x') }} - ignore_run_exports: - - ucx # [enable_cuda] - script_env: - - CUDA_HOME # [enable_cuda] requirements: build: - {{ compiler('c') }} @@ -44,14 +40,10 @@ outputs: - perl 5.26.2 host: - zlib - - ucx # [enable_cuda] - - ucx-proc =*=gpu # [enable_cuda] + - ucx run: - zlib - mpi 1.0 openmpi - run_constrained: - - cudatoolkit >= {{ cudatoolkit }} # [enable_cuda] - - {{ pin_compatible("ucx", max_pin="x") }} # [enable_cuda] test: script: run_test.sh files: From c8694e258d4b0bde89f058d32022e5a0d969d25f Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 28 Mar 2023 03:21:39 -0700 Subject: [PATCH 004/224] Drop `enable_cuda` from `conda_build_config.yaml` As `enable_cuda` is no longer used in `meta.yaml`, drop it from `conda_build_config.yaml`. --- recipe/conda_build_config.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 9badca02..7aecb7b8 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -9,6 +9,3 @@ cudatoolkit: # [linux] - 10.2 # [linux64] - 11.0 # [ppc64le] - 11.0 # [aarch64] -enable_cuda: - - True # [linux] - - False # [not linux] From 283c76447d32106a74d4e1392b33f855a9aab91c Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 10:24:03 +0000 Subject: [PATCH 005/224] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.03.28.09.32.54 --- .ci_support/linux_64_mpi_typeconda.yaml | 4 ---- .ci_support/linux_64_mpi_typeexternal.yaml | 4 ---- .ci_support/linux_aarch64_mpi_typeconda.yaml | 4 ---- .ci_support/linux_aarch64_mpi_typeexternal.yaml | 4 ---- .ci_support/linux_ppc64le_mpi_typeconda.yaml | 4 ---- .ci_support/linux_ppc64le_mpi_typeexternal.yaml | 4 ---- .ci_support/osx_64_.yaml | 4 ++-- .ci_support/osx_arm64_.yaml | 4 ++-- 8 files changed, 4 insertions(+), 28 deletions(-) diff --git a/.ci_support/linux_64_mpi_typeconda.yaml b/.ci_support/linux_64_mpi_typeconda.yaml index ef3ac084..09a9b83f 100644 --- a/.ci_support/linux_64_mpi_typeconda.yaml +++ b/.ci_support/linux_64_mpi_typeconda.yaml @@ -8,16 +8,12 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -cudatoolkit: -- '10.2' cxx_compiler: - gxx cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-cuda:10.2 -enable_cuda: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_64_mpi_typeexternal.yaml b/.ci_support/linux_64_mpi_typeexternal.yaml index 25d2ec2d..c3136c45 100644 --- a/.ci_support/linux_64_mpi_typeexternal.yaml +++ b/.ci_support/linux_64_mpi_typeexternal.yaml @@ -8,16 +8,12 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -cudatoolkit: -- '10.2' cxx_compiler: - gxx cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-cuda:10.2 -enable_cuda: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_aarch64_mpi_typeconda.yaml b/.ci_support/linux_aarch64_mpi_typeconda.yaml index 3513dbf3..b24a3268 100644 --- a/.ci_support/linux_aarch64_mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_mpi_typeconda.yaml @@ -12,16 +12,12 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -cudatoolkit: -- '11.0' cxx_compiler: - gxx cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 -enable_cuda: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_aarch64_mpi_typeexternal.yaml b/.ci_support/linux_aarch64_mpi_typeexternal.yaml index bbf9658e..12902f85 100644 --- a/.ci_support/linux_aarch64_mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_mpi_typeexternal.yaml @@ -12,16 +12,12 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -cudatoolkit: -- '11.0' cxx_compiler: - gxx cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 -enable_cuda: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_ppc64le_mpi_typeconda.yaml b/.ci_support/linux_ppc64le_mpi_typeconda.yaml index 5c890a95..b93a53ec 100644 --- a/.ci_support/linux_ppc64le_mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_mpi_typeconda.yaml @@ -8,16 +8,12 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -cudatoolkit: -- '11.0' cxx_compiler: - gxx cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 -enable_cuda: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_ppc64le_mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_mpi_typeexternal.yaml index 40229b71..0956c60a 100644 --- a/.ci_support/linux_ppc64le_mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_mpi_typeexternal.yaml @@ -8,16 +8,12 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -cudatoolkit: -- '11.0' cxx_compiler: - gxx cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 -enable_cuda: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 9f5b377d..967b3518 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -12,8 +12,6 @@ cxx_compiler: - clangxx cxx_compiler_version: - '14' -enable_cuda: -- 'False' fortran_compiler: - gfortran fortran_compiler_version: @@ -24,6 +22,8 @@ mpi_type: - conda target_platform: - osx-64 +ucx: +- 1.14.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index e1f05293..0dda0f92 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -12,8 +12,6 @@ cxx_compiler: - clangxx cxx_compiler_version: - '14' -enable_cuda: -- 'False' fortran_compiler: - gfortran fortran_compiler_version: @@ -24,6 +22,8 @@ mpi_type: - conda target_platform: - osx-arm64 +ucx: +- 1.14.0 zip_keys: - - c_compiler_version - cxx_compiler_version From da85c82fb08a816cbc63aba07431d522b33368fd Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 28 Mar 2023 03:27:52 -0700 Subject: [PATCH 006/224] Require `ucx` on `linux` only Since there is no `ucx` for `osx`, only require it on `linux`. --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dc51208c..bf1a9f37 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -40,7 +40,7 @@ outputs: - perl 5.26.2 host: - zlib - - ucx + - ucx # [linux] run: - zlib - mpi 1.0 openmpi From 5d929427dc961218ec226b6ed0288b354e1083b1 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 28 Mar 2023 03:33:03 -0700 Subject: [PATCH 007/224] Require `cuda` compiler on `linux` --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bf1a9f37..10d37656 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -32,6 +32,7 @@ outputs: build: - {{ compiler('c') }} - {{ compiler('cxx') }} + - {{ compiler('cuda') }} # [linux] - {{ compiler('fortran') }} - autoconf # [unix] - automake # [unix] From 8c4a83007e752a6ae2fc22533dbf7d21908b5f83 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 10:35:44 +0000 Subject: [PATCH 008/224] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.03.28.09.32.54 --- .azure-pipelines/azure-pipelines-linux.yml | 40 ++++++++++-- ...rtran_compiler_version10mpi_typeconda.yaml | 39 +++++++++++ ...an_compiler_version10mpi_typeexternal.yaml | 39 +++++++++++ ...rtran_compiler_version10mpi_typeconda.yaml | 39 +++++++++++ ...an_compiler_version10mpi_typeexternal.yaml | 39 +++++++++++ ...rtran_compiler_version11mpi_typeconda.yaml | 39 +++++++++++ ...an_compiler_version11mpi_typeexternal.yaml | 39 +++++++++++ ...rtran_compiler_version7mpi_typeconda.yaml} | 13 +++- ...an_compiler_version7mpi_typeexternal.yaml} | 13 +++- ...ortran_compiler_version9mpi_typeconda.yaml | 39 +++++++++++ ...ran_compiler_version9mpi_typeexternal.yaml | 39 +++++++++++ .ci_support/linux_aarch64_mpi_typeconda.yaml | 7 ++ .../linux_aarch64_mpi_typeexternal.yaml | 7 ++ .ci_support/linux_ppc64le_mpi_typeconda.yaml | 7 ++ .../linux_ppc64le_mpi_typeexternal.yaml | 7 ++ .ci_support/osx_64_.yaml | 2 - .ci_support/osx_arm64_.yaml | 2 - README.md | 64 +++++++++++++++++-- 18 files changed, 456 insertions(+), 18 deletions(-) create mode 100644 .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml create mode 100644 .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml create mode 100644 .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml create mode 100644 .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml create mode 100644 .ci_support/linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml create mode 100644 .ci_support/linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml rename .ci_support/{linux_64_mpi_typeconda.yaml => linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeconda.yaml} (77%) rename .ci_support/{linux_64_mpi_typeexternal.yaml => linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeexternal.yaml} (77%) create mode 100644 .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeconda.yaml create mode 100644 .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeexternal.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 20166d37..41823b3b 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,14 +8,46 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_mpi_typeconda: - CONFIG: linux_64_mpi_typeconda + linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeconda: + CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeconda + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 + linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeexternal: + CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeexternal + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 + linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda: + CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal: + CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeconda: + CONFIG: linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeconda + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeexternal: + CONFIG: linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeexternal + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeconda: + CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeconda UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_64_mpi_typeexternal: - CONFIG: linux_64_mpi_typeexternal + linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeexternal: + CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeexternal UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 + linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeconda: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeconda + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 + linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeexternal: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeexternal + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 linux_aarch64_mpi_typeconda: CONFIG: linux_aarch64_mpi_typeconda UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml new file mode 100644 index 00000000..45886581 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml @@ -0,0 +1,39 @@ +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.1' +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-cuda:11.1 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '10' +mpi_type: +- conda +target_platform: +- linux-64 +ucx: +- 1.14.0 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image +zlib: +- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml new file mode 100644 index 00000000..8ca03366 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml @@ -0,0 +1,39 @@ +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.1' +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-cuda:11.1 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '10' +mpi_type: +- external +target_platform: +- linux-64 +ucx: +- 1.14.0 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image +zlib: +- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml new file mode 100644 index 00000000..3d5452c4 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml @@ -0,0 +1,39 @@ +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.2' +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-cuda:11.2 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '10' +mpi_type: +- conda +target_platform: +- linux-64 +ucx: +- 1.14.0 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image +zlib: +- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml new file mode 100644 index 00000000..b2964015 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml @@ -0,0 +1,39 @@ +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.2' +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-cuda:11.2 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '10' +mpi_type: +- external +target_platform: +- linux-64 +ucx: +- 1.14.0 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image +zlib: +- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml new file mode 100644 index 00000000..376d56a1 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -0,0 +1,39 @@ +c_compiler: +- gcc +c_compiler_version: +- '11' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- None +cxx_compiler: +- gxx +cxx_compiler_version: +- '11' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '11' +mpi_type: +- conda +target_platform: +- linux-64 +ucx: +- 1.14.0 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image +zlib: +- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml new file mode 100644 index 00000000..fa6d2472 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -0,0 +1,39 @@ +c_compiler: +- gcc +c_compiler_version: +- '11' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- None +cxx_compiler: +- gxx +cxx_compiler_version: +- '11' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '11' +mpi_type: +- external +target_platform: +- linux-64 +ucx: +- 1.14.0 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image +zlib: +- '1.2' diff --git a/.ci_support/linux_64_mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeconda.yaml similarity index 77% rename from .ci_support/linux_64_mpi_typeconda.yaml rename to .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeconda.yaml index 09a9b83f..6d4af447 100644 --- a/.ci_support/linux_64_mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeconda.yaml @@ -1,23 +1,27 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '7' cdt_name: - cos6 channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '10.2' cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '7' docker_image: - quay.io/condaforge/linux-anvil-cos7-cuda:10.2 fortran_compiler: - gfortran fortran_compiler_version: -- '11' +- '7' mpi_type: - conda target_platform: @@ -28,5 +32,8 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_64_mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeexternal.yaml similarity index 77% rename from .ci_support/linux_64_mpi_typeexternal.yaml rename to .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeexternal.yaml index c3136c45..e75a08da 100644 --- a/.ci_support/linux_64_mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeexternal.yaml @@ -1,23 +1,27 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '7' cdt_name: - cos6 channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '10.2' cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '7' docker_image: - quay.io/condaforge/linux-anvil-cos7-cuda:10.2 fortran_compiler: - gfortran fortran_compiler_version: -- '11' +- '7' mpi_type: - external target_platform: @@ -28,5 +32,8 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeconda.yaml new file mode 100644 index 00000000..dac0321a --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeconda.yaml @@ -0,0 +1,39 @@ +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.0' +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-cuda:11.0 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '9' +mpi_type: +- conda +target_platform: +- linux-64 +ucx: +- 1.14.0 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image +zlib: +- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeexternal.yaml new file mode 100644 index 00000000..e978679f --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeexternal.yaml @@ -0,0 +1,39 @@ +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.0' +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-cuda:11.0 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '9' +mpi_type: +- external +target_platform: +- linux-64 +ucx: +- 1.14.0 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image +zlib: +- '1.2' diff --git a/.ci_support/linux_aarch64_mpi_typeconda.yaml b/.ci_support/linux_aarch64_mpi_typeconda.yaml index b24a3268..25649334 100644 --- a/.ci_support/linux_aarch64_mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_mpi_typeconda.yaml @@ -12,6 +12,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- None cxx_compiler: - gxx cxx_compiler_version: @@ -32,5 +36,8 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_aarch64_mpi_typeexternal.yaml b/.ci_support/linux_aarch64_mpi_typeexternal.yaml index 12902f85..9eba2d0a 100644 --- a/.ci_support/linux_aarch64_mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_mpi_typeexternal.yaml @@ -12,6 +12,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- None cxx_compiler: - gxx cxx_compiler_version: @@ -32,5 +36,8 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_ppc64le_mpi_typeconda.yaml b/.ci_support/linux_ppc64le_mpi_typeconda.yaml index b93a53ec..d0444d5e 100644 --- a/.ci_support/linux_ppc64le_mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_mpi_typeconda.yaml @@ -8,6 +8,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- None cxx_compiler: - gxx cxx_compiler_version: @@ -28,5 +32,8 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_ppc64le_mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_mpi_typeexternal.yaml index 0956c60a..ebc82039 100644 --- a/.ci_support/linux_ppc64le_mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_mpi_typeexternal.yaml @@ -8,6 +8,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- None cxx_compiler: - gxx cxx_compiler_version: @@ -28,5 +32,8 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image zlib: - '1.2' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 967b3518..2e474631 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -22,8 +22,6 @@ mpi_type: - conda target_platform: - osx-64 -ucx: -- 1.14.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 0dda0f92..064c6f16 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -22,8 +22,6 @@ mpi_type: - conda target_platform: - osx-arm64 -ucx: -- 1.14.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/README.md b/README.md index 09748340..471dc84f 100644 --- a/README.md +++ b/README.md @@ -36,17 +36,73 @@ Current build status - + - + + + + + + + + + + + + + + + + + + + + + + + + + From efaa5cd6d39cbde3be9b0d778393b3fe7780e912 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 28 Mar 2023 03:52:10 -0700 Subject: [PATCH 009/224] Constraint `cuda` compiler version Transfer `cudatoolkit` constrain to `cuda` compiler. Also pull in associated `zip_keys` so zipping still works with these changes. --- recipe/conda_build_config.yaml | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 7aecb7b8..1bb3dea4 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,11 +1,29 @@ mpi_type: - - external # [linux] + - external # [linux] - conda -docker_image: # [linux] +c_compiler_version: # [linux] + - 7 # [linux64] + - 9 # [ppc64le] + - 9 # [aarch64] +cxx_compiler_version: # [linux] + - 7 # [linux64] + - 9 # [ppc64le] + - 9 # [aarch64] +fortran_compiler_version: # [linux] + - 7 # [linux64] + - 9 # [ppc64le] + - 9 # [aarch64] +cudnn: # [linux] + - 7 # [linux64] + - 8 # [ppc64le] + - 8 # [aarch64] +cdt_name: # [linux] + - cos7 # [linux] +docker_image: # [linux] - quay.io/condaforge/linux-anvil-cos7-cuda:10.2 # [linux64] - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 # [ppc64le] - quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 # [aarch64] -cudatoolkit: # [linux] - - 10.2 # [linux64] - - 11.0 # [ppc64le] - - 11.0 # [aarch64] +cuda_compiler_version: # [linux] + - 10.2 # [linux64] + - 11.0 # [ppc64le] + - 11.0 # [aarch64] From b175e331586dec676d6522261ec91657b1e03974 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 28 Mar 2023 03:54:39 -0700 Subject: [PATCH 010/224] Skip non-`cuda` builds on `linux` Equivalent to the previous behavior where `cuda` builds were always done on `linux`. This just skips non-`cuda` builds to restore that behavior with the `cuda` compiler. --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 10d37656..57665d6e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,6 +20,7 @@ source: build: number: {{ build }} skip: true # [win] + skip: true # [linux and cuda_compiler_version in (undefined, "None")] outputs: {% if mpi_type == 'conda' %} From 497f25505bd5a31ba55c86c5f02b43acaa909915 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 10:56:22 +0000 Subject: [PATCH 011/224] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.03.28.09.32.54 --- .azure-pipelines/azure-pipelines-linux.yml | 40 ++---------- ...rtran_compiler_version10mpi_typeconda.yaml | 39 ----------- ...an_compiler_version10mpi_typeexternal.yaml | 39 ----------- ...rtran_compiler_version10mpi_typeconda.yaml | 39 ----------- ...an_compiler_version10mpi_typeexternal.yaml | 39 ----------- ...rtran_compiler_version11mpi_typeconda.yaml | 39 ----------- ...an_compiler_version11mpi_typeexternal.yaml | 39 ----------- ...ortran_compiler_version9mpi_typeconda.yaml | 39 ----------- ...ran_compiler_version9mpi_typeexternal.yaml | 39 ----------- ...conda.yaml => linux_64_mpi_typeconda.yaml} | 2 +- ...al.yaml => linux_64_mpi_typeexternal.yaml} | 2 +- .ci_support/linux_aarch64_mpi_typeconda.yaml | 8 +-- .../linux_aarch64_mpi_typeexternal.yaml | 8 +-- .ci_support/linux_ppc64le_mpi_typeconda.yaml | 8 +-- .../linux_ppc64le_mpi_typeexternal.yaml | 8 +-- .ci_support/osx_64_.yaml | 2 + .ci_support/osx_arm64_.yaml | 2 + README.md | 64 ++----------------- 18 files changed, 30 insertions(+), 426 deletions(-) delete mode 100644 .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeconda.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeexternal.yaml rename .ci_support/{linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeconda.yaml => linux_64_mpi_typeconda.yaml} (98%) rename .ci_support/{linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeexternal.yaml => linux_64_mpi_typeexternal.yaml} (98%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 41823b3b..20166d37 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,46 +8,14 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeconda: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeconda - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 - linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeexternal: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeexternal - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 - linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeconda: - CONFIG: linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeconda - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeexternal: - CONFIG: linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeexternal - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeconda: - CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeconda + linux_64_mpi_typeconda: + CONFIG: linux_64_mpi_typeconda UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeexternal: - CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeexternal + linux_64_mpi_typeexternal: + CONFIG: linux_64_mpi_typeexternal UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeconda: - CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeconda - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 - linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeexternal: - CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeexternal - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 linux_aarch64_mpi_typeconda: CONFIG: linux_aarch64_mpi_typeconda UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml deleted file mode 100644 index 45886581..00000000 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml +++ /dev/null @@ -1,39 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.1' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.1 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '10' -mpi_type: -- conda -target_platform: -- linux-64 -ucx: -- 1.14.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -zlib: -- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml deleted file mode 100644 index 8ca03366..00000000 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml +++ /dev/null @@ -1,39 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.1' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.1 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '10' -mpi_type: -- external -target_platform: -- linux-64 -ucx: -- 1.14.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -zlib: -- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml deleted file mode 100644 index 3d5452c4..00000000 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml +++ /dev/null @@ -1,39 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '10' -mpi_type: -- conda -target_platform: -- linux-64 -ucx: -- 1.14.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -zlib: -- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml deleted file mode 100644 index b2964015..00000000 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml +++ /dev/null @@ -1,39 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '10' -mpi_type: -- external -target_platform: -- linux-64 -ucx: -- 1.14.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -zlib: -- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml deleted file mode 100644 index 376d56a1..00000000 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ /dev/null @@ -1,39 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '11' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- None -cxx_compiler: -- gxx -cxx_compiler_version: -- '11' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '11' -mpi_type: -- conda -target_platform: -- linux-64 -ucx: -- 1.14.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -zlib: -- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml deleted file mode 100644 index fa6d2472..00000000 --- a/.ci_support/linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ /dev/null @@ -1,39 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '11' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- None -cxx_compiler: -- gxx -cxx_compiler_version: -- '11' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '11' -mpi_type: -- external -target_platform: -- linux-64 -ucx: -- 1.14.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -zlib: -- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeconda.yaml deleted file mode 100644 index dac0321a..00000000 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeconda.yaml +++ /dev/null @@ -1,39 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.0' -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.0 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '9' -mpi_type: -- conda -target_platform: -- linux-64 -ucx: -- 1.14.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -zlib: -- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeexternal.yaml deleted file mode 100644 index e978679f..00000000 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeexternal.yaml +++ /dev/null @@ -1,39 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.0' -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.0 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '9' -mpi_type: -- external -target_platform: -- linux-64 -ucx: -- 1.14.0 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -zlib: -- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeconda.yaml b/.ci_support/linux_64_mpi_typeconda.yaml similarity index 98% rename from .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeconda.yaml rename to .ci_support/linux_64_mpi_typeconda.yaml index 6d4af447..aea2907a 100644 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeconda.yaml +++ b/.ci_support/linux_64_mpi_typeconda.yaml @@ -3,7 +3,7 @@ c_compiler: c_compiler_version: - '7' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeexternal.yaml b/.ci_support/linux_64_mpi_typeexternal.yaml similarity index 98% rename from .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeexternal.yaml rename to .ci_support/linux_64_mpi_typeexternal.yaml index e75a08da..4e1d9301 100644 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeexternal.yaml +++ b/.ci_support/linux_64_mpi_typeexternal.yaml @@ -3,7 +3,7 @@ c_compiler: c_compiler_version: - '7' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_aarch64_mpi_typeconda.yaml b/.ci_support/linux_aarch64_mpi_typeconda.yaml index 25649334..152bec3e 100644 --- a/.ci_support/linux_aarch64_mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_mpi_typeconda.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '11' +- '9' cdt_arch: - aarch64 cdt_name: @@ -15,17 +15,17 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- None +- '11.0' cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '9' docker_image: - quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 fortran_compiler: - gfortran fortran_compiler_version: -- '11' +- '9' mpi_type: - conda target_platform: diff --git a/.ci_support/linux_aarch64_mpi_typeexternal.yaml b/.ci_support/linux_aarch64_mpi_typeexternal.yaml index 9eba2d0a..1b7fa7b0 100644 --- a/.ci_support/linux_aarch64_mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_mpi_typeexternal.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '11' +- '9' cdt_arch: - aarch64 cdt_name: @@ -15,17 +15,17 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- None +- '11.0' cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '9' docker_image: - quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 fortran_compiler: - gfortran fortran_compiler_version: -- '11' +- '9' mpi_type: - external target_platform: diff --git a/.ci_support/linux_ppc64le_mpi_typeconda.yaml b/.ci_support/linux_ppc64le_mpi_typeconda.yaml index d0444d5e..b573365e 100644 --- a/.ci_support/linux_ppc64le_mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_mpi_typeconda.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '9' cdt_name: - cos7 channel_sources: @@ -11,17 +11,17 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- None +- '11.0' cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '9' docker_image: - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 fortran_compiler: - gfortran fortran_compiler_version: -- '11' +- '9' mpi_type: - conda target_platform: diff --git a/.ci_support/linux_ppc64le_mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_mpi_typeexternal.yaml index ebc82039..f84258f0 100644 --- a/.ci_support/linux_ppc64le_mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_mpi_typeexternal.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '9' cdt_name: - cos7 channel_sources: @@ -11,17 +11,17 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- None +- '11.0' cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '9' docker_image: - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 fortran_compiler: - gfortran fortran_compiler_version: -- '11' +- '9' mpi_type: - external target_platform: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 2e474631..b96872eb 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -8,6 +8,8 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler_version: +- None cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 064c6f16..127e016e 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -8,6 +8,8 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler_version: +- None cxx_compiler: - clangxx cxx_compiler_version: diff --git a/README.md b/README.md index 471dc84f..09748340 100644 --- a/README.md +++ b/README.md @@ -36,73 +36,17 @@ Current build status
VariantStatus
linux_64_mpi_typecondalinux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeconda - variant + variant
linux_64_mpi_typeexternallinux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeexternal - variant + variant + +
linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda + + variant + +
linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal + + variant + +
linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeconda + + variant + +
linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeexternal + + variant + +
linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeconda + + variant + +
linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeexternal + + variant + +
linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeconda + + variant + +
linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeexternal + + variant
- + - + - - - - - - - - - - - - - - - - - - - - - - - - From 930c16e130ef0ee9793b5c37621a6936dcfb6ff6 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 28 Mar 2023 04:01:16 -0700 Subject: [PATCH 012/224] Make `cudatoolkit` optional (again) Restores the behavior of `cudatoolkit` being optional when using the `cuda` compiler. --- recipe/meta.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 57665d6e..1719775c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -29,11 +29,13 @@ outputs: build: run_exports: - {{ pin_subpackage('openmpi', min_pin='x.x.x', max_pin='x') }} + ignore_run_exports_from: + - {{ compiler('cuda') }} # [linux] requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - - {{ compiler('cuda') }} # [linux] + - {{ compiler('cuda') }} # [linux] - {{ compiler('fortran') }} - autoconf # [unix] - automake # [unix] @@ -46,6 +48,8 @@ outputs: run: - zlib - mpi 1.0 openmpi + run_constrained: + - cudatoolkit >={{ cuda_compiler_version }} # [linux] test: script: run_test.sh files: From 1566c0b33a80f6b5d3ca12718d12ba29e7c84c30 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 28 Mar 2023 04:02:07 -0700 Subject: [PATCH 013/224] Drop extra `` --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1719775c..1cd3a316 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -49,7 +49,7 @@ outputs: - zlib - mpi 1.0 openmpi run_constrained: - - cudatoolkit >={{ cuda_compiler_version }} # [linux] + - cudatoolkit >={{ cuda_compiler_version }} # [linux] test: script: run_test.sh files: From 0092d50667d6d79bd2bb1b1a22ee3a1280875335 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 28 Mar 2023 04:06:02 -0700 Subject: [PATCH 014/224] Bump `build/number` to `2` --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1cd3a316..de83faa3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set version = "4.1.5" %} {% set major = version.rpartition('.')[0] %} -{% set build = 1 %} +{% set build = 2 %} # give conda package a higher build number {% if mpi_type == 'conda' %} From a1663f3ba5192b70e974298b16e8783903f1d8c6 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 28 Mar 2023 04:23:27 -0700 Subject: [PATCH 015/224] Align on GCC 9 (w/CUDA 11.0) on Linux GCC 7 (used with CUDA 10.2) has configuration errors due to missing features. Plus all other architectures use GCC 9 (with CUDA 11.0). So go ahead and align on GCC 9 (with CUDA 11.0). --- recipe/conda_build_config.yaml | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 1bb3dea4..da4c3925 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -2,28 +2,18 @@ mpi_type: - external # [linux] - conda c_compiler_version: # [linux] - - 7 # [linux64] - - 9 # [ppc64le] - - 9 # [aarch64] + - 9 # [linux] cxx_compiler_version: # [linux] - - 7 # [linux64] - - 9 # [ppc64le] - - 9 # [aarch64] + - 9 # [linux] fortran_compiler_version: # [linux] - - 7 # [linux64] - - 9 # [ppc64le] - - 9 # [aarch64] + - 9 # [linux] cudnn: # [linux] - - 7 # [linux64] - - 8 # [ppc64le] - - 8 # [aarch64] + - 8 # [linux] cdt_name: # [linux] - cos7 # [linux] docker_image: # [linux] - - quay.io/condaforge/linux-anvil-cos7-cuda:10.2 # [linux64] + - quay.io/condaforge/linux-anvil-cos7-cuda:11.0 # [linux64] - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 # [ppc64le] - quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 # [aarch64] cuda_compiler_version: # [linux] - - 10.2 # [linux64] - - 11.0 # [ppc64le] - - 11.0 # [aarch64] + - 11.0 # [linux] From eac11375d59604f42c032f646fc468370808e1a0 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 11:25:47 +0000 Subject: [PATCH 016/224] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.03.28.09.32.54 --- .azure-pipelines/azure-pipelines-linux.yml | 4 ++-- .ci_support/linux_64_mpi_typeconda.yaml | 10 +++++----- .ci_support/linux_64_mpi_typeexternal.yaml | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 20166d37..88527856 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,11 +11,11 @@ jobs: linux_64_mpi_typeconda: CONFIG: linux_64_mpi_typeconda UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:11.0 linux_64_mpi_typeexternal: CONFIG: linux_64_mpi_typeexternal UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:11.0 linux_aarch64_mpi_typeconda: CONFIG: linux_aarch64_mpi_typeconda UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_mpi_typeconda.yaml b/.ci_support/linux_64_mpi_typeconda.yaml index aea2907a..54e4b68b 100644 --- a/.ci_support/linux_64_mpi_typeconda.yaml +++ b/.ci_support/linux_64_mpi_typeconda.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '7' +- '9' cdt_name: - cos7 channel_sources: @@ -11,17 +11,17 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '10.2' +- '11.0' cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- quay.io/condaforge/linux-anvil-cos7-cuda:10.2 +- quay.io/condaforge/linux-anvil-cos7-cuda:11.0 fortran_compiler: - gfortran fortran_compiler_version: -- '7' +- '9' mpi_type: - conda target_platform: diff --git a/.ci_support/linux_64_mpi_typeexternal.yaml b/.ci_support/linux_64_mpi_typeexternal.yaml index 4e1d9301..36aafd27 100644 --- a/.ci_support/linux_64_mpi_typeexternal.yaml +++ b/.ci_support/linux_64_mpi_typeexternal.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '7' +- '9' cdt_name: - cos7 channel_sources: @@ -11,17 +11,17 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '10.2' +- '11.0' cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- quay.io/condaforge/linux-anvil-cos7-cuda:10.2 +- quay.io/condaforge/linux-anvil-cos7-cuda:11.0 fortran_compiler: - gfortran fortran_compiler_version: -- '7' +- '9' mpi_type: - external target_platform: From 5d52d9718cea6eb2c3ff63f064e990d364b4d7f4 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 28 Mar 2023 04:29:55 -0700 Subject: [PATCH 017/224] Drop `cos7` from Linux `x86_64` image name The CUDA 11.0 image on Linux `x86_64` is already on CentOS 7 (as opposed to CentOS 6 with older CUDA images). So drop the `cos7` portion from the name. --- recipe/conda_build_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index da4c3925..e8b3695f 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -12,7 +12,7 @@ cudnn: # [linux] cdt_name: # [linux] - cos7 # [linux] docker_image: # [linux] - - quay.io/condaforge/linux-anvil-cos7-cuda:11.0 # [linux64] + - quay.io/condaforge/linux-anvil-cuda:11.0 # [linux64] - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 # [ppc64le] - quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 # [aarch64] cuda_compiler_version: # [linux] From b1c2e7f3ed560ffe74a76876b794d9767f03d810 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 11:31:52 +0000 Subject: [PATCH 018/224] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.03.28.09.32.54 --- .azure-pipelines/azure-pipelines-linux.yml | 4 ++-- .ci_support/linux_64_mpi_typeconda.yaml | 2 +- .ci_support/linux_64_mpi_typeexternal.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 88527856..e7e52ae9 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,11 +11,11 @@ jobs: linux_64_mpi_typeconda: CONFIG: linux_64_mpi_typeconda UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:11.0 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 linux_64_mpi_typeexternal: CONFIG: linux_64_mpi_typeexternal UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:11.0 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 linux_aarch64_mpi_typeconda: CONFIG: linux_aarch64_mpi_typeconda UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_mpi_typeconda.yaml b/.ci_support/linux_64_mpi_typeconda.yaml index 54e4b68b..dac0321a 100644 --- a/.ci_support/linux_64_mpi_typeconda.yaml +++ b/.ci_support/linux_64_mpi_typeconda.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-cos7-cuda:11.0 +- quay.io/condaforge/linux-anvil-cuda:11.0 fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_64_mpi_typeexternal.yaml b/.ci_support/linux_64_mpi_typeexternal.yaml index 36aafd27..e978679f 100644 --- a/.ci_support/linux_64_mpi_typeexternal.yaml +++ b/.ci_support/linux_64_mpi_typeexternal.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-cos7-cuda:11.0 +- quay.io/condaforge/linux-anvil-cuda:11.0 fortran_compiler: - gfortran fortran_compiler_version: From 6005eb035e4172f5e0ece4db5ac881e338a15d16 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 28 Mar 2023 21:48:52 -0700 Subject: [PATCH 019/224] Update to GCC 10 Switch to CUDA 11.1 to allow updating to GCC 10. --- recipe/conda_build_config.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index e8b3695f..f446d5b4 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -2,18 +2,18 @@ mpi_type: - external # [linux] - conda c_compiler_version: # [linux] - - 9 # [linux] + - 10 # [linux] cxx_compiler_version: # [linux] - - 9 # [linux] + - 10 # [linux] fortran_compiler_version: # [linux] - - 9 # [linux] + - 10 # [linux] cudnn: # [linux] - 8 # [linux] cdt_name: # [linux] - cos7 # [linux] docker_image: # [linux] - - quay.io/condaforge/linux-anvil-cuda:11.0 # [linux64] - - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 # [ppc64le] - - quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 # [aarch64] + - quay.io/condaforge/linux-anvil-cuda:11.1 # [linux64] + - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.1 # [ppc64le] + - quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 # [aarch64] cuda_compiler_version: # [linux] - - 11.0 # [linux] + - 11.1 # [linux] From a0bc3d3e127be28887ba4e0a9860cbe94e1f4a7a Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 29 Mar 2023 04:50:43 +0000 Subject: [PATCH 020/224] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.03.28.22.53.26 --- .azure-pipelines/azure-pipelines-linux.yml | 12 ++++++------ .ci_support/linux_64_mpi_typeconda.yaml | 10 +++++----- .ci_support/linux_64_mpi_typeexternal.yaml | 10 +++++----- .ci_support/linux_aarch64_mpi_typeconda.yaml | 10 +++++----- .ci_support/linux_aarch64_mpi_typeexternal.yaml | 10 +++++----- .ci_support/linux_ppc64le_mpi_typeconda.yaml | 10 +++++----- .ci_support/linux_ppc64le_mpi_typeexternal.yaml | 10 +++++----- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index e7e52ae9..123a1056 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,27 +11,27 @@ jobs: linux_64_mpi_typeconda: CONFIG: linux_64_mpi_typeconda UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 linux_64_mpi_typeexternal: CONFIG: linux_64_mpi_typeexternal UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 linux_aarch64_mpi_typeconda: CONFIG: linux_aarch64_mpi_typeconda UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 linux_aarch64_mpi_typeexternal: CONFIG: linux_aarch64_mpi_typeexternal UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 linux_ppc64le_mpi_typeconda: CONFIG: linux_ppc64le_mpi_typeconda UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.1 linux_ppc64le_mpi_typeexternal: CONFIG: linux_ppc64le_mpi_typeexternal UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.1 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_mpi_typeconda.yaml b/.ci_support/linux_64_mpi_typeconda.yaml index dac0321a..45886581 100644 --- a/.ci_support/linux_64_mpi_typeconda.yaml +++ b/.ci_support/linux_64_mpi_typeconda.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -11,17 +11,17 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.0' +- '11.1' cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.0 +- quay.io/condaforge/linux-anvil-cuda:11.1 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' mpi_type: - conda target_platform: diff --git a/.ci_support/linux_64_mpi_typeexternal.yaml b/.ci_support/linux_64_mpi_typeexternal.yaml index e978679f..8ca03366 100644 --- a/.ci_support/linux_64_mpi_typeexternal.yaml +++ b/.ci_support/linux_64_mpi_typeexternal.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -11,17 +11,17 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.0' +- '11.1' cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.0 +- quay.io/condaforge/linux-anvil-cuda:11.1 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' mpi_type: - external target_platform: diff --git a/.ci_support/linux_aarch64_mpi_typeconda.yaml b/.ci_support/linux_aarch64_mpi_typeconda.yaml index 152bec3e..7ea8b115 100644 --- a/.ci_support/linux_aarch64_mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_mpi_typeconda.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: @@ -15,17 +15,17 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.0' +- '11.1' cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 +- quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' mpi_type: - conda target_platform: diff --git a/.ci_support/linux_aarch64_mpi_typeexternal.yaml b/.ci_support/linux_aarch64_mpi_typeexternal.yaml index 1b7fa7b0..a591502e 100644 --- a/.ci_support/linux_aarch64_mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_mpi_typeexternal.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: @@ -15,17 +15,17 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.0' +- '11.1' cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 +- quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' mpi_type: - external target_platform: diff --git a/.ci_support/linux_ppc64le_mpi_typeconda.yaml b/.ci_support/linux_ppc64le_mpi_typeconda.yaml index b573365e..ed90c8a1 100644 --- a/.ci_support/linux_ppc64le_mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_mpi_typeconda.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -11,17 +11,17 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.0' +- '11.1' cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 +- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.1 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' mpi_type: - conda target_platform: diff --git a/.ci_support/linux_ppc64le_mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_mpi_typeexternal.yaml index f84258f0..c5fd3132 100644 --- a/.ci_support/linux_ppc64le_mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_mpi_typeexternal.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -11,17 +11,17 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.0' +- '11.1' cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 +- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.1 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' mpi_type: - external target_platform: From 42a61adc0b20ba07eebfbb996212348d1e2465bf Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 26 Oct 2023 14:59:08 +0000 Subject: [PATCH 021/224] updated v5.0.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 05739cc3..3dbde841 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ -{% set version = "4.1.6" %} +{% set version = "5.0.0" %} {% set major = version.rpartition('.')[0] %} -{% set build = 1 %} +{% set build = 0 %} # give conda package a higher build number {% if mpi_type == 'conda' %} @@ -15,7 +15,7 @@ package: source: fn: openmpi-{{ version }}.tar.bz2 url: https://www.open-mpi.org/software/ompi/v{{ major }}/downloads/openmpi-{{ version }}.tar.bz2 - sha256: f740994485516deb63b5311af122c265179f5328a0d857a567b85db00b11e415 + sha256: 9d845ca94bc1aeb445f83d98d238cd08f6ec7ad0f73b0f79ec1668dbfdacd613 build: number: {{ build }} From af96fa941fbeb152ec98c405a33622205b2e1791 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 26 Oct 2023 14:59:33 +0000 Subject: [PATCH 022/224] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and conda-forge-pinning 2023.10.26.11.34.06 --- .ci_support/migrations/ucx1150.yaml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 .ci_support/migrations/ucx1150.yaml diff --git a/.ci_support/migrations/ucx1150.yaml b/.ci_support/migrations/ucx1150.yaml deleted file mode 100644 index d23514a6..00000000 --- a/.ci_support/migrations/ucx1150.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -ucx: -- '1.15.0' -migrator_ts: 1696558865 From 8540c16a3fc4b10d5a55aed608e677ffe32d6363 Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Fri, 27 Oct 2023 09:57:07 +0300 Subject: [PATCH 023/224] recipe: Update build and test scripts --- recipe/build-mpi.sh | 69 ++++++++++++++++++---------------- recipe/conda_build_config.yaml | 15 +++++--- recipe/meta.yaml | 35 ++++++++++------- recipe/mpiexec.sh | 4 -- recipe/post-link-cuda.sh | 14 +++++++ recipe/post-link-ucx.sh | 13 +++++++ recipe/post-link.sh | 17 --------- recipe/run_test.sh | 26 ++++++++----- 8 files changed, 111 insertions(+), 82 deletions(-) delete mode 100755 recipe/mpiexec.sh create mode 100644 recipe/post-link-cuda.sh create mode 100644 recipe/post-link-ucx.sh delete mode 100644 recipe/post-link.sh diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 40e78746..5255ae6e 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -1,32 +1,37 @@ #!/bin/bash -# unset unused old fortran compiler vars -unset F90 F77 - set -ex -export FCFLAGS="$FFLAGS" - # avoid absolute-paths in compilers export CC=$(basename "$CC") export CXX=$(basename "$CXX") export FC=$(basename "$FC") -./autogen.pl --force +# unset unused Fortran compiler variables +unset FFLAGS F77 F90 F95 +# tweak compiler flags +export LIBRARY_PATH="$PREFIX/lib" if [[ "$target_platform" == osx-* ]]; then - if [[ ! -z "$CONDA_BUILD_SYSROOT" ]]; then + if [[ -n "$CONDA_BUILD_SYSROOT" ]]; then export CFLAGS="$CFLAGS -isysroot $CONDA_BUILD_SYSROOT" export CXXFLAGS="$CXXFLAGS -isysroot $CONDA_BUILD_SYSROOT" fi fi -if [[ -z $CUDA_HOME ]]; then - build_with_cuda="" -else +# UCX support +build_with_ucx="" +if [[ "$target_platform" == linux-* ]]; then + build_with_ucx="--with-ucx=$PREFIX" +fi + +# CUDA support +build_with_cuda="" +if [[ -n "$CUDA_HOME" ]]; then + build_with_cuda="--with-cuda=yes" export CFLAGS="$CFLAGS -I$CUDA_HOME/include" export CXXFLAGS="$CXXFLAGS -I$CUDA_HOME/include" - build_with_cuda="--with-cuda --with-ucx=$PREFIX" + export LDFLAGS="$LDFLAGS -L$CUDA_HOME/lib64/stubs" fi if [[ $CONDA_BUILD_CROSS_COMPILATION == "1" && $target_platform == osx-arm64 ]]; then @@ -132,15 +137,6 @@ if [[ $CONDA_BUILD_CROSS_COMPILATION == "1" && $target_platform == osx-arm64 ]] export ompi_cv_fortran_use_only=yes fi -export LIBRARY_PATH="$PREFIX/lib" - -## Replaced by the patch from open-mpi/ompi#8361 -# if [[ "$target_platform" == *-64 ]]; then -# # -march=skylake-avx512 -march=nocona invalidates AVX512 flag. Remove -march flags and -mtune flags -# export CFLAGS=$(echo $CFLAGS | sed 's/-march=[a-z0-9\-]*//g') -# export CFLAGS=$(echo $CFLAGS | sed 's/-mtune=[a-z0-9\-]*//g') -# fi - ./configure --prefix=$PREFIX \ --disable-dependency-tracking \ --enable-mpi-fortran \ @@ -151,23 +147,32 @@ export LIBRARY_PATH="$PREFIX/lib" --with-wrapper-fcflags="-I$PREFIX/include" \ --with-wrapper-ldflags="-L$PREFIX/lib -Wl,-rpath,$PREFIX/lib" \ --with-sge \ - $build_with_cuda || (cat config.log; false) + --with-hwloc=$PREFIX \ + --with-libevent=$PREFIX \ + --with-zlib=$PREFIX \ + --enable-mca-dso \ + $build_with_ucx \ + $build_with_cuda \ + || (cat config.log; false) make -j"${CPU_COUNT:-1}" make install -if [ ! -z "$build_with_cuda" ]; then - echo "setting the mca opal_warn_on_missing_libcuda to 0..." - echo "opal_warn_on_missing_libcuda = 0" >> $PREFIX/etc/openmpi-mca-params.conf - echo "setting the mca opal_cuda_support to 0..." - echo "opal_cuda_support = 0" >> $PREFIX/etc/openmpi-mca-params.conf - - echo "setting the mca pml to ^ucx..." +POST_LINK=$PREFIX/bin/.openmpi-post-link.sh +if [ -n "$build_with_ucx" ]; then + echo "setting MCA pml to ^ucx..." echo "pml = ^ucx" >> $PREFIX/etc/openmpi-mca-params.conf - echo "setting the mca osc to ^ucx..." + echo "setting MCA osc to ^ucx..." echo "osc = ^ucx" >> $PREFIX/etc/openmpi-mca-params.conf - - POST_LINK=$PREFIX/bin/.openmpi-post-link.sh - cp $RECIPE_DIR/post-link.sh $POST_LINK + cat $RECIPE_DIR/post-link-ucx.sh >> $POST_LINK +fi +if [ -n "$build_with_cuda" ]; then + echo "setting MCA opal_warn_on_missing_libcuda to 0..." + echo "opal_warn_on_missing_libcuda = 0" >> $PREFIX/etc/openmpi-mca-params.conf + echo "setting MCA opal_cuda_support to 0..." + echo "opal_cuda_support = 0" >> $PREFIX/etc/openmpi-mca-params.conf + cat $RECIPE_DIR/post-link-cuda.sh >> $POST_LINK +fi +if [ -f $POST_LINK ]; then chmod +x $POST_LINK fi diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 9badca02..e4b05e9f 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -5,10 +5,13 @@ docker_image: # [linux] - quay.io/condaforge/linux-anvil-cos7-cuda:10.2 # [linux64] - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 # [ppc64le] - quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 # [aarch64] -cudatoolkit: # [linux] - - 10.2 # [linux64] - - 11.0 # [ppc64le] - - 11.0 # [aarch64] +enable_ucx: + - True # [linux] + - False # [not linux] enable_cuda: - - True # [linux] - - False # [not linux] + - True # [linux] + - False # [not linux] +cuda_version: # [linux] + - 10.2 # [linux64] + - 11.0 # [ppc64le] + - 11.0 # [aarch64] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3dbde841..0c33a2b0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -29,33 +29,43 @@ outputs: run_exports: - {{ pin_subpackage('openmpi', min_pin='x.x.x', max_pin='x') }} ignore_run_exports: - - ucx # [enable_cuda] + - ucx # [enable_ucx] script_env: - - CUDA_HOME # [enable_cuda] + - CUDA_HOME # [enable_cuda] requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - {{ compiler('fortran') }} - - autoconf # [unix] - - automake # [unix] + #- autoconf # [unix] + #- automake # [unix] - libtool # [unix] - make # [unix] - - perl 5.26.2 host: + #- openpmix + #- prrte + - libhwloc + - libevent - zlib - - ucx # [enable_cuda] - - ucx-proc =*=gpu # [enable_cuda] + - ucx # [enable_ucx] + - cuda-version {{ cuda_version }} # [enable_cuda] run: - - zlib - mpi 1.0 openmpi + #- openpmix + #- prrte + - libhwloc + - libevent + - zlib run_constrained: - - cudatoolkit >= {{ cudatoolkit }} # [enable_cuda] - - {{ pin_compatible("ucx", max_pin="x") }} # [enable_cuda] + - {{ pin_compatible("ucx", max_pin="x.x") }} # [enable_ucx] + # Open MPI only uses CUDA Driver APIs, set the minimal driver version + - __cuda >= {{ cuda_version }} # [enable_cuda] + # Ensure a consistent CUDA environment + - cuda-version >= {{ cuda_version }} # [enable_cuda] + - cudatoolkit >= {{ cuda_version }} # [enable_cuda] test: script: run_test.sh files: - - mpiexec.sh - tests/helloworld.sh - name: openmpi-mpicc @@ -73,7 +83,6 @@ outputs: test: script: run_test.sh files: - - mpiexec.sh - tests/helloworld.c - name: openmpi-mpicxx @@ -91,7 +100,6 @@ outputs: test: script: run_test.sh files: - - mpiexec.sh - tests/helloworld.cxx - name: openmpi-mpifort @@ -108,7 +116,6 @@ outputs: test: script: run_test.sh files: - - mpiexec.sh - tests/helloworld.f - tests/helloworld.f90 {% else %} diff --git a/recipe/mpiexec.sh b/recipe/mpiexec.sh deleted file mode 100755 index 5b401fa0..00000000 --- a/recipe/mpiexec.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -euo pipefail -# pipe stdout, stderr through cat to avoid O_NONBLOCK issues -exec mpiexec --allow-run-as-root "$@" 2>&1> $PREFIX/.messages.txt + +On Linux, Open MPI is built with CUDA awareness but it is disabled by default. +To enable it, please set the environment variable +OMPI_MCA_opal_cuda_support=true +before launching your MPI processes. +Equivalently, you can set the MCA parameter in the command line: +mpiexec --mca opal_cuda_support 1 ... +Note that you might also need to set UCX_MEMTYPE_CACHE=n for CUDA awareness via +UCX. Please consult UCX documentation for further details. + +EOF diff --git a/recipe/post-link-ucx.sh b/recipe/post-link-ucx.sh new file mode 100644 index 00000000..2cf94669 --- /dev/null +++ b/recipe/post-link-ucx.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +cat << EOF >> $PREFIX/.messages.txt + +On Linux, Open MPI is built with UCX support but it is disabled by default. +To enable it, first install UCX (conda install -c conda-forge ucx). +Afterwards, set the environment variables +OMPI_MCA_pml=ucx OMPI_MCA_osc=ucx +before launching your MPI processes. +Equivalently, you can set the MCA parameters in the command line: +mpiexec --mca pml ucx --mca osc ucx ... + +EOF diff --git a/recipe/post-link.sh b/recipe/post-link.sh deleted file mode 100644 index 8a45c74a..00000000 --- a/recipe/post-link.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -echo " " >> $PREFIX/.messages.txt -echo "For Linux 64, Open MPI is built with CUDA awareness but this support is disabled by default." >> $PREFIX/.messages.txt -echo "To enable it, please set the environment variable OMPI_MCA_opal_cuda_support=true before" >> $PREFIX/.messages.txt -echo "launching your MPI processes. Equivalently, you can set the MCA parameter in the command line:" >> $PREFIX/.messages.txt -echo "mpiexec --mca opal_cuda_support 1 ..." >> $PREFIX/.messages.txt -echo " " >> $PREFIX/.messages.txt - -echo "In addition, the UCX support is also built but disabled by default." >> $PREFIX/.messages.txt -echo "To enable it, first install UCX (conda install -c conda-forge ucx). Then, set the environment" >> $PREFIX/.messages.txt -echo "variables OMPI_MCA_pml=\"ucx\" OMPI_MCA_osc=\"ucx\" before launching your MPI processes." >> $PREFIX/.messages.txt -echo "Equivalently, you can set the MCA parameters in the command line:" >> $PREFIX/.messages.txt -echo "mpiexec --mca pml ucx --mca osc ucx ..." >> $PREFIX/.messages.txt -echo "Note that you might also need to set UCX_MEMTYPE_CACHE=n for CUDA awareness via UCX." >> $PREFIX/.messages.txt -echo "Please consult UCX's documentation for detail." >> $PREFIX/.messages.txt -echo " " >> $PREFIX/.messages.txt diff --git a/recipe/run_test.sh b/recipe/run_test.sh index a4a67eb1..33b609a0 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -1,26 +1,34 @@ #!/bin/bash set -ex -export OMPI_MCA_plm=isolated -export OMPI_MCA_btl_vader_single_copy_mechanism=none -export OMPI_MCA_rmaps_base_oversubscribe=yes -MPIEXEC="${PWD}/mpiexec.sh" +export OMPI_MCA_pml=ob1 +export OMPI_MCA_btl=sm,self +export OMPI_MCA_plm_ssh_agent=false +export OMPI_MCA_rmaps_default_mapping_policy=:oversubscribe +export OMPI_ALLOW_RUN_AS_ROOT=1 +export OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1 +MPIEXEC="mpiexec" pushd "tests" if [[ $PKG_NAME == "openmpi" ]]; then - command -v ompi_info - ompi_info - if [[ ! -z "$(conda list | grep ucx)" ]]; then + if [[ -n "$(conda list | grep ucx)" ]]; then echo "Improper UCX dependency!" exit 1 fi - if [[ ! -z "$(conda list | grep cudatoolkit)" ]]; then - echo "Improper cuda dependency!" + + if [[ -n "$(conda list | grep cuda-version)" ]]; then + echo "Improper CUDA dependency!" exit 1 fi + command -v ompi_info + ompi_info + + command -v prte_info + prte_info + command -v mpiexec $MPIEXEC --help $MPIEXEC -n 4 ./helloworld.sh From cfadcd3b6ac6bb64700054e45e33c361d63d329a Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Mon, 13 Nov 2023 12:55:10 +0300 Subject: [PATCH 024/224] recipe: Upgrade linux64 to CUDA 11.2 --- recipe/conda_build_config.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index e4b05e9f..b16eacc9 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -2,9 +2,9 @@ mpi_type: - external # [linux] - conda docker_image: # [linux] - - quay.io/condaforge/linux-anvil-cos7-cuda:10.2 # [linux64] - - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 # [ppc64le] - - quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 # [aarch64] + - quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64] + - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 # [ppc64le] + - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 # [aarch64] enable_ucx: - True # [linux] - False # [not linux] @@ -12,6 +12,6 @@ enable_cuda: - True # [linux] - False # [not linux] cuda_version: # [linux] - - 10.2 # [linux64] - - 11.0 # [ppc64le] - - 11.0 # [aarch64] + - 11.2 # [linux64] + - 11.2 # [ppc64le] + - 11.2 # [aarch64] From 5b6c074602dc9dfa6d32a548848e3dda4f178e66 Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Thu, 21 Dec 2023 10:54:44 -0300 Subject: [PATCH 025/224] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.30.2, and conda-forge-pinning 2023.12.21.09.51.46 --- .azure-pipelines/azure-pipelines-linux.yml | 15 +++++++++------ .azure-pipelines/azure-pipelines-osx.yml | 3 +++ .ci_support/linux_64_mpi_typeconda.yaml | 10 +++++++--- .ci_support/linux_64_mpi_typeexternal.yaml | 10 +++++++--- .ci_support/linux_aarch64_mpi_typeconda.yaml | 10 +++++++--- .ci_support/linux_aarch64_mpi_typeexternal.yaml | 10 +++++++--- .ci_support/linux_ppc64le_mpi_typeconda.yaml | 10 +++++++--- .ci_support/linux_ppc64le_mpi_typeexternal.yaml | 10 +++++++--- .ci_support/osx_64_.yaml | 4 ++++ .ci_support/osx_arm64_.yaml | 4 ++++ .gitignore | 14 ++++++++++++-- .scripts/build_steps.sh | 15 ++++++++++++--- .scripts/run_docker_build.sh | 3 +++ .scripts/run_osx_build.sh | 13 ++++++++++--- README.md | 2 +- 15 files changed, 100 insertions(+), 33 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index ce171708..a0e2f018 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,27 +11,27 @@ jobs: linux_64_mpi_typeconda: CONFIG: linux_64_mpi_typeconda UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 linux_64_mpi_typeexternal: CONFIG: linux_64_mpi_typeexternal UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 linux_aarch64_mpi_typeconda: CONFIG: linux_aarch64_mpi_typeconda UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 linux_aarch64_mpi_typeexternal: CONFIG: linux_aarch64_mpi_typeexternal UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 linux_ppc64le_mpi_typeconda: CONFIG: linux_ppc64le_mpi_typeconda UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 linux_ppc64le_mpi_typeexternal: CONFIG: linux_ppc64le_mpi_typeexternal UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 timeoutInMinutes: 360 steps: @@ -45,6 +45,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 8032e967..f3ff0633 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -20,6 +20,9 @@ jobs: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.ci_support/linux_64_mpi_typeconda.yaml b/.ci_support/linux_64_mpi_typeconda.yaml index 7ca0c399..d3d55a8a 100644 --- a/.ci_support/linux_64_mpi_typeconda.yaml +++ b/.ci_support/linux_64_mpi_typeconda.yaml @@ -8,20 +8,24 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -cudatoolkit: -- '10.2' +cuda_version: +- '11.2' cxx_compiler: - gxx cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-cuda:10.2 +- quay.io/condaforge/linux-anvil-cuda:11.2 enable_cuda: - 'True' +enable_ucx: +- 'True' fortran_compiler: - gfortran fortran_compiler_version: - '12' +libevent: +- 2.1.12 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_64_mpi_typeexternal.yaml b/.ci_support/linux_64_mpi_typeexternal.yaml index 7ce8c92b..c2000102 100644 --- a/.ci_support/linux_64_mpi_typeexternal.yaml +++ b/.ci_support/linux_64_mpi_typeexternal.yaml @@ -8,20 +8,24 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -cudatoolkit: -- '10.2' +cuda_version: +- '11.2' cxx_compiler: - gxx cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-cuda:10.2 +- quay.io/condaforge/linux-anvil-cuda:11.2 enable_cuda: - 'True' +enable_ucx: +- 'True' fortran_compiler: - gfortran fortran_compiler_version: - '12' +libevent: +- 2.1.12 mpi_type: - external target_platform: diff --git a/.ci_support/linux_aarch64_mpi_typeconda.yaml b/.ci_support/linux_aarch64_mpi_typeconda.yaml index 33462f5b..8e4d450f 100644 --- a/.ci_support/linux_aarch64_mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_mpi_typeconda.yaml @@ -12,20 +12,24 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -cudatoolkit: -- '11.0' +cuda_version: +- '11.2' cxx_compiler: - gxx cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 +- quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 enable_cuda: - 'True' +enable_ucx: +- 'True' fortran_compiler: - gfortran fortran_compiler_version: - '12' +libevent: +- 2.1.12 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_aarch64_mpi_typeexternal.yaml b/.ci_support/linux_aarch64_mpi_typeexternal.yaml index c1358d42..52b4b19b 100644 --- a/.ci_support/linux_aarch64_mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_mpi_typeexternal.yaml @@ -12,20 +12,24 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -cudatoolkit: -- '11.0' +cuda_version: +- '11.2' cxx_compiler: - gxx cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 +- quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 enable_cuda: - 'True' +enable_ucx: +- 'True' fortran_compiler: - gfortran fortran_compiler_version: - '12' +libevent: +- 2.1.12 mpi_type: - external target_platform: diff --git a/.ci_support/linux_ppc64le_mpi_typeconda.yaml b/.ci_support/linux_ppc64le_mpi_typeconda.yaml index 48143ba6..415145ab 100644 --- a/.ci_support/linux_ppc64le_mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_mpi_typeconda.yaml @@ -8,20 +8,24 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -cudatoolkit: -- '11.0' +cuda_version: +- '11.2' cxx_compiler: - gxx cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 +- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 enable_cuda: - 'True' +enable_ucx: +- 'True' fortran_compiler: - gfortran fortran_compiler_version: - '12' +libevent: +- 2.1.12 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_ppc64le_mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_mpi_typeexternal.yaml index 01daf9f5..b5e15b8d 100644 --- a/.ci_support/linux_ppc64le_mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_mpi_typeexternal.yaml @@ -8,20 +8,24 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -cudatoolkit: -- '11.0' +cuda_version: +- '11.2' cxx_compiler: - gxx cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 +- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 enable_cuda: - 'True' +enable_ucx: +- 'True' fortran_compiler: - gfortran fortran_compiler_version: - '12' +libevent: +- 2.1.12 mpi_type: - external target_platform: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 5af651f1..5c59be27 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -14,10 +14,14 @@ cxx_compiler_version: - '16' enable_cuda: - 'False' +enable_ucx: +- 'False' fortran_compiler: - gfortran fortran_compiler_version: - '12' +libevent: +- 2.1.12 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 c2c21350..8b6b7604 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -14,10 +14,14 @@ cxx_compiler_version: - '16' enable_cuda: - 'False' +enable_ucx: +- 'False' fortran_compiler: - gfortran fortran_compiler_version: - '12' +libevent: +- 2.1.12 macos_machine: - arm64-apple-darwin20.0.0 mpi_type: diff --git a/.gitignore b/.gitignore index c89ecb7d..c0029107 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,13 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +* +!/conda-forge.yml -build_artifacts +!/*/ +!/recipe/** +!/.ci_support/** + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index bd9e6710..eba1dfdb 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,13 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build boa conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -55,6 +57,12 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi +if [[ "${sha:-}" == "" ]]; then + pushd ${FEEDSTOCK_ROOT} + sha=$(git rev-parse HEAD) + popd +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -68,7 +76,8 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then else conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 92362398..b70ef014 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -91,6 +91,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 870c49aa..9259eb93 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build boa conda-forge-ci-setup=4 @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -77,7 +83,8 @@ else conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/README.md b/README.md index 9c2b12dd..4da7973f 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance From 6a4279d86f102f61cc2033392191a4a81b974c83 Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Fri, 22 Dec 2023 09:44:45 -0300 Subject: [PATCH 026/224] recipe: Add libnl dependency on Linux --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0c33a2b0..bc7d72de 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -46,6 +46,7 @@ outputs: #- prrte - libhwloc - libevent + - libnl # [linux] - zlib - ucx # [enable_ucx] - cuda-version {{ cuda_version }} # [enable_cuda] @@ -55,6 +56,7 @@ outputs: #- prrte - libhwloc - libevent + - libnl # [linux] - zlib run_constrained: - {{ pin_compatible("ucx", max_pin="x.x") }} # [enable_ucx] From bfc9e21fd3fcaa27655aacd2f97dd8a91ad2384b Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Fri, 22 Dec 2023 09:45:00 -0300 Subject: [PATCH 027/224] recipe: bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bc7d72de..d89570dd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set version = "5.0.0" %} {% set major = version.rpartition('.')[0] %} -{% set build = 0 %} +{% set build = 1 %} # give conda package a higher build number {% if mpi_type == 'conda' %} From 06122189e2ad93064eb4ce21f24c474a58d2c558 Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Fri, 22 Dec 2023 12:07:01 -0300 Subject: [PATCH 028/224] recipe: Remove run_export packages from run section Co-authored-by: Leo Fang --- recipe/meta.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d89570dd..eff861e5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -54,10 +54,6 @@ outputs: - mpi 1.0 openmpi #- openpmix #- prrte - - libhwloc - - libevent - - libnl # [linux] - - zlib run_constrained: - {{ pin_compatible("ucx", max_pin="x.x") }} # [enable_ucx] # Open MPI only uses CUDA Driver APIs, set the minimal driver version From 5398207c79e98285ebeaf168dccb2f6cf158aadc Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Sat, 23 Dec 2023 22:18:47 -0300 Subject: [PATCH 029/224] recipe: Set mca_base_component_show_load_errors=0 --- recipe/build-mpi.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 5255ae6e..03b27528 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -167,6 +167,8 @@ if [ -n "$build_with_ucx" ]; then cat $RECIPE_DIR/post-link-ucx.sh >> $POST_LINK fi if [ -n "$build_with_cuda" ]; then + echo "setting MCA mca_base_component_show_load_errors to 0..." + echo "mca_base_component_show_load_errors = 0" >> $PREFIX/etc/openmpi-mca-params.conf echo "setting MCA opal_warn_on_missing_libcuda to 0..." echo "opal_warn_on_missing_libcuda = 0" >> $PREFIX/etc/openmpi-mca-params.conf echo "setting MCA opal_cuda_support to 0..." From d22a8f007deedae69b6559f8675ff0d424e7da1f Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Sat, 23 Dec 2023 22:19:25 -0300 Subject: [PATCH 030/224] recipe: bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index eff861e5..5891f994 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set version = "5.0.0" %} {% set major = version.rpartition('.')[0] %} -{% set build = 1 %} +{% set build = 2 %} # give conda package a higher build number {% if mpi_type == 'conda' %} From f2b86ebd677213c0c2caca6ec53abdeebb2cfdfe Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 25 Dec 2023 00:04:56 +0000 Subject: [PATCH 031/224] updated v5.0.1 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5891f994..27ed71e7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ -{% set version = "5.0.0" %} +{% set version = "5.0.1" %} {% set major = version.rpartition('.')[0] %} -{% set build = 2 %} +{% set build = 0 %} # give conda package a higher build number {% if mpi_type == 'conda' %} @@ -15,7 +15,7 @@ package: source: fn: openmpi-{{ version }}.tar.bz2 url: https://www.open-mpi.org/software/ompi/v{{ major }}/downloads/openmpi-{{ version }}.tar.bz2 - sha256: 9d845ca94bc1aeb445f83d98d238cd08f6ec7ad0f73b0f79ec1668dbfdacd613 + sha256: e357043e65fd1b956a47d0dae6156a90cf0e378df759364936c1781f1a25ef80 build: number: {{ build }} From 7e1efee434979af90896403a990248069c356285 Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Sun, 24 Dec 2023 21:35:28 -0300 Subject: [PATCH 032/224] recipe: Fix configure with CUDA --- recipe/build-mpi.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 03b27528..dd5d2041 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -28,10 +28,7 @@ fi # CUDA support build_with_cuda="" if [[ -n "$CUDA_HOME" ]]; then - build_with_cuda="--with-cuda=yes" - export CFLAGS="$CFLAGS -I$CUDA_HOME/include" - export CXXFLAGS="$CXXFLAGS -I$CUDA_HOME/include" - export LDFLAGS="$LDFLAGS -L$CUDA_HOME/lib64/stubs" + build_with_cuda="--with-cuda=$CUDA_HOME --with-cuda-libdir=$CUDA_HOME/lib64/stubs" fi if [[ $CONDA_BUILD_CROSS_COMPILATION == "1" && $target_platform == osx-arm64 ]]; then From 4b9534b65f94a8b5234f63ab1244218d621dfeee Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 5 Jan 2024 22:20:34 -0800 Subject: [PATCH 033/224] Add `cuda_compiler` for `zip_keys` --- recipe/conda_build_config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index f446d5b4..fa6dedff 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -15,5 +15,7 @@ docker_image: # [linux] - quay.io/condaforge/linux-anvil-cuda:11.1 # [linux64] - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.1 # [ppc64le] - quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 # [aarch64] +cuda_compiler: # [linux] + - nvcc # [linux] cuda_compiler_version: # [linux] - 11.1 # [linux] From aa316f7a7d4b16636a655394e1e04834f07210e3 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 6 Jan 2024 06:22:45 +0000 Subject: [PATCH 034/224] MNT: Re-rendered with conda-build 3.28.2, conda-smithy 3.30.2, and conda-forge-pinning 2024.01.05.22.51.09 --- .azure-pipelines/azure-pipelines-linux.yml | 8 +++--- .azure-pipelines/azure-pipelines-osx.yml | 3 +++ .ci_support/linux_64_mpi_typeconda.yaml | 3 ++- .ci_support/linux_64_mpi_typeexternal.yaml | 3 ++- .ci_support/linux_aarch64_mpi_typeconda.yaml | 3 ++- .../linux_aarch64_mpi_typeexternal.yaml | 3 ++- .ci_support/linux_ppc64le_mpi_typeconda.yaml | 3 ++- .../linux_ppc64le_mpi_typeexternal.yaml | 3 ++- .ci_support/osx_64_.yaml | 6 ++--- .ci_support/osx_arm64_.yaml | 6 ++--- .gitignore | 14 ++++++++-- .scripts/build_steps.sh | 20 +++++++++----- .scripts/logging_utils.sh | 4 +-- .scripts/run_docker_build.sh | 3 +++ .scripts/run_osx_build.sh | 27 ++++++++++++------- README.md | 2 +- 16 files changed, 73 insertions(+), 38 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 123a1056..35c0601e 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -35,11 +35,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | @@ -50,6 +45,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 8032e967..f3ff0633 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -20,6 +20,9 @@ jobs: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.ci_support/linux_64_mpi_typeconda.yaml b/.ci_support/linux_64_mpi_typeconda.yaml index 45886581..ca05f024 100644 --- a/.ci_support/linux_64_mpi_typeconda.yaml +++ b/.ci_support/linux_64_mpi_typeconda.yaml @@ -27,11 +27,12 @@ mpi_type: target_platform: - linux-64 ucx: -- 1.14.0 +- 1.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_64_mpi_typeexternal.yaml b/.ci_support/linux_64_mpi_typeexternal.yaml index 8ca03366..98212d9a 100644 --- a/.ci_support/linux_64_mpi_typeexternal.yaml +++ b/.ci_support/linux_64_mpi_typeexternal.yaml @@ -27,11 +27,12 @@ mpi_type: target_platform: - linux-64 ucx: -- 1.14.0 +- 1.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_aarch64_mpi_typeconda.yaml b/.ci_support/linux_aarch64_mpi_typeconda.yaml index 7ea8b115..f993a60c 100644 --- a/.ci_support/linux_aarch64_mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_mpi_typeconda.yaml @@ -31,11 +31,12 @@ mpi_type: target_platform: - linux-aarch64 ucx: -- 1.14.0 +- 1.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_aarch64_mpi_typeexternal.yaml b/.ci_support/linux_aarch64_mpi_typeexternal.yaml index a591502e..3ae58195 100644 --- a/.ci_support/linux_aarch64_mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_mpi_typeexternal.yaml @@ -31,11 +31,12 @@ mpi_type: target_platform: - linux-aarch64 ucx: -- 1.14.0 +- 1.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_ppc64le_mpi_typeconda.yaml b/.ci_support/linux_ppc64le_mpi_typeconda.yaml index ed90c8a1..ea9e7dd7 100644 --- a/.ci_support/linux_ppc64le_mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_mpi_typeconda.yaml @@ -27,11 +27,12 @@ mpi_type: target_platform: - linux-ppc64le ucx: -- 1.14.0 +- 1.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_ppc64le_mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_mpi_typeexternal.yaml index c5fd3132..707c3cc3 100644 --- a/.ci_support/linux_ppc64le_mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_mpi_typeexternal.yaml @@ -27,11 +27,12 @@ mpi_type: target_platform: - linux-ppc64le ucx: -- 1.14.0 +- 1.15.0 zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index b96872eb..e566107d 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,11 +13,11 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '16' fortran_compiler: - gfortran fortran_compiler_version: -- '11' +- '12' 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 127e016e..2fc8f12a 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,11 +13,11 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '16' fortran_compiler: - gfortran fortran_compiler_version: -- '11' +- '12' macos_machine: - arm64-apple-darwin20.0.0 mpi_type: diff --git a/.gitignore b/.gitignore index c89ecb7d..c0029107 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,13 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +* +!/conda-forge.yml -build_artifacts +!/*/ +!/recipe/** +!/.ci_support/** + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6b..eba1dfdb 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,14 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=4 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -56,6 +57,12 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi +if [[ "${sha:-}" == "" ]]; then + pushd ${FEEDSTOCK_ROOT} + sha=$(git rev-parse HEAD) + popd +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -69,7 +76,8 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then else conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c2..aff009f0 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 92362398..b70ef014 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -91,6 +91,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index bb00584b..9259eb93 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=4 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=4 @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -55,11 +61,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" -fi - - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -75,9 +76,15 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + + if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + fi + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/README.md b/README.md index 09748340..64948047 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance From 9a95fe2c91d3abe68da19bff55b3349b5c10fb55 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 5 Jan 2024 22:55:43 -0800 Subject: [PATCH 035/224] Add CUDA 11.8 migrator --- .ci_support/migrations/cuda118.yaml | 99 +++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 .ci_support/migrations/cuda118.yaml diff --git a/.ci_support/migrations/cuda118.yaml b/.ci_support/migrations/cuda118.yaml new file mode 100644 index 00000000..fdd298b9 --- /dev/null +++ b/.ci_support/migrations/cuda118.yaml @@ -0,0 +1,99 @@ +migrator_ts: 1692828152 +__migrator: + kind: + version + migration_number: + 1 + build_number: + 1 + paused: false + override_cbc_keys: + - cuda_compiler_stub + operation: key_add + check_solvable: false + primary_key: cuda_compiler_version + ordering: + cxx_compiler_version: + - 9 + - 8 + - 7 + c_compiler_version: + - 9 + - 8 + - 7 + fortran_compiler_version: + - 9 + - 8 + - 7 + docker_image: + # Native builds + - quay.io/condaforge/linux-anvil-comp7 # [os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-aarch64 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + - quay.io/condaforge/linux-anvil-ppc64le # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-armv7l # [os.environ.get("BUILD_PLATFORM") == "linux-armv7l"] + + # Legacy CUDAs + - quay.io/condaforge/linux-anvil-cuda:9.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:10.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:10.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:10.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + + # CUDA 11.2 + - quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + # CUDA 11.2 arch: native compilation (build == target) + - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + # CUDA 11.2 arch: cross-compilation (build != target) + - quay.io/condaforge/linux-anvil-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + + # CUDA 11.8 + - quay.io/condaforge/linux-anvil-cuda:11.8 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + # CUDA 11.8 arch: native compilation (build == target) + - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + # CUDA 11.8 arch: cross-compilation (build != target) + - quay.io/condaforge/linux-anvil-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.8 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + + # Native CentOS 7 image + - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + cuda_compiler_version: + - None + - 10.2 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.0 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.1 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.2 # [(linux or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.8 # [(linux or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12.0 # [(linux or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + commit_message: | + Rebuild for CUDA 11.8 w/arch support + +cuda_compiler: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cuda_compiler_version: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.8 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +c_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cxx_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +fortran_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cdt_name: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-") and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - quay.io/condaforge/linux-anvil-cuda:11.8 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + # case: native compilation (build == target) + - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + # case: cross-compilation (build != target) + - quay.io/condaforge/linux-anvil-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.8 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] From 7352c1d536f6cea4f660d54fa5da974d8210a373 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 5 Jan 2024 22:56:21 -0800 Subject: [PATCH 036/224] Bump to CUDA 11.8 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 82d7b7bc..e08f8a44 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,7 +20,7 @@ source: build: number: {{ build }} skip: true # [win] - skip: true # [enable_cuda and cuda_compiler_version != "11.2"] + skip: true # [enable_cuda and cuda_compiler_version != "11.8"] skip: true # [not enable_cuda and cuda_compiler_version != "None"] outputs: From 3e2b3dd49dfc8b88ad4f3697381a58ee2d79591a Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 6 Jan 2024 07:00:15 +0000 Subject: [PATCH 037/224] MNT: Re-rendered with conda-build 3.28.2, conda-smithy 3.30.2, and conda-forge-pinning 2024.01.05.22.51.09 --- .azure-pipelines/azure-pipelines-linux.yml | 36 +++++++++---------- ...tran_compiler_version11mpi_typeconda.yaml} | 10 +++--- ...n_compiler_version11mpi_typeexternal.yaml} | 10 +++--- ...tran_compiler_version11mpi_typeconda.yaml} | 10 +++--- ...n_compiler_version11mpi_typeexternal.yaml} | 10 +++--- ...tran_compiler_version11mpi_typeconda.yaml} | 10 +++--- ...n_compiler_version11mpi_typeexternal.yaml} | 10 +++--- README.md | 24 ++++++------- 8 files changed, 60 insertions(+), 60 deletions(-) rename .ci_support/{linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml => linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml} (88%) rename .ci_support/{linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml => linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml} (88%) rename .ci_support/{linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml => linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml} (89%) rename .ci_support/{linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml => linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml} (89%) rename .ci_support/{linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml => linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml} (87%) rename .ci_support/{linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml => linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml} (87%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 38db2d0e..ddb42f17 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,30 +8,30 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - ? linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda - : CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda + ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda + : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - ? linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal - : CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal + : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - ? linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda - : CONFIG: linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + ? linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda + : CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - ? linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal - : CONFIG: linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + ? linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal + : CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - ? linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda - : CONFIG: linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + ? linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda + : CONFIG: linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 - ? linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal - : CONFIG: linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 + ? linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal + : CONFIG: linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml similarity index 88% rename from .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 3bdd7f87..9bd1c215 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: @@ -11,13 +11,13 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.2' +- '11.8' cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.8 enable_cuda: - 'True' enable_ucx: @@ -25,7 +25,7 @@ enable_ucx: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' libevent: - 2.1.12 mpi_type: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml similarity index 88% rename from .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 18c8d34a..3a9e380c 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: @@ -11,13 +11,13 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.2' +- '11.8' cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.8 enable_cuda: - 'True' enable_ucx: @@ -25,7 +25,7 @@ enable_ucx: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' libevent: - 2.1.12 mpi_type: diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml similarity index 89% rename from .ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml rename to .ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 5b0b2997..3bf51189 100644 --- a/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: @@ -15,13 +15,13 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.2' +- '11.8' cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.8 enable_cuda: - 'True' enable_ucx: @@ -29,7 +29,7 @@ enable_ucx: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' libevent: - 2.1.12 mpi_type: diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml similarity index 89% rename from .ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml rename to .ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index e639a19b..38e3616d 100644 --- a/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: @@ -15,13 +15,13 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.2' +- '11.8' cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.8 enable_cuda: - 'True' enable_ucx: @@ -29,7 +29,7 @@ enable_ucx: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' libevent: - 2.1.12 mpi_type: diff --git a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml similarity index 87% rename from .ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml rename to .ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index c333280c..88297eba 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: @@ -11,13 +11,13 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.2' +- '11.8' cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 +- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 enable_cuda: - 'True' enable_ucx: @@ -25,7 +25,7 @@ enable_ucx: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' libevent: - 2.1.12 mpi_type: diff --git a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml similarity index 87% rename from .ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml rename to .ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 43637b40..b7ae46cc 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: @@ -11,13 +11,13 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.2' +- '11.8' cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 +- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 enable_cuda: - 'True' enable_ucx: @@ -25,7 +25,7 @@ enable_ucx: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' libevent: - 2.1.12 mpi_type: diff --git a/README.md b/README.md index 061571b0..9b2d8fac 100644 --- a/README.md +++ b/README.md @@ -36,45 +36,45 @@ Current build status
VariantStatus
linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typecondalinux_64_mpi_typeconda - variant + variant
linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10fortran_compiler_version10mpi_typeexternallinux_64_mpi_typeexternal - variant - -
linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeconda - - variant - -
linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternal - - variant - -
linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeconda - - variant - -
linux_64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11fortran_compiler_version11mpi_typeexternal - - variant - -
linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeconda - - variant - -
linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7fortran_compiler_version7mpi_typeexternal - - variant - -
linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeconda - - variant - -
linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9mpi_typeexternal - - variant + variant
- + - + - + - + - + - + From d4a7bf8d2961ae33845ad892b730c7b41f02a511 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 5 Jan 2024 23:02:34 -0800 Subject: [PATCH 038/224] Use CUDA major version to set lower bound --- recipe/meta.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e08f8a44..32c4bb71 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,6 @@ {% set version = "5.0.1" %} {% set major = version.rpartition('.')[0] %} +{% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} {% set build = 1 %} # give conda package a higher build number @@ -59,10 +60,10 @@ outputs: run_constrained: - {{ pin_compatible("ucx", max_pin="x.x") }} # [enable_ucx] # Open MPI only uses CUDA Driver APIs, set the minimal driver version - - __cuda >= {{ cuda_compiler_version }} # [enable_cuda] + - __cuda >= {{ cuda_major ~ ".0" }} # [enable_cuda] # Ensure a consistent CUDA environment - - cuda-version >= {{ cuda_compiler_version }} # [enable_cuda] - - cudatoolkit >= {{ cuda_compiler_version }} # [enable_cuda] + - cuda-version >= {{ cuda_major ~ ".0" }} # [enable_cuda] + - cudatoolkit >= {{ cuda_major ~ ".0" }} # [enable_cuda] test: script: run_test.sh files: From c4c6b396f043ffcf28e91214344d482687b0cd65 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 5 Jan 2024 23:13:20 -0800 Subject: [PATCH 039/224] Add CUDA 12.0 migrator to mark complete As this feedstock is configured, the CUDA 12.0 migrator is a no-op. Still went ahead and added it here for good measure. This way the bot would recognize this feedstock as migrated for CUDA 12.0. In effect this is true as the packages built on CUDA 11.8 could be reused with newer CUDA versions as this is only using the CUDA driver library. --- .ci_support/migrations/cuda120.yaml | 90 +++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 .ci_support/migrations/cuda120.yaml diff --git a/.ci_support/migrations/cuda120.yaml b/.ci_support/migrations/cuda120.yaml new file mode 100644 index 00000000..abfb9cb8 --- /dev/null +++ b/.ci_support/migrations/cuda120.yaml @@ -0,0 +1,90 @@ +migrator_ts: 1682985063 +__migrator: + kind: + version + migration_number: + 3 + build_number: + 1 + paused: false + override_cbc_keys: + - cuda_compiler_stub + operation: key_add + check_solvable: false + primary_key: cuda_compiler_version + ordering: + cxx_compiler_version: + - 9 + - 8 + - 7 + c_compiler_version: + - 9 + - 8 + - 7 + fortran_compiler_version: + - 9 + - 8 + - 7 + docker_image: + - quay.io/condaforge/linux-anvil-comp7 # [os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-aarch64 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + - quay.io/condaforge/linux-anvil-ppc64le # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-armv7l # [os.environ.get("BUILD_PLATFORM") == "linux-armv7l"] + - quay.io/condaforge/linux-anvil-cuda:9.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:10.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:10.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:10.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + # case: native compilation (build == target) + - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + # case: cross-compilation (build != target) + - quay.io/condaforge/linux-anvil-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + # case: non-CUDA builds + - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + cuda_compiler_version: + - None + - 10.2 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.0 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.1 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.2 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + commit_message: | + Rebuild for CUDA 12 w/arch + Windows support + + The transition to CUDA 12 SDK includes new packages for all CUDA libraries and + build tools. Notably, the cudatoolkit package no longer exists, and packages + should depend directly on the specific CUDA libraries (libcublas, libcusolver, + etc) as needed. For an in-depth overview of the changes and to report problems + [see this issue]( https://github.com/conda-forge/conda-forge.github.io/issues/1963 ). + Please feel free to raise any issues encountered there. Thank you! :pray: + +cuda_compiler: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - cuda-nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cuda_compiler_version: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +c_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cxx_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +fortran_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cdt_name: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-") and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + # case: native compilation (build == target) + - quay.io/condaforge/linux-anvil-ppc64le # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-aarch64 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + # case: cross-compilation (build != target) + - quay.io/condaforge/linux-anvil-cos7-x86_64 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cos7-x86_64 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] From 658964486325eaa0e1d04f06e23443b232a029b2 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 5 Jan 2024 23:20:16 -0800 Subject: [PATCH 040/224] Drop redundant `skip` --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 32c4bb71..86fca919 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,7 +22,6 @@ build: number: {{ build }} skip: true # [win] skip: true # [enable_cuda and cuda_compiler_version != "11.8"] - skip: true # [not enable_cuda and cuda_compiler_version != "None"] outputs: {% if mpi_type == 'conda' %} From 42d9a8059c2667f8dc797670b6d313919284c200 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 5 Jan 2024 23:22:37 -0800 Subject: [PATCH 041/224] Inline `enable_ucx` This is just an alias for `linux` at this point. So inline it to avoid indirection and improve readability. --- recipe/conda_build_config.yaml | 3 --- recipe/meta.yaml | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index d8dbb21e..e88b5039 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,9 +1,6 @@ mpi_type: - external # [linux] - conda -enable_ucx: - - True # [linux] - - False # [not linux] enable_cuda: - True # [linux] - False # [not linux] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 86fca919..f1e479e0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -31,7 +31,7 @@ outputs: run_exports: - {{ pin_subpackage('openmpi', min_pin='x.x.x', max_pin='x') }} ignore_run_exports: - - ucx # [enable_ucx] + - ucx # [linux] ignore_run_exports_from: - {{ compiler('cuda') }} # [enable_cuda] requirements: @@ -51,13 +51,13 @@ outputs: - libevent - libnl # [linux] - zlib - - ucx # [enable_ucx] + - ucx # [linux] run: - mpi 1.0 openmpi #- openpmix #- prrte run_constrained: - - {{ pin_compatible("ucx", max_pin="x.x") }} # [enable_ucx] + - {{ pin_compatible("ucx", max_pin="x.x") }} # [linux] # Open MPI only uses CUDA Driver APIs, set the minimal driver version - __cuda >= {{ cuda_major ~ ".0" }} # [enable_cuda] # Ensure a consistent CUDA environment From 5668b7d3183eacab399b91561d74991e06afb8da Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 6 Jan 2024 07:30:59 +0000 Subject: [PATCH 042/224] MNT: Re-rendered with conda-build 3.28.2, conda-smithy 3.30.2, and conda-forge-pinning 2024.01.05.22.51.09 --- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 -- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 -- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 -- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 -- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 -- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 -- .ci_support/osx_64_.yaml | 2 -- .ci_support/osx_arm64_.yaml | 2 -- 8 files changed, 16 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 9bd1c215..cd6cee15 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -20,8 +20,6 @@ docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 enable_cuda: - 'True' -enable_ucx: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 3a9e380c..0a0ce05b 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -20,8 +20,6 @@ docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 enable_cuda: - 'True' -enable_ucx: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 3bf51189..ed82c154 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -24,8 +24,6 @@ docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 enable_cuda: - 'True' -enable_ucx: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 38e3616d..12215f22 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -24,8 +24,6 @@ docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 enable_cuda: - 'True' -enable_ucx: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 88297eba..ba696277 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -20,8 +20,6 @@ docker_image: - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 enable_cuda: - 'True' -enable_ucx: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index b7ae46cc..e00cca62 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -20,8 +20,6 @@ docker_image: - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 enable_cuda: - 'True' -enable_ucx: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 880b8ba8..4a82ff55 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -16,8 +16,6 @@ cxx_compiler_version: - '16' enable_cuda: - 'False' -enable_ucx: -- 'False' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index d1f64538..c692a236 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -16,8 +16,6 @@ cxx_compiler_version: - '16' enable_cuda: - 'False' -enable_ucx: -- 'False' fortran_compiler: - gfortran fortran_compiler_version: From 80852583c42508c1ff34b064677d8adfb65f310e Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 5 Jan 2024 23:36:59 -0800 Subject: [PATCH 043/224] Obviate `enable_cuda` When `{{ compiler("cuda") }}` is used in a package, a matrix of CUDA versions is considered including a non-CUDA build. As a result, there is always a non-CUDA build. This means that we can just check whether or not the current build uses CUDA and select the packages to include accordingly. In other words there is no need for a separate `enable_cuda` value. So this rewrites the recipe logic to obviate and drop `enable_cuda`. Should make it easier to follow for those familiar with other CUDA recipes. --- recipe/conda_build_config.yaml | 3 --- recipe/meta.yaml | 13 +++++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index e88b5039..339d5f09 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,6 +1,3 @@ mpi_type: - external # [linux] - conda -enable_cuda: - - True # [linux] - - False # [not linux] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f1e479e0..83673603 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,7 +21,8 @@ source: build: number: {{ build }} skip: true # [win] - skip: true # [enable_cuda and cuda_compiler_version != "11.8"] + skip: true # [linux and cuda_compiler_version != "11.8"] + skip: true # [osx and cuda_compiler_version != "None"] outputs: {% if mpi_type == 'conda' %} @@ -33,12 +34,12 @@ outputs: ignore_run_exports: - ucx # [linux] ignore_run_exports_from: - - {{ compiler('cuda') }} # [enable_cuda] + - {{ compiler('cuda') }} # [cuda_compiler != "None"] requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - - {{ compiler('cuda') }} # [enable_cuda] + - {{ compiler('cuda') }} # [cuda_compiler != "None"] - {{ compiler('fortran') }} #- autoconf # [unix] #- automake # [unix] @@ -59,10 +60,10 @@ outputs: run_constrained: - {{ pin_compatible("ucx", max_pin="x.x") }} # [linux] # Open MPI only uses CUDA Driver APIs, set the minimal driver version - - __cuda >= {{ cuda_major ~ ".0" }} # [enable_cuda] + - __cuda >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] # Ensure a consistent CUDA environment - - cuda-version >= {{ cuda_major ~ ".0" }} # [enable_cuda] - - cudatoolkit >= {{ cuda_major ~ ".0" }} # [enable_cuda] + - cuda-version >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] + - cudatoolkit >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] test: script: run_test.sh files: From 9a2268c92ab74adedab7ba0ab50cce4a07967761 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 6 Jan 2024 07:41:50 +0000 Subject: [PATCH 044/224] MNT: Re-rendered with conda-build 3.28.2, conda-smithy 3.30.2, and conda-forge-pinning 2024.01.05.22.51.09 --- ...iler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 -- ...r_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 -- ...iler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 -- ...r_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 -- ...iler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 -- ...r_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 -- .ci_support/osx_64_.yaml | 4 ++-- .ci_support/osx_arm64_.yaml | 4 ++-- 8 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index cd6cee15..4b0eba57 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -18,8 +18,6 @@ cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 -enable_cuda: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 0a0ce05b..47e14f8e 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -18,8 +18,6 @@ cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 -enable_cuda: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index ed82c154..6ac40296 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -22,8 +22,6 @@ cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 -enable_cuda: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 12215f22..600312fb 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -22,8 +22,6 @@ cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 -enable_cuda: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index ba696277..1db5b60b 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -18,8 +18,6 @@ cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 -enable_cuda: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index e00cca62..654931ab 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -18,8 +18,6 @@ cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 -enable_cuda: -- 'True' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 4a82ff55..18e3d098 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -8,14 +8,14 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- None cuda_compiler_version: - None cxx_compiler: - clangxx cxx_compiler_version: - '16' -enable_cuda: -- 'False' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index c692a236..10337025 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -8,14 +8,14 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- None cuda_compiler_version: - None cxx_compiler: - clangxx cxx_compiler_version: - '16' -enable_cuda: -- 'False' fortran_compiler: - gfortran fortran_compiler_version: From f9d9512aeabbcfd741a1f98b3a11d516542161b1 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 6 Jan 2024 00:03:02 -0800 Subject: [PATCH 045/224] Readd `cuda-version` This wouldn't be added as `run_exports_from` `{{ compiler('cuda') }}` are ignored. So add it manually. --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 83673603..aa0b3ca8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -53,6 +53,7 @@ outputs: - libnl # [linux] - zlib - ucx # [linux] + - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] run: - mpi 1.0 openmpi #- openpmix From 7d4671a99135a06bdc58912c559ffcaa6e0b4fd9 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 6 Jan 2024 00:10:26 -0800 Subject: [PATCH 046/224] Drop unneeded `skip` --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index aa0b3ca8..f5f9bc51 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,7 +22,6 @@ build: number: {{ build }} skip: true # [win] skip: true # [linux and cuda_compiler_version != "11.8"] - skip: true # [osx and cuda_compiler_version != "None"] outputs: {% if mpi_type == 'conda' %} From 2abb406e8793518e8037f5a0f49443ceb8e1308f Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Sun, 7 Jan 2024 19:38:00 -0500 Subject: [PATCH 047/224] avoid cross compiling for linux --- conda-forge.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index 0672adc0..b135c7df 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,5 +1,4 @@ build_platform: - linux_aarch64: linux_64 osx_arm64: osx_64 conda_build: pkg_format: '2' From 605490c6902751d6826778f742d1356eb4103c59 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 00:40:27 +0000 Subject: [PATCH 048/224] MNT: Re-rendered with conda-build 3.28.2, conda-smithy 3.30.2, and conda-forge-pinning 2024.01.07.10.43.57 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ----- ...rtran_compiler_version11mpi_typeconda.yaml | 2 +- ...an_compiler_version11mpi_typeexternal.yaml | 2 +- .travis.yml | 30 +++++++++++++++++++ README.md | 9 +++++- 5 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index ddb42f17..ff0dc96a 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,14 +16,6 @@ jobs: : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - ? linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda - : CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - ? linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal - : CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 ? linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda : CONFIG: linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 6ac40296..6696a0a7 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -21,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.8 +- quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 600312fb..29897dad 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -21,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.8 +- quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..578fb8c7 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,30 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. + +language: generic + + + +matrix: + include: + - env: CONFIG=linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 + os: linux + arch: arm64 + dist: focal + +script: + - export CI=travis + - export GIT_BRANCH="$TRAVIS_BRANCH" + - export flow_run_id="travis_$TRAVIS_JOB_ID" + - export sha="$TRAVIS_COMMIT" + - export remote_url="https://github.com/$TRAVIS_REPO_SLUG" + - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) + - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi + + + - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 9b2d8fac..945be2a1 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,14 @@ Current build status ==================== -
VariantStatus
linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typecondalinux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda - variant + variant
linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternallinux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal - variant + variant
linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typecondalinux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda - variant + variant
linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternallinux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal - variant + variant
linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typecondalinux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda - variant + variant
linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10mpi_typeexternallinux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal - variant + variant
+
+ + + From 67ca1a76e9c0c8fe8d3dbd674397cde71198685a Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Sun, 7 Jan 2024 19:41:53 -0500 Subject: [PATCH 049/224] remove erroneous addition of cudatoolkit --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f5f9bc51..23747977 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -63,7 +63,6 @@ outputs: - __cuda >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] # Ensure a consistent CUDA environment - cuda-version >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] - - cudatoolkit >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] test: script: run_test.sh files: From ae3f8d99e917f2f8dbf7d4b4de6cb454d9366efe Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 24 Jan 2024 20:43:15 +0000 Subject: [PATCH 050/224] Rebuild for libhwloc 2.9.3 --- .ci_support/migrations/libhwloc293.yaml | 8 ++++++++ conda-forge.yml | 1 + recipe/meta.yaml | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libhwloc293.yaml diff --git a/.ci_support/migrations/libhwloc293.yaml b/.ci_support/migrations/libhwloc293.yaml new file mode 100644 index 00000000..d3b698e8 --- /dev/null +++ b/.ci_support/migrations/libhwloc293.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libhwloc 2.9.3 + kind: version + migration_number: 1 +libhwloc: +- 2.9.3 +migrator_ts: 1706119287.08093 diff --git a/conda-forge.yml b/conda-forge.yml index b135c7df..0672adc0 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,4 +1,5 @@ build_platform: + linux_aarch64: linux_64 osx_arm64: osx_64 conda_build: pkg_format: '2' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 23747977..dce4623f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.1" %} {% 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' %} From 455757d70cd9458752bba0da3d5e918e1fea3376 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 24 Jan 2024 20:44:27 +0000 Subject: [PATCH 051/224] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.01.24.19.49.09 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ++ ...rtran_compiler_version11mpi_typeconda.yaml | 2 + ...an_compiler_version11mpi_typeexternal.yaml | 2 + ...rtran_compiler_version11mpi_typeconda.yaml | 4 +- ...an_compiler_version11mpi_typeexternal.yaml | 4 +- ...rtran_compiler_version11mpi_typeconda.yaml | 2 + ...an_compiler_version11mpi_typeexternal.yaml | 2 + .ci_support/migrations/cuda118.yaml | 99 ------------------- .ci_support/osx_64_.yaml | 2 + .ci_support/osx_arm64_.yaml | 2 + .gitignore | 13 ++- .scripts/build_steps.sh | 6 -- .scripts/run_docker_build.sh | 6 ++ .travis.yml | 30 ------ README.md | 9 +- 15 files changed, 45 insertions(+), 146 deletions(-) delete mode 100644 .ci_support/migrations/cuda118.yaml delete mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index ff0dc96a..ddb42f17 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,6 +16,14 @@ jobs: : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + ? linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda + : CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + ? linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal + : CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 ? linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda : CONFIG: linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 4b0eba57..49f88316 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -24,6 +24,8 @@ fortran_compiler_version: - '11' libevent: - 2.1.12 +libhwloc: +- 2.9.3 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 47e14f8e..1454ae4d 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -24,6 +24,8 @@ fortran_compiler_version: - '11' libevent: - 2.1.12 +libhwloc: +- 2.9.3 mpi_type: - external target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 6696a0a7..981794a7 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -21,13 +21,15 @@ cxx_compiler: cxx_compiler_version: - '11' docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 +- quay.io/condaforge/linux-anvil-cuda:11.8 fortran_compiler: - gfortran fortran_compiler_version: - '11' libevent: - 2.1.12 +libhwloc: +- 2.9.3 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 29897dad..530eee24 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -21,13 +21,15 @@ cxx_compiler: cxx_compiler_version: - '11' docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 +- quay.io/condaforge/linux-anvil-cuda:11.8 fortran_compiler: - gfortran fortran_compiler_version: - '11' libevent: - 2.1.12 +libhwloc: +- 2.9.3 mpi_type: - external target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 1db5b60b..ef07c195 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -24,6 +24,8 @@ fortran_compiler_version: - '11' libevent: - 2.1.12 +libhwloc: +- 2.9.3 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 654931ab..f257c172 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -24,6 +24,8 @@ fortran_compiler_version: - '11' libevent: - 2.1.12 +libhwloc: +- 2.9.3 mpi_type: - external target_platform: diff --git a/.ci_support/migrations/cuda118.yaml b/.ci_support/migrations/cuda118.yaml deleted file mode 100644 index fdd298b9..00000000 --- a/.ci_support/migrations/cuda118.yaml +++ /dev/null @@ -1,99 +0,0 @@ -migrator_ts: 1692828152 -__migrator: - kind: - version - migration_number: - 1 - build_number: - 1 - paused: false - override_cbc_keys: - - cuda_compiler_stub - operation: key_add - check_solvable: false - primary_key: cuda_compiler_version - ordering: - cxx_compiler_version: - - 9 - - 8 - - 7 - c_compiler_version: - - 9 - - 8 - - 7 - fortran_compiler_version: - - 9 - - 8 - - 7 - docker_image: - # Native builds - - quay.io/condaforge/linux-anvil-comp7 # [os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-aarch64 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - - quay.io/condaforge/linux-anvil-ppc64le # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-armv7l # [os.environ.get("BUILD_PLATFORM") == "linux-armv7l"] - - # Legacy CUDAs - - quay.io/condaforge/linux-anvil-cuda:9.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:10.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:10.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:10.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - # CUDA 11.2 - - quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # CUDA 11.2 arch: native compilation (build == target) - - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - # CUDA 11.2 arch: cross-compilation (build != target) - - quay.io/condaforge/linux-anvil-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - # CUDA 11.8 - - quay.io/condaforge/linux-anvil-cuda:11.8 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # CUDA 11.8 arch: native compilation (build == target) - - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - # CUDA 11.8 arch: cross-compilation (build != target) - - quay.io/condaforge/linux-anvil-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.8 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - # Native CentOS 7 image - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - cuda_compiler_version: - - None - - 10.2 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.0 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.1 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.2 # [(linux or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.8 # [(linux or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12.0 # [(linux or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - commit_message: | - Rebuild for CUDA 11.8 w/arch support - -cuda_compiler: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cuda_compiler_version: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.8 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -c_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cxx_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -fortran_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cdt_name: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-") and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - quay.io/condaforge/linux-anvil-cuda:11.8 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # case: native compilation (build == target) - - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - # case: cross-compilation (build != target) - - quay.io/condaforge/linux-anvil-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.8 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 18e3d098..c7edccfb 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -22,6 +22,8 @@ fortran_compiler_version: - '12' libevent: - 2.1.12 +libhwloc: +- 2.9.3 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 10337025..6a7d6c12 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -22,6 +22,8 @@ fortran_compiler_version: - '12' libevent: - 2.1.12 +libhwloc: +- 2.9.3 macos_machine: - arm64-apple-darwin20.0.0 mpi_type: diff --git a/.gitignore b/.gitignore index c0029107..179afe55 100644 --- a/.gitignore +++ b/.gitignore @@ -3,11 +3,22 @@ # Everything else is managed by the conda-smithy rerender process. # Please do not modify +# Ignore all files and folders in root * !/conda-forge.yml -!/*/ +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders !/recipe/** !/.ci_support/** +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + *.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index eba1dfdb..beda247e 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -57,12 +57,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi -if [[ "${sha:-}" == "" ]]; then - pushd ${FEEDSTOCK_ROOT} - sha=$(git rev-parse HEAD) - popd -fi - if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index b70ef014..00f377a8 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 578fb8c7..00000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. - -language: generic - - - -matrix: - include: - - env: CONFIG=linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 - os: linux - arch: arm64 - dist: focal - -script: - - export CI=travis - - export GIT_BRANCH="$TRAVIS_BRANCH" - - export flow_run_id="travis_$TRAVIS_JOB_ID" - - export sha="$TRAVIS_COMMIT" - - export remote_url="https://github.com/$TRAVIS_REPO_SLUG" - - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) - - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi - - - - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 945be2a1..9b2d8fac 100644 --- a/README.md +++ b/README.md @@ -22,14 +22,7 @@ Current build status ==================== -
Travis + + linux + +
Azure
- - - +
Travis - - linux - -
From d88d783462cc1eeb17174a043f6ad7a861dbe395 Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Thu, 25 Jan 2024 14:44:50 +0300 Subject: [PATCH 052/224] recipe: Setup cross-compilation --- conda-forge.yml | 6 +- recipe/build-mpi.sh | 120 ++++--------------------- recipe/cross-gfortran.linux-aarch64.sh | 108 ++++++++++++++++++++++ recipe/cross-gfortran.linux-ppc64le.sh | 108 ++++++++++++++++++++++ recipe/cross-gfortran.osx-arm64.sh | 104 +++++++++++++++++++++ 5 files changed, 343 insertions(+), 103 deletions(-) create mode 100644 recipe/cross-gfortran.linux-aarch64.sh create mode 100644 recipe/cross-gfortran.linux-ppc64le.sh create mode 100644 recipe/cross-gfortran.osx-arm64.sh diff --git a/conda-forge.yml b/conda-forge.yml index 0672adc0..ecac8f07 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,5 +1,6 @@ build_platform: linux_aarch64: linux_64 + linux_ppc64le: linux_64 osx_arm64: osx_64 conda_build: pkg_format: '2' @@ -9,5 +10,6 @@ github: tooling_branch_name: main provider: linux_aarch64: default - linux_ppc64le: azure -test_on_native_only: true + linux_ppc64le: default + osx_arm64: default +test: native_and_emulated diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index dd5d2041..2871665c 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -31,107 +31,25 @@ if [[ -n "$CUDA_HOME" ]]; then build_with_cuda="--with-cuda=$CUDA_HOME --with-cuda-libdir=$CUDA_HOME/lib64/stubs" fi -if [[ $CONDA_BUILD_CROSS_COMPILATION == "1" && $target_platform == osx-arm64 ]]; then - export ompi_cv_fortran_abstract=yes - export ompi_cv_fortran_alignment_CHARACTER=1 - export ompi_cv_fortran_alignment_COMPLEX=4 - export ompi_cv_fortran_alignment_COMPLEXp16=8 - export ompi_cv_fortran_alignment_COMPLEXp8=4 - export ompi_cv_fortran_alignment_DOUBLE_COMPLEX=8 - export ompi_cv_fortran_alignment_DOUBLE_PRECISION=8 - export ompi_cv_fortran_alignment_INTEGER=4 - export ompi_cv_fortran_alignment_INTEGERp1=1 - export ompi_cv_fortran_alignment_INTEGERp2=2 - export ompi_cv_fortran_alignment_INTEGERp4=4 - export ompi_cv_fortran_alignment_INTEGERp8=8 - export ompi_cv_fortran_alignment_LOGICAL=4 - export ompi_cv_fortran_alignment_LOGICALp1=1 - export ompi_cv_fortran_alignment_LOGICALp2=2 - export ompi_cv_fortran_alignment_LOGICALp4=4 - export ompi_cv_fortran_alignment_LOGICALp8=8 - export ompi_cv_fortran_alignment_REAL=4 - export ompi_cv_fortran_alignment_REALp4=4 - export ompi_cv_fortran_alignment_REALp8=8 - export ompi_cv_fortran_alignment_type_test_mpi_handle_=' 8' - export ompi_cv_fortran_asynchronous=yes - export ompi_cv_fortran_c_funloc=yes - export ompi_cv_fortran_external_symbol='single underscore' - export ompi_cv_fortran_f08_assumed_rank=yes - export ompi_cv_fortran_handle_max=2147483647 - export ompi_cv_fortran_have_CHARACTER=yes - export ompi_cv_fortran_have_COMPLEX=yes - export ompi_cv_fortran_have_COMPLEXp16=yes - export ompi_cv_fortran_have_COMPLEXp32=no - export ompi_cv_fortran_have_COMPLEXp4=no - export ompi_cv_fortran_have_COMPLEXp8=yes - export ompi_cv_fortran_have_DOUBLE_COMPLEX=yes - export ompi_cv_fortran_have_DOUBLE_PRECISION=yes - export ompi_cv_fortran_have_INTEGER=yes - export ompi_cv_fortran_have_INTEGERp16=yes - export ompi_cv_fortran_have_INTEGERp1=yes - export ompi_cv_fortran_have_INTEGERp2=yes - export ompi_cv_fortran_have_INTEGERp4=yes - export ompi_cv_fortran_have_INTEGERp8=yes - export ompi_cv_fortran_have_LOGICAL=yes - export ompi_cv_fortran_have_LOGICALp1=yes - export ompi_cv_fortran_have_LOGICALp2=yes - export ompi_cv_fortran_have_LOGICALp4=yes - export ompi_cv_fortran_have_LOGICALp8=yes - export ompi_cv_fortran_have_REAL=yes - export ompi_cv_fortran_have_REALp16=no - export ompi_cv_fortran_have_REALp2=no - export ompi_cv_fortran_have_REALp4=yes - export ompi_cv_fortran_have_REALp8=yes - export ompi_cv_fortran_have_bind_c_sub=yes - export ompi_cv_fortran_have_bind_c_type=yes - export ompi_cv_fortran_have_bind_c_type_name=yes - export ompi_cv_fortran_have_iso_c_binding=yes - export ompi_cv_fortran_have_iso_fortran_env=yes - export ompi_cv_fortran_have_storage_size=yes - export ompi_cv_fortran_ignore_tkr_data='1:type(*), dimension(*):!GCC$ ATTRIBUTES NO_ARG_CHECK ::' - export ompi_cv_fortran_interface=yes - export ompi_cv_fortran_kind_value_0=0 - export ompi_cv_fortran_kind_value_C_DOUBLE=8 - export ompi_cv_fortran_kind_value_C_DOUBLE_COMPLEX=8 - export ompi_cv_fortran_kind_value_C_FLOAT=4 - export ompi_cv_fortran_kind_value_C_FLOAT_COMPLEX=4 - export ompi_cv_fortran_kind_value_C_INT16_T=2 - export ompi_cv_fortran_kind_value_C_INT32_T=4 - export ompi_cv_fortran_kind_value_C_INT64_T=8 - export ompi_cv_fortran_kind_value_C_INT=4 - export ompi_cv_fortran_kind_value_C_LONG_LONG=8 - export ompi_cv_fortran_kind_value_C_SHORT=2 - export ompi_cv_fortran_kind_value_C_SIGNED_CHAR=1 - export ompi_cv_fortran_logical_array_correct=yes - export ompi_cv_fortran_max_array_rank=15 - export ompi_cv_fortran_module_include_flag=-I - export ompi_cv_fortran_optional=yes - export ompi_cv_fortran_private=yes - export ompi_cv_fortran_procedure=yes - export ompi_cv_fortran_protected=yes - export ompi_cv_fortran_sizeof_CHARACTER=1 - export ompi_cv_fortran_sizeof_COMPLEX=8 - export ompi_cv_fortran_sizeof_COMPLEXp16=16 - export ompi_cv_fortran_sizeof_COMPLEXp8=8 - export ompi_cv_fortran_sizeof_DOUBLE_COMPLEX=16 - export ompi_cv_fortran_sizeof_DOUBLE_PRECISION=8 - export ompi_cv_fortran_sizeof_INTEGER=4 - export ompi_cv_fortran_sizeof_INTEGERp16=16 - export ompi_cv_fortran_sizeof_INTEGERp1=1 - export ompi_cv_fortran_sizeof_INTEGERp2=2 - export ompi_cv_fortran_sizeof_INTEGERp4=4 - export ompi_cv_fortran_sizeof_INTEGERp8=8 - export ompi_cv_fortran_sizeof_LOGICAL=4 - export ompi_cv_fortran_sizeof_LOGICALp1=1 - export ompi_cv_fortran_sizeof_LOGICALp2=2 - export ompi_cv_fortran_sizeof_LOGICALp4=4 - export ompi_cv_fortran_sizeof_LOGICALp8=8 - export ompi_cv_fortran_sizeof_REAL=4 - export ompi_cv_fortran_sizeof_REALp4=4 - export ompi_cv_fortran_sizeof_REALp8=8 - export ompi_cv_fortran_sizeof_type_test_mpi_handle_=4 - export ompi_cv_fortran_true_value=1 - export ompi_cv_fortran_use_only=yes +if [[ $CONDA_BUILD_CROSS_COMPILATION == "1" ]]; then + # + # To regenerate the `cross-gfortran.*.sh` files follow these steps: + # + # * Create and activate a conda environment with `gcc=X.Y gfortran` + # packages and any other package required to configure openmpi. + # $ conda create -n ompi-config gcc=X.Y gfortran + # $ conda activate ompi-config + # + # * Run openmpi's `./configure` script + # $ tar -xf openmpi-X.Y.Z.tar.bz2 + # $ cd openmpi-X.Y.Z + # $ ./configure + # + # * Use `grep` to get configure variables out of `config.log`: + # $ grep ompi_cv_fortran_ config.log | sed 's/^/export /' >> cross-gfortran.$target_arch.sh + # $ grep ompi_cv_real16_ config.log | sed 's/^/export /' >> cross-gfortran.$target_arch.sh + # + source $RECIPE_DIR/cross-gfortran.$target_platform.sh fi ./configure --prefix=$PREFIX \ diff --git a/recipe/cross-gfortran.linux-aarch64.sh b/recipe/cross-gfortran.linux-aarch64.sh new file mode 100644 index 00000000..bdc77c68 --- /dev/null +++ b/recipe/cross-gfortran.linux-aarch64.sh @@ -0,0 +1,108 @@ +export ompi_cv_fortran_abstract=yes +export ompi_cv_fortran_alignment_CHARACTER=1 +export ompi_cv_fortran_alignment_COMPLEX=4 +export ompi_cv_fortran_alignment_COMPLEXp16=8 +export ompi_cv_fortran_alignment_COMPLEXp32=16 +export ompi_cv_fortran_alignment_COMPLEXp8=4 +export ompi_cv_fortran_alignment_DOUBLE_COMPLEX=8 +export ompi_cv_fortran_alignment_DOUBLE_PRECISION=8 +export ompi_cv_fortran_alignment_INTEGER=4 +export ompi_cv_fortran_alignment_INTEGERp1=1 +export ompi_cv_fortran_alignment_INTEGERp2=2 +export ompi_cv_fortran_alignment_INTEGERp4=4 +export ompi_cv_fortran_alignment_INTEGERp8=8 +export ompi_cv_fortran_alignment_LOGICAL=4 +export ompi_cv_fortran_alignment_LOGICALp1=1 +export ompi_cv_fortran_alignment_LOGICALp2=2 +export ompi_cv_fortran_alignment_LOGICALp4=4 +export ompi_cv_fortran_alignment_LOGICALp8=8 +export ompi_cv_fortran_alignment_REAL=4 +export ompi_cv_fortran_alignment_REALp16=16 +export ompi_cv_fortran_alignment_REALp4=4 +export ompi_cv_fortran_alignment_REALp8=8 +export ompi_cv_fortran_alignment_type_test_mpi_handle_=' 8' +export ompi_cv_fortran_asynchronous=yes +export ompi_cv_fortran_c_funloc=yes +export ompi_cv_fortran_elemental=yes +export ompi_cv_fortran_external_symbol='single underscore' +export ompi_cv_fortran_f08_assumed_rank=yes +export ompi_cv_fortran_handle_max=2147483647 +export ompi_cv_fortran_have_CHARACTER=yes +export ompi_cv_fortran_have_COMPLEX=yes +export ompi_cv_fortran_have_COMPLEXp16=yes +export ompi_cv_fortran_have_COMPLEXp32=yes +export ompi_cv_fortran_have_COMPLEXp4=no +export ompi_cv_fortran_have_COMPLEXp8=yes +export ompi_cv_fortran_have_DOUBLE_COMPLEX=yes +export ompi_cv_fortran_have_DOUBLE_PRECISION=yes +export ompi_cv_fortran_have_INTEGER=yes +export ompi_cv_fortran_have_INTEGERp16=yes +export ompi_cv_fortran_have_INTEGERp1=yes +export ompi_cv_fortran_have_INTEGERp2=yes +export ompi_cv_fortran_have_INTEGERp4=yes +export ompi_cv_fortran_have_INTEGERp8=yes +export ompi_cv_fortran_have_LOGICAL=yes +export ompi_cv_fortran_have_LOGICALp1=yes +export ompi_cv_fortran_have_LOGICALp2=yes +export ompi_cv_fortran_have_LOGICALp4=yes +export ompi_cv_fortran_have_LOGICALp8=yes +export ompi_cv_fortran_have_REAL=yes +export ompi_cv_fortran_have_REALp16=yes +export ompi_cv_fortran_have_REALp2=no +export ompi_cv_fortran_have_REALp4=yes +export ompi_cv_fortran_have_REALp8=yes +export ompi_cv_fortran_have_bind_c_sub=yes +export ompi_cv_fortran_have_bind_c_type=yes +export ompi_cv_fortran_have_bind_c_type_name=yes +export ompi_cv_fortran_have_iso_c_binding=yes +export ompi_cv_fortran_have_iso_fortran_env=yes +export ompi_cv_fortran_have_iso_fortran_env_real16=no +export ompi_cv_fortran_have_storage_size=yes +export ompi_cv_fortran_ignore_tkr_data='1:type(*), dimension(*):!GCC$ ATTRIBUTES NO_ARG_CHECK ::' +export ompi_cv_fortran_interface=yes +export ompi_cv_fortran_kind_value_0=0 +export ompi_cv_fortran_kind_value_C_DOUBLE=8 +export ompi_cv_fortran_kind_value_C_DOUBLE_COMPLEX=8 +export ompi_cv_fortran_kind_value_C_FLOAT=4 +export ompi_cv_fortran_kind_value_C_FLOAT_COMPLEX=4 +export ompi_cv_fortran_kind_value_C_INT16_T=2 +export ompi_cv_fortran_kind_value_C_INT32_T=4 +export ompi_cv_fortran_kind_value_C_INT64_T=8 +export ompi_cv_fortran_kind_value_C_INT=4 +export ompi_cv_fortran_kind_value_C_LONG_DOUBLE=16 +export ompi_cv_fortran_kind_value_C_LONG_DOUBLE_COMPLEX=16 +export ompi_cv_fortran_kind_value_C_LONG_LONG=8 +export ompi_cv_fortran_kind_value_C_SHORT=2 +export ompi_cv_fortran_kind_value_C_SIGNED_CHAR=1 +export ompi_cv_fortran_logical_array_correct=yes +export ompi_cv_fortran_max_array_rank=15 +export ompi_cv_fortran_module_include_flag=-I +export ompi_cv_fortran_optional=yes +export ompi_cv_fortran_private=yes +export ompi_cv_fortran_procedure=yes +export ompi_cv_fortran_sizeof_CHARACTER=1 +export ompi_cv_fortran_sizeof_COMPLEX=8 +export ompi_cv_fortran_sizeof_COMPLEXp16=16 +export ompi_cv_fortran_sizeof_COMPLEXp32=32 +export ompi_cv_fortran_sizeof_COMPLEXp8=8 +export ompi_cv_fortran_sizeof_DOUBLE_COMPLEX=16 +export ompi_cv_fortran_sizeof_DOUBLE_PRECISION=8 +export ompi_cv_fortran_sizeof_INTEGER=4 +export ompi_cv_fortran_sizeof_INTEGERp16=16 +export ompi_cv_fortran_sizeof_INTEGERp1=1 +export ompi_cv_fortran_sizeof_INTEGERp2=2 +export ompi_cv_fortran_sizeof_INTEGERp4=4 +export ompi_cv_fortran_sizeof_INTEGERp8=8 +export ompi_cv_fortran_sizeof_LOGICAL=4 +export ompi_cv_fortran_sizeof_LOGICALp1=1 +export ompi_cv_fortran_sizeof_LOGICALp2=2 +export ompi_cv_fortran_sizeof_LOGICALp4=4 +export ompi_cv_fortran_sizeof_LOGICALp8=8 +export ompi_cv_fortran_sizeof_REAL=4 +export ompi_cv_fortran_sizeof_REALp16=16 +export ompi_cv_fortran_sizeof_REALp4=4 +export ompi_cv_fortran_sizeof_REALp8=8 +export ompi_cv_fortran_sizeof_type_test_mpi_handle_=4 +export ompi_cv_fortran_true_value=1 +export ompi_cv_fortran_use_only=yes +export ompi_cv_real16_c_equiv=yes diff --git a/recipe/cross-gfortran.linux-ppc64le.sh b/recipe/cross-gfortran.linux-ppc64le.sh new file mode 100644 index 00000000..47e0e1cd --- /dev/null +++ b/recipe/cross-gfortran.linux-ppc64le.sh @@ -0,0 +1,108 @@ +export ompi_cv_fortran_abstract=yes +export ompi_cv_fortran_alignment_CHARACTER=1 +export ompi_cv_fortran_alignment_COMPLEX=4 +export ompi_cv_fortran_alignment_COMPLEXp16=8 +export ompi_cv_fortran_alignment_COMPLEXp32=16 +export ompi_cv_fortran_alignment_COMPLEXp8=4 +export ompi_cv_fortran_alignment_DOUBLE_COMPLEX=8 +export ompi_cv_fortran_alignment_DOUBLE_PRECISION=8 +export ompi_cv_fortran_alignment_INTEGER=4 +export ompi_cv_fortran_alignment_INTEGERp1=1 +export ompi_cv_fortran_alignment_INTEGERp2=2 +export ompi_cv_fortran_alignment_INTEGERp4=4 +export ompi_cv_fortran_alignment_INTEGERp8=8 +export ompi_cv_fortran_alignment_LOGICAL=4 +export ompi_cv_fortran_alignment_LOGICALp1=1 +export ompi_cv_fortran_alignment_LOGICALp2=2 +export ompi_cv_fortran_alignment_LOGICALp4=4 +export ompi_cv_fortran_alignment_LOGICALp8=8 +export ompi_cv_fortran_alignment_REAL=4 +export ompi_cv_fortran_alignment_REALp16=16 +export ompi_cv_fortran_alignment_REALp4=4 +export ompi_cv_fortran_alignment_REALp8=8 +export ompi_cv_fortran_alignment_type_test_mpi_handle_=' 4' +export ompi_cv_fortran_asynchronous=yes +export ompi_cv_fortran_c_funloc=yes +export ompi_cv_fortran_elemental=yes +export ompi_cv_fortran_external_symbol='single underscore' +export ompi_cv_fortran_f08_assumed_rank=yes +export ompi_cv_fortran_handle_max=2147483647 +export ompi_cv_fortran_have_CHARACTER=yes +export ompi_cv_fortran_have_COMPLEX=yes +export ompi_cv_fortran_have_COMPLEXp16=yes +export ompi_cv_fortran_have_COMPLEXp32=yes +export ompi_cv_fortran_have_COMPLEXp4=no +export ompi_cv_fortran_have_COMPLEXp8=yes +export ompi_cv_fortran_have_DOUBLE_COMPLEX=yes +export ompi_cv_fortran_have_DOUBLE_PRECISION=yes +export ompi_cv_fortran_have_INTEGER=yes +export ompi_cv_fortran_have_INTEGERp16=yes +export ompi_cv_fortran_have_INTEGERp1=yes +export ompi_cv_fortran_have_INTEGERp2=yes +export ompi_cv_fortran_have_INTEGERp4=yes +export ompi_cv_fortran_have_INTEGERp8=yes +export ompi_cv_fortran_have_LOGICAL=yes +export ompi_cv_fortran_have_LOGICALp1=yes +export ompi_cv_fortran_have_LOGICALp2=yes +export ompi_cv_fortran_have_LOGICALp4=yes +export ompi_cv_fortran_have_LOGICALp8=yes +export ompi_cv_fortran_have_REAL=yes +export ompi_cv_fortran_have_REALp16=yes +export ompi_cv_fortran_have_REALp2=no +export ompi_cv_fortran_have_REALp4=yes +export ompi_cv_fortran_have_REALp8=yes +export ompi_cv_fortran_have_bind_c_sub=yes +export ompi_cv_fortran_have_bind_c_type=yes +export ompi_cv_fortran_have_bind_c_type_name=yes +export ompi_cv_fortran_have_iso_c_binding=yes +export ompi_cv_fortran_have_iso_fortran_env=yes +export ompi_cv_fortran_have_iso_fortran_env_real16=no +export ompi_cv_fortran_have_storage_size=yes +export ompi_cv_fortran_ignore_tkr_data='1:type(*), dimension(*):!GCC$ ATTRIBUTES NO_ARG_CHECK ::' +export ompi_cv_fortran_interface=yes +export ompi_cv_fortran_kind_value_0=0 +export ompi_cv_fortran_kind_value_C_DOUBLE=8 +export ompi_cv_fortran_kind_value_C_DOUBLE_COMPLEX=8 +export ompi_cv_fortran_kind_value_C_FLOAT=4 +export ompi_cv_fortran_kind_value_C_FLOAT_COMPLEX=4 +export ompi_cv_fortran_kind_value_C_INT16_T=2 +export ompi_cv_fortran_kind_value_C_INT32_T=4 +export ompi_cv_fortran_kind_value_C_INT64_T=8 +export ompi_cv_fortran_kind_value_C_INT=4 +export ompi_cv_fortran_kind_value_C_LONG_DOUBLE=16 +export ompi_cv_fortran_kind_value_C_LONG_DOUBLE_COMPLEX=16 +export ompi_cv_fortran_kind_value_C_LONG_LONG=8 +export ompi_cv_fortran_kind_value_C_SHORT=2 +export ompi_cv_fortran_kind_value_C_SIGNED_CHAR=1 +export ompi_cv_fortran_logical_array_correct=yes +export ompi_cv_fortran_max_array_rank=15 +export ompi_cv_fortran_module_include_flag=-I +export ompi_cv_fortran_optional=yes +export ompi_cv_fortran_private=yes +export ompi_cv_fortran_procedure=yes +export ompi_cv_fortran_sizeof_CHARACTER=1 +export ompi_cv_fortran_sizeof_COMPLEX=8 +export ompi_cv_fortran_sizeof_COMPLEXp16=16 +export ompi_cv_fortran_sizeof_COMPLEXp32=32 +export ompi_cv_fortran_sizeof_COMPLEXp8=8 +export ompi_cv_fortran_sizeof_DOUBLE_COMPLEX=16 +export ompi_cv_fortran_sizeof_DOUBLE_PRECISION=8 +export ompi_cv_fortran_sizeof_INTEGER=4 +export ompi_cv_fortran_sizeof_INTEGERp16=16 +export ompi_cv_fortran_sizeof_INTEGERp1=1 +export ompi_cv_fortran_sizeof_INTEGERp2=2 +export ompi_cv_fortran_sizeof_INTEGERp4=4 +export ompi_cv_fortran_sizeof_INTEGERp8=8 +export ompi_cv_fortran_sizeof_LOGICAL=4 +export ompi_cv_fortran_sizeof_LOGICALp1=1 +export ompi_cv_fortran_sizeof_LOGICALp2=2 +export ompi_cv_fortran_sizeof_LOGICALp4=4 +export ompi_cv_fortran_sizeof_LOGICALp8=8 +export ompi_cv_fortran_sizeof_REAL=4 +export ompi_cv_fortran_sizeof_REALp16=16 +export ompi_cv_fortran_sizeof_REALp4=4 +export ompi_cv_fortran_sizeof_REALp8=8 +export ompi_cv_fortran_sizeof_type_test_mpi_handle_=4 +export ompi_cv_fortran_true_value=1 +export ompi_cv_fortran_use_only=yes +export ompi_cv_real16_c_equiv=yes diff --git a/recipe/cross-gfortran.osx-arm64.sh b/recipe/cross-gfortran.osx-arm64.sh new file mode 100644 index 00000000..c45c31b1 --- /dev/null +++ b/recipe/cross-gfortran.osx-arm64.sh @@ -0,0 +1,104 @@ +export ompi_cv_fortran_abstract=yes +export ompi_cv_fortran_alignment_CHARACTER=1 +export ompi_cv_fortran_alignment_COMPLEX=4 +export ompi_cv_fortran_alignment_COMPLEXp16=8 +export ompi_cv_fortran_alignment_COMPLEXp8=4 +export ompi_cv_fortran_alignment_DOUBLE_COMPLEX=8 +export ompi_cv_fortran_alignment_DOUBLE_PRECISION=8 +export ompi_cv_fortran_alignment_INTEGER=4 +export ompi_cv_fortran_alignment_INTEGERp1=1 +export ompi_cv_fortran_alignment_INTEGERp2=2 +export ompi_cv_fortran_alignment_INTEGERp4=4 +export ompi_cv_fortran_alignment_INTEGERp8=8 +export ompi_cv_fortran_alignment_LOGICAL=4 +export ompi_cv_fortran_alignment_LOGICALp1=1 +export ompi_cv_fortran_alignment_LOGICALp2=2 +export ompi_cv_fortran_alignment_LOGICALp4=4 +export ompi_cv_fortran_alignment_LOGICALp8=8 +export ompi_cv_fortran_alignment_REAL=4 +export ompi_cv_fortran_alignment_REALp4=4 +export ompi_cv_fortran_alignment_REALp8=8 +export ompi_cv_fortran_alignment_type_test_mpi_handle_=' 4' +export ompi_cv_fortran_asynchronous=yes +export ompi_cv_fortran_c_funloc=yes +export ompi_cv_fortran_elemental=yes +export ompi_cv_fortran_external_symbol='single underscore' +export ompi_cv_fortran_f08_assumed_rank=yes +export ompi_cv_fortran_handle_max=2147483647 +export ompi_cv_fortran_have_CHARACTER=yes +export ompi_cv_fortran_have_COMPLEX=yes +export ompi_cv_fortran_have_COMPLEXp16=yes +export ompi_cv_fortran_have_COMPLEXp32=yes +export ompi_cv_fortran_have_COMPLEXp4=no +export ompi_cv_fortran_have_COMPLEXp8=yes +export ompi_cv_fortran_have_DOUBLE_COMPLEX=yes +export ompi_cv_fortran_have_DOUBLE_PRECISION=yes +export ompi_cv_fortran_have_INTEGER=yes +export ompi_cv_fortran_have_INTEGERp16=yes +export ompi_cv_fortran_have_INTEGERp1=yes +export ompi_cv_fortran_have_INTEGERp2=yes +export ompi_cv_fortran_have_INTEGERp4=yes +export ompi_cv_fortran_have_INTEGERp8=yes +export ompi_cv_fortran_have_LOGICAL=yes +export ompi_cv_fortran_have_LOGICALp1=yes +export ompi_cv_fortran_have_LOGICALp2=yes +export ompi_cv_fortran_have_LOGICALp4=yes +export ompi_cv_fortran_have_LOGICALp8=yes +export ompi_cv_fortran_have_REAL=yes +export ompi_cv_fortran_have_REALp16=yes +export ompi_cv_fortran_have_REALp2=no +export ompi_cv_fortran_have_REALp4=yes +export ompi_cv_fortran_have_REALp8=yes +export ompi_cv_fortran_have_bind_c_sub=yes +export ompi_cv_fortran_have_bind_c_type=yes +export ompi_cv_fortran_have_bind_c_type_name=yes +export ompi_cv_fortran_have_iso_c_binding=yes +export ompi_cv_fortran_have_iso_fortran_env=yes +export ompi_cv_fortran_have_iso_fortran_env_real16=no +export ompi_cv_fortran_have_storage_size=yes +export ompi_cv_fortran_ignore_tkr_data='1:type(*), dimension(*):!GCC$ ATTRIBUTES NO_ARG_CHECK ::' +export ompi_cv_fortran_interface=yes +export ompi_cv_fortran_kind_value_0=0 +export ompi_cv_fortran_kind_value_C_DOUBLE=8 +export ompi_cv_fortran_kind_value_C_DOUBLE_COMPLEX=8 +export ompi_cv_fortran_kind_value_C_FLOAT=4 +export ompi_cv_fortran_kind_value_C_FLOAT_COMPLEX=4 +export ompi_cv_fortran_kind_value_C_INT16_T=2 +export ompi_cv_fortran_kind_value_C_INT32_T=4 +export ompi_cv_fortran_kind_value_C_INT64_T=8 +export ompi_cv_fortran_kind_value_C_INT=4 +export ompi_cv_fortran_kind_value_C_LONG_LONG=8 +export ompi_cv_fortran_kind_value_C_SHORT=2 +export ompi_cv_fortran_kind_value_C_SIGNED_CHAR=1 +export ompi_cv_fortran_logical_array_correct=yes +export ompi_cv_fortran_max_array_rank=15 +export ompi_cv_fortran_module_include_flag=-I +export ompi_cv_fortran_optional=yes +export ompi_cv_fortran_private=yes +export ompi_cv_fortran_procedure=yes +export ompi_cv_fortran_sizeof_CHARACTER=1 +export ompi_cv_fortran_sizeof_COMPLEX=8 +export ompi_cv_fortran_sizeof_COMPLEXp16=16 +export ompi_cv_fortran_sizeof_COMPLEXp32=32 +export ompi_cv_fortran_sizeof_COMPLEXp8=8 +export ompi_cv_fortran_sizeof_DOUBLE_COMPLEX=16 +export ompi_cv_fortran_sizeof_DOUBLE_PRECISION=8 +export ompi_cv_fortran_sizeof_INTEGER=4 +export ompi_cv_fortran_sizeof_INTEGERp16=16 +export ompi_cv_fortran_sizeof_INTEGERp1=1 +export ompi_cv_fortran_sizeof_INTEGERp2=2 +export ompi_cv_fortran_sizeof_INTEGERp4=4 +export ompi_cv_fortran_sizeof_INTEGERp8=8 +export ompi_cv_fortran_sizeof_LOGICAL=4 +export ompi_cv_fortran_sizeof_LOGICALp1=1 +export ompi_cv_fortran_sizeof_LOGICALp2=2 +export ompi_cv_fortran_sizeof_LOGICALp4=4 +export ompi_cv_fortran_sizeof_LOGICALp8=8 +export ompi_cv_fortran_sizeof_REAL=4 +export ompi_cv_fortran_sizeof_REALp16=16 +export ompi_cv_fortran_sizeof_REALp4=4 +export ompi_cv_fortran_sizeof_REALp8=8 +export ompi_cv_fortran_sizeof_type_test_mpi_handle_=4 +export ompi_cv_fortran_true_value=1 +export ompi_cv_fortran_use_only=yes +export ompi_cv_real16_c_equiv='skipped (no REAL*16)' From 65231211d5261bb7db153bec5444eadb69025ba9 Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Thu, 25 Jan 2024 20:48:53 +0300 Subject: [PATCH 053/224] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.30.4, and conda-forge-pinning 2024.01.25.13.56.16 --- .azure-pipelines/azure-pipelines-linux.yml | 4 ++-- ...iler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...r_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index ddb42f17..f6cc8b88 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -27,11 +27,11 @@ jobs: ? linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda : CONFIG: linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 ? linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal : CONFIG: linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index ef07c195..2ce68039 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '11' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 +- quay.io/condaforge/linux-anvil-cuda:11.8 fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index f257c172..d0ab6268 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '11' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 +- quay.io/condaforge/linux-anvil-cuda:11.8 fortran_compiler: - gfortran fortran_compiler_version: From d735e2c212b039cd6c54803e667917b8b6643e0c Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Mon, 5 Feb 2024 08:32:39 +0300 Subject: [PATCH 054/224] rebuild --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dce4623f..08751d63 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.1" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 2 %} +{% set build = 3 %} # give conda package a higher build number {% if mpi_type == 'conda' %} From 65e2d8c83538474d9fe2ec28c754329068ca934f Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Mon, 5 Feb 2024 19:29:28 +0300 Subject: [PATCH 055/224] Revert change to .gitignore --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 179afe55..c7c91a77 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,7 @@ # build_artifacts gets ignored which trips some build systems. # To avoid that we 'un-ignore' all files/folders recursively # and only ignore the root build_artifacts folder. -!/build_artifacts/** -/build_artifacts +# !/build_artifacts/** +# /build_artifacts *.pyc From 6462ccac010db8363399c215ea3c176ce65b1788 Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Tue, 6 Feb 2024 15:39:04 -0500 Subject: [PATCH 056/224] Update conda-forge.yml --- conda-forge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index ecac8f07..db940b95 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -13,3 +13,5 @@ provider: linux_ppc64le: default osx_arm64: default test: native_and_emulated +azure: + free_disk_space: true From a52c953e517ed4a24dd882b871220b4cae54e5f9 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 20:41:51 +0000 Subject: [PATCH 057/224] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.06.16.43.21 --- .azure-pipelines/azure-pipelines-linux.yml | 21 +++++++++++++++++++++ .gitignore | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index f6cc8b88..5e640a41 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -35,6 +35,27 @@ jobs: timeoutInMinutes: 360 steps: + - script: | + sudo mkdir -p /opt/empty_dir || true + for d in \ + /opt/ghc \ + /opt/hostedtoolcache \ + /usr/lib/jvm \ + /usr/local/.ghcup \ + /usr/local/lib/android \ + /usr/local/share/powershell \ + /usr/share/dotnet \ + /usr/share/swift \ + ; do + sudo rsync --stats -a --delete /opt/empty_dir/ $d || true + done + sudo apt-get purge -y -f firefox \ + google-chrome-stable \ + microsoft-edge-stable + sudo apt-get autoremove -y >& /dev/null + sudo apt-get autoclean -y >& /dev/null + df -h + displayName: Manage disk space # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.gitignore b/.gitignore index c7c91a77..179afe55 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,7 @@ # build_artifacts gets ignored which trips some build systems. # To avoid that we 'un-ignore' all files/folders recursively # and only ignore the root build_artifacts folder. -# !/build_artifacts/** -# /build_artifacts +!/build_artifacts/** +/build_artifacts *.pyc From 67bc1acf4c5068fe08fb18b97f85f383c2012a6a Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Tue, 6 Feb 2024 23:30:15 -0500 Subject: [PATCH 058/224] bump swap size Co-authored-by: jakirkham --- conda-forge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index db940b95..0adfa002 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -15,3 +15,5 @@ provider: test: native_and_emulated azure: free_disk_space: true + settings_linux: + swapfile_size: 10GiB From 674c16f5c8e601b3369de705a008c1e6e7e3d5e4 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 04:32:40 +0000 Subject: [PATCH 059/224] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.06.16.43.21 --- .azure-pipelines/azure-pipelines-linux.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 5e640a41..29b36777 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -56,6 +56,12 @@ jobs: sudo apt-get autoclean -y >& /dev/null df -h displayName: Manage disk space + - script: | + sudo fallocate -l 10GiB /swapfile || true + sudo chmod 600 /swapfile || true + sudo mkswap /swapfile || true + sudo swapon /swapfile || true + displayName: Create swap file # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | From c746f629429a58af6753fdee2adae6be6560a0e1 Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Wed, 7 Feb 2024 11:25:16 +0300 Subject: [PATCH 060/224] use patchelf --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 08751d63..cdc07a64 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,6 +22,7 @@ build: number: {{ build }} skip: true # [win] skip: true # [linux and cuda_compiler_version != "11.8"] + rpaths_patcher: patchelf # [linux] outputs: {% if mpi_type == 'conda' %} From 57ae96bfcae27325e528ef82e9e61aa9f9cd26d4 Mon Sep 17 00:00:00 2001 From: Min RK Date: Thu, 8 Feb 2024 13:27:18 +0100 Subject: [PATCH 061/224] try rdma-core 49 --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cdc07a64..8f10fa35 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -52,6 +52,7 @@ outputs: - libevent - libnl # [linux] - zlib + - rdma-core 49 # [linux] - ucx # [linux] - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] run: From 5b1dd67c2948cdb3e91b870e6590c8183502c598 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 19:46:53 +0000 Subject: [PATCH 062/224] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and conda-forge-pinning 2024.02.26.18.33.44 --- .scripts/build_steps.sh | 6 +++--- .scripts/run_osx_build.sh | 6 +++--- build-locally.py | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index beda247e..9121002a 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb93..16daa698 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" diff --git a/build-locally.py b/build-locally.py index 3f4b7a79..e0d408d0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From f3ef86f8531e99f99b21533f50e5996b06638b5e Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 13:09:59 +0000 Subject: [PATCH 063/224] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and conda-forge-pinning 2024.03.10.12.43.11 --- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 49f88316..279332e8 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -36,9 +36,9 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 1454ae4d..e690fc82 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -36,9 +36,9 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 981794a7..e6c05d7b 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -40,9 +40,9 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 530eee24..afa5537c 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -40,9 +40,9 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 2ce68039..f65a3137 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -36,9 +36,9 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index d0ab6268..877c3e8d 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -36,9 +36,9 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image zlib: - '1.2' From 65a4e587b6a23a15880d7c985a6358894208b75c Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Mon, 11 Mar 2024 09:54:27 -0400 Subject: [PATCH 064/224] Update recipe/meta.yaml --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8f10fa35..cdc07a64 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -52,7 +52,6 @@ outputs: - libevent - libnl # [linux] - zlib - - rdma-core 49 # [linux] - ucx # [linux] - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] run: From cbf6604f9252e845041a8edfab6c6492eaf57299 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 11 Mar 2024 12:44:28 -0700 Subject: [PATCH 065/224] Use `sysroot` for `2.17` This lines up the GLIBC version with the Docker image used in the CentOS 7 case. It also ensures GLIBC is properly constrained in the packages produced. --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cdc07a64..7f0034fa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -41,6 +41,7 @@ outputs: - {{ compiler('cxx') }} - {{ compiler('cuda') }} # [cuda_compiler != "None"] - {{ compiler('fortran') }} + - sysroot_{{ target_platform }} 2.17 # [linux] #- autoconf # [unix] #- automake # [unix] - libtool # [unix] From c1a080f0d503ede04bc56e22bd3f570db2f399ff Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Mon, 11 Mar 2024 15:45:35 -0400 Subject: [PATCH 066/224] remove unsuccessful attempt --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7f0034fa..61f0fcb0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,7 +22,6 @@ build: number: {{ build }} skip: true # [win] skip: true # [linux and cuda_compiler_version != "11.8"] - rpaths_patcher: patchelf # [linux] outputs: {% if mpi_type == 'conda' %} From 058e285a7ba9217d193d3782ae317c306c77255e Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 12 Mar 2024 09:45:47 +0000 Subject: [PATCH 067/224] updated v5.0.2 --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 61f0fcb0..cf45a7e4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ -{% set version = "5.0.1" %} +{% set version = "5.0.2" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 3 %} +{% set build = 0 %} # give conda package a higher build number {% if mpi_type == 'conda' %} @@ -16,7 +16,7 @@ package: source: fn: openmpi-{{ version }}.tar.bz2 url: https://www.open-mpi.org/software/ompi/v{{ major }}/downloads/openmpi-{{ version }}.tar.bz2 - sha256: e357043e65fd1b956a47d0dae6156a90cf0e378df759364936c1781f1a25ef80 + sha256: ee46ad8eeee2c3ff70772160bff877cbf38c330a0bc3b3ddc811648b3396698f build: number: {{ build }} @@ -33,7 +33,7 @@ outputs: ignore_run_exports: - ucx # [linux] ignore_run_exports_from: - - {{ compiler('cuda') }} # [cuda_compiler != "None"] + - {{ compiler('cuda') }} # [cuda_compiler != "None"] requirements: build: - {{ compiler('c') }} From 6fd5724898fa11b52c91ecacbd233745fb95fff2 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 5 Apr 2024 14:11:13 -0500 Subject: [PATCH 068/224] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.1, and conda-forge-pinning 2024.04.05.13.18.18 --- .azure-pipelines/azure-pipelines-linux.yml | 1 + .azure-pipelines/azure-pipelines-osx.yml | 1 + ...ler_version11fortran_compiler_version11mpi_typeconda.yaml | 5 +++++ ..._version11fortran_compiler_version11mpi_typeexternal.yaml | 5 +++++ ...ler_version11fortran_compiler_version11mpi_typeconda.yaml | 5 +++++ ..._version11fortran_compiler_version11mpi_typeexternal.yaml | 5 +++++ ...ler_version11fortran_compiler_version11mpi_typeconda.yaml | 5 +++++ ..._version11fortran_compiler_version11mpi_typeexternal.yaml | 5 +++++ .ci_support/osx_64_.yaml | 4 ++++ .ci_support/osx_arm64_.yaml | 4 ++++ .scripts/build_steps.sh | 2 +- .scripts/run_osx_build.sh | 2 +- 12 files changed, 42 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 29b36777..abf7edd5 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -33,6 +33,7 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 timeoutInMinutes: 360 + variables: {} steps: - script: | diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index f3ff0633..730a6268 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -15,6 +15,7 @@ jobs: CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 279332e8..be0fc99b 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -36,6 +40,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index e690fc82..936e1dcd 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -36,6 +40,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index e6c05d7b..b6addbfe 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -40,6 +44,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index afa5537c..466fbf58 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -40,6 +44,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index f65a3137..3cb758c9 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -36,6 +40,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 877c3e8d..936c7bd7 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -36,6 +40,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index c7edccfb..23bea355 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.9' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 6a7d6c12..bcf82a39 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 9121002a..899ba03c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 16daa698..07dff219 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" From f6dac2070d4321dfdedbff45314c5dc74f89b81e Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 5 Apr 2024 14:16:12 -0500 Subject: [PATCH 069/224] Require GLIBC 2.17+ in MPI compiler packages Explicitly add the `sysroot` to the compiler packages --- recipe/meta.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cf45a7e4..c63f7c02 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -77,6 +77,8 @@ outputs: # so that conda-build knows to pass it to the test env - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] requirements: + build: + - sysroot_{{ target_platform }} 2.17 # [linux] run: - {{ pin_subpackage('openmpi', exact=True) }} # host C compilers work fine (better) on mac @@ -94,6 +96,8 @@ outputs: # so that conda-build knows to pass it to the test env - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] requirements: + build: + - sysroot_{{ target_platform }} 2.17 # [linux] run: - {{ pin_subpackage('openmpi', exact=True) }} # host C compilers work fine (better) on mac @@ -111,6 +115,8 @@ outputs: # so that conda-build knows to pass it to the test env - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] requirements: + build: + - sysroot_{{ target_platform }} 2.17 # [linux] run: - {{ pin_subpackage('openmpi', exact=True) }} - {{ compiler('fortran') }} From ddc4ca4fb88fbdba225fb65464fcad51df8cbb16 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 5 Apr 2024 16:18:01 -0500 Subject: [PATCH 070/224] Bump `build/number` to `1` --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c63f7c02..934c2529 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.2" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 0 %} +{% set build = 1 %} # give conda package a higher build number {% if mpi_type == 'conda' %} From 6ceacdde431b9501f5faf938e884efc2a8ef2324 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 9 Apr 2024 16:40:20 -0500 Subject: [PATCH 071/224] Migrate `sysroot` to `{{ stdlib('c') }}` --- recipe/conda_build_config.yaml | 3 +++ recipe/meta.yaml | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 339d5f09..04316567 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,3 +1,6 @@ +c_stdlib_version: # [linux] + - 2.17 # [linux] + mpi_type: - external # [linux] - conda diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 934c2529..ea771bca 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -40,7 +40,7 @@ outputs: - {{ compiler('cxx') }} - {{ compiler('cuda') }} # [cuda_compiler != "None"] - {{ compiler('fortran') }} - - sysroot_{{ target_platform }} 2.17 # [linux] + - {{ stdlib('c') }} #- autoconf # [unix] #- automake # [unix] - libtool # [unix] @@ -78,7 +78,7 @@ outputs: - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] requirements: build: - - sysroot_{{ target_platform }} 2.17 # [linux] + - {{ stdlib('c') }} run: - {{ pin_subpackage('openmpi', exact=True) }} # host C compilers work fine (better) on mac @@ -97,7 +97,7 @@ outputs: - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] requirements: build: - - sysroot_{{ target_platform }} 2.17 # [linux] + - {{ stdlib('c') }} run: - {{ pin_subpackage('openmpi', exact=True) }} # host C compilers work fine (better) on mac @@ -116,7 +116,7 @@ outputs: - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] requirements: build: - - sysroot_{{ target_platform }} 2.17 # [linux] + - {{ stdlib('c') }} run: - {{ pin_subpackage('openmpi', exact=True) }} - {{ compiler('fortran') }} From 487393a3165390d1f00c44f9109980c3ae2420f5 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 9 Apr 2024 16:43:37 -0500 Subject: [PATCH 072/224] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.1, and conda-forge-pinning 2024.04.09.19.22.01 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ++++---- ...version11fortran_compiler_version11mpi_typeconda.yaml} | 0 ...sion11fortran_compiler_version11mpi_typeexternal.yaml} | 0 README.md | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) rename .ci_support/{linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml => linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml => linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml} (100%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index abf7edd5..4d4b72cc 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,12 +8,12 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda - : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda + ? linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda + : CONFIG: linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal - : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal + ? linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal + : CONFIG: linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 ? linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml rename to .ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml rename to .ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml diff --git a/README.md b/README.md index 9b2d8fac..bf5fdd94 100644 --- a/README.md +++ b/README.md @@ -36,17 +36,17 @@ Current build status
Azure
- + - + From b1ecbde9ec4f59ab8faaabf8ee02e52467d190c8 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 9 Apr 2024 16:44:24 -0500 Subject: [PATCH 073/224] Bump `build/number` to `2` --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ea771bca..15387c38 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.2" %} {% 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' %} From b82a2f421c9447ec62d878399e68501e0d4b82d9 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 10 Apr 2024 17:41:21 +0000 Subject: [PATCH 074/224] updated v5.0.3 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 15387c38..773acbf5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ -{% set version = "5.0.2" %} +{% set version = "5.0.3" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 2 %} +{% set build = 0 %} # give conda package a higher build number {% if mpi_type == 'conda' %} @@ -16,7 +16,7 @@ package: source: fn: openmpi-{{ version }}.tar.bz2 url: https://www.open-mpi.org/software/ompi/v{{ major }}/downloads/openmpi-{{ version }}.tar.bz2 - sha256: ee46ad8eeee2c3ff70772160bff877cbf38c330a0bc3b3ddc811648b3396698f + sha256: 990582f206b3ab32e938aa31bbf07c639368e4405dca196fabe7f0f76eeda90b build: number: {{ build }} From bb43f86d51078195c29faaea7e0d3e56a55d54b5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 4 May 2024 05:56:10 +0000 Subject: [PATCH 075/224] Rebuild for ucx 1.16.0 --- .ci_support/migrations/ucx116.yaml | 8 ++++++++ conda-forge.yml | 8 ++++---- recipe/meta.yaml | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 .ci_support/migrations/ucx116.yaml diff --git a/.ci_support/migrations/ucx116.yaml b/.ci_support/migrations/ucx116.yaml new file mode 100644 index 00000000..20d1b390 --- /dev/null +++ b/.ci_support/migrations/ucx116.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for ucx 1.16.0 + kind: version + migration_number: 1 +migrator_ts: 1714785040.2362041 +ucx: +- '1.16.0' diff --git a/conda-forge.yml b/conda-forge.yml index 0adfa002..1392287c 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,3 +1,7 @@ +azure: + free_disk_space: true + settings_linux: + swapfile_size: 10GiB build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 @@ -13,7 +17,3 @@ provider: linux_ppc64le: default osx_arm64: default test: native_and_emulated -azure: - free_disk_space: true - settings_linux: - swapfile_size: 10GiB diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 773acbf5..82096505 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.3" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 0 %} +{% set build = 1 %} # give conda package a higher build number {% if mpi_type == 'conda' %} From 1b29ac3f571b0aa88536d58853a3f2edb43c88cd Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 4 May 2024 05:59:32 +0000 Subject: [PATCH 076/224] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.35.0, and conda-forge-pinning 2024.05.04.03.42.50 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- ..._version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...rsion11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- ..._version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...rsion11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- ..._version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...rsion11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- .ci_support/migrations/libhwloc293.yaml | 8 -------- 8 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 .ci_support/migrations/libhwloc293.yaml diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 730a6268..7708e23e 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_: diff --git a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index be0fc99b..1cc655f8 100644 --- a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -35,7 +35,7 @@ mpi_type: target_platform: - linux-64 ucx: -- 1.15.0 +- 1.16.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 936e1dcd..b530a866 100644 --- a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -35,7 +35,7 @@ mpi_type: target_platform: - linux-64 ucx: -- 1.15.0 +- 1.16.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index b6addbfe..419863f7 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -39,7 +39,7 @@ mpi_type: target_platform: - linux-aarch64 ucx: -- 1.15.0 +- 1.16.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 466fbf58..0f90e181 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -39,7 +39,7 @@ mpi_type: target_platform: - linux-aarch64 ucx: -- 1.15.0 +- 1.16.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 3cb758c9..81bb57b6 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -35,7 +35,7 @@ mpi_type: target_platform: - linux-ppc64le ucx: -- 1.15.0 +- 1.16.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 936c7bd7..a8bbe363 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -35,7 +35,7 @@ mpi_type: target_platform: - linux-ppc64le ucx: -- 1.15.0 +- 1.16.0 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/migrations/libhwloc293.yaml b/.ci_support/migrations/libhwloc293.yaml deleted file mode 100644 index d3b698e8..00000000 --- a/.ci_support/migrations/libhwloc293.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libhwloc 2.9.3 - kind: version - migration_number: 1 -libhwloc: -- 2.9.3 -migrator_ts: 1706119287.08093 From 48ee7e35a5b8a51bc66268cd9e83b9f1ee511c26 Mon Sep 17 00:00:00 2001 From: "conda-forge-curator[bot]" <79913779+conda-forge-curator[bot]@users.noreply.github.com> Date: Sun, 12 May 2024 17:52:18 +0000 Subject: [PATCH 077/224] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeAutomergeUpdate --- .github/workflows/automerge.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index da1368a1..0535f6aa 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -9,8 +9,6 @@ jobs: runs-on: ubuntu-latest name: automerge steps: - - name: checkout - uses: actions/checkout@v3 - name: automerge-action id: automerge-action uses: conda-forge/automerge-action@main From dddabf6077fa056ebac42c451f606958cb9a48ef Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 16 May 2024 15:40:35 +0000 Subject: [PATCH 078/224] Rebuild for libhwloc 2.10.0 --- .ci_support/migrations/libhwloc2100.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libhwloc2100.yaml diff --git a/.ci_support/migrations/libhwloc2100.yaml b/.ci_support/migrations/libhwloc2100.yaml new file mode 100644 index 00000000..98ba1791 --- /dev/null +++ b/.ci_support/migrations/libhwloc2100.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libhwloc 2.10.0 + kind: version + migration_number: 1 +libhwloc: +- 2.10.0 +migrator_ts: 1711507406.8423882 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 82096505..a0cab148 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.3" %} {% 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' %} From 52e074697836bd10ab188442c3df059e666f76df Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 16 May 2024 15:43:29 +0000 Subject: [PATCH 079/224] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.35.1, and conda-forge-pinning 2024.05.16.11.05.29 --- ..._version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...rsion11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- ..._version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...rsion11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- ..._version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...rsion11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- .ci_support/migrations/ucx116.yaml | 8 -------- .ci_support/osx_64_.yaml | 6 +++--- .ci_support/osx_arm64_.yaml | 2 +- 9 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 .ci_support/migrations/ucx116.yaml diff --git a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 1cc655f8..32496fc3 100644 --- a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.9.3 +- 2.10.0 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index b530a866..ef4e65a1 100644 --- a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.9.3 +- 2.10.0 mpi_type: - external target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 419863f7..5617c36f 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -33,7 +33,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.9.3 +- 2.10.0 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 0f90e181..f820b94f 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -33,7 +33,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.9.3 +- 2.10.0 mpi_type: - external target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 81bb57b6..2b08b265 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.9.3 +- 2.10.0 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index a8bbe363..ee8620c9 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.9.3 +- 2.10.0 mpi_type: - external target_platform: diff --git a/.ci_support/migrations/ucx116.yaml b/.ci_support/migrations/ucx116.yaml deleted file mode 100644 index 20d1b390..00000000 --- a/.ci_support/migrations/ucx116.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for ucx 1.16.0 - kind: version - migration_number: 1 -migrator_ts: 1714785040.2362041 -ucx: -- '1.16.0' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 23bea355..bc43ef60 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: @@ -7,7 +7,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -27,7 +27,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.9.3 +- 2.10.0 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 bcf82a39..7d419e9e 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -27,7 +27,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.9.3 +- 2.10.0 macos_machine: - arm64-apple-darwin20.0.0 mpi_type: From 3e033079494c363b0360b7e95dc8d0bd0c3130a0 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 13:21:31 +0000 Subject: [PATCH 080/224] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.36.0, and conda-forge-pinning 2024.05.20.05.45.14 --- .ci_support/osx_64_.yaml | 2 ++ .ci_support/osx_arm64_.yaml | 2 ++ .gitattributes | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index bc43ef60..b58cbac4 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 7d419e9e..22d4772c 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: diff --git a/.gitattributes b/.gitattributes index 7f327638..18f114a1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true From 155dd14e9d59b07d1a7dd172a50b947706208a37 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Thu, 30 May 2024 06:01:57 -0500 Subject: [PATCH 081/224] ENH ensure external variants have same deps as regular ones for the solver (#156) * ENH ensure external variants have same deps as regular ones for the solver * MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.1, and conda-forge-pinning 2024.05.29.16.17.59 * Update meta.yaml --------- Co-authored-by: conda-forge-webservices[bot] <91080706+conda-forge-webservices[bot]@users.noreply.github.com> --- .ci_support/migrations/libhwloc2100.yaml | 8 ------- recipe/meta.yaml | 30 ++++++++++++------------ 2 files changed, 15 insertions(+), 23 deletions(-) delete mode 100644 .ci_support/migrations/libhwloc2100.yaml diff --git a/.ci_support/migrations/libhwloc2100.yaml b/.ci_support/migrations/libhwloc2100.yaml deleted file mode 100644 index 98ba1791..00000000 --- a/.ci_support/migrations/libhwloc2100.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libhwloc 2.10.0 - kind: version - migration_number: 1 -libhwloc: -- 2.10.0 -migrator_ts: 1711507406.8423882 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a0cab148..186f7456 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.3" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 2 %} +{% set build = 3 %} # give conda package a higher build number {% if mpi_type == 'conda' %} @@ -24,12 +24,19 @@ build: skip: true # [linux and cuda_compiler_version != "11.8"] outputs: - {% if mpi_type == 'conda' %} - name: openmpi + {% if mpi_type == 'conda' %} script: build-mpi.sh + {% endif %} build: + {% if mpi_type == 'conda' %} run_exports: - {{ pin_subpackage('openmpi', min_pin='x.x.x', max_pin='x') }} + {% else %} + string: {{ mpi_type }}_h{{ PKG_HASH }}_{{ build }} + track_features: + - openmpi_{{ mpi_type }} + {% endif %} ignore_run_exports: - ucx # [linux] ignore_run_exports_from: @@ -65,10 +72,16 @@ outputs: # Ensure a consistent CUDA environment - cuda-version >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] test: + {% if mpi_type == 'conda' %} script: run_test.sh files: - tests/helloworld.sh + {% else %} + commands: + - echo "It works!" + {% endif %} + {% if mpi_type == 'conda' %} - name: openmpi-mpicc build: script: @@ -125,19 +138,6 @@ outputs: files: - tests/helloworld.f - tests/helloworld.f90 - {% else %} - - name: openmpi - build: - string: {{ mpi_type }}_{{ build }} - track_features: - - openmpi_{{ mpi_type }} - requirements: - host: [] - run: - - mpi 1.0 openmpi - test: - commands: - - echo "It works!" {% endif %} about: From db19ec3201fb0dcfcc1d0c3d0bce379343a50eff Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 3 Jun 2024 13:41:45 +0200 Subject: [PATCH 082/224] set environment in activate.sh for conda-build this should avoid the tedious requirement to set a bunch of ever-changing environment variables in every package that builds against openmpi --- recipe/build-mpi.sh | 3 +++ recipe/meta.yaml | 2 +- recipe/openmpi_activate.sh | 8 ++++++++ recipe/run_test.sh | 6 ------ 4 files changed, 12 insertions(+), 7 deletions(-) create mode 100755 recipe/openmpi_activate.sh diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 2871665c..d258c55a 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -93,3 +93,6 @@ fi if [ -f $POST_LINK ]; then chmod +x $POST_LINK fi + +mkdir -p $PREFIX/etc/conda/activate.d +cp -v $RECIPE/openmpi_activate.sh $PREFIX/etc/conda/activate.d/ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 186f7456..cc69456d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.3" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 3 %} +{% set build = 4 %} # give conda package a higher build number {% if mpi_type == 'conda' %} diff --git a/recipe/openmpi_activate.sh b/recipe/openmpi_activate.sh new file mode 100755 index 00000000..714c95c5 --- /dev/null +++ b/recipe/openmpi_activate.sh @@ -0,0 +1,8 @@ +if [[ "${CONDA_BUILD:-}" = "1" ]]; then + echo "setting openmpi environment variables for conda-build" + export OMPI_MCA_plm_ssh_agent=false + export OMPI_MCA_pml=ob1 + export OMPI_MCA_mpi_yield_when_idle=true + export OMPI_MCA_btl_base_warn_component_unused=false + export PRTE_MCA_rmaps_default_mapping_policy=:oversubscribe +fi diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 33b609a0..6d1b5159 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -1,12 +1,6 @@ #!/bin/bash set -ex -export OMPI_MCA_pml=ob1 -export OMPI_MCA_btl=sm,self -export OMPI_MCA_plm_ssh_agent=false -export OMPI_MCA_rmaps_default_mapping_policy=:oversubscribe -export OMPI_ALLOW_RUN_AS_ROOT=1 -export OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1 MPIEXEC="mpiexec" pushd "tests" From 4b910b0278556465c4509f18f662fc995a781585 Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 3 Jun 2024 14:24:01 +0200 Subject: [PATCH 083/224] RECIPE_DIR typo --- recipe/build-mpi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index d258c55a..95462aa7 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -95,4 +95,4 @@ if [ -f $POST_LINK ]; then fi mkdir -p $PREFIX/etc/conda/activate.d -cp -v $RECIPE/openmpi_activate.sh $PREFIX/etc/conda/activate.d/ +cp -v $RECIPE_DIR/openmpi_activate.sh $PREFIX/etc/conda/activate.d/ From be8c94d259c68d032df5ed9bfec9dba0658558b8 Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 5 Jun 2024 11:35:00 +0200 Subject: [PATCH 084/224] configure compiler wrapper flags by default set OMPI_ compiler wrapper flags from conda-build compiler flags --- recipe/meta.yaml | 2 +- recipe/openmpi_activate.sh | 8 ++++++++ recipe/run_test.sh | 23 +++++++++++++++++------ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cc69456d..9d42c322 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.3" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 4 %} +{% set build = 5 %} # give conda package a higher build number {% if mpi_type == 'conda' %} diff --git a/recipe/openmpi_activate.sh b/recipe/openmpi_activate.sh index 714c95c5..f880b307 100755 --- a/recipe/openmpi_activate.sh +++ b/recipe/openmpi_activate.sh @@ -1,5 +1,13 @@ if [[ "${CONDA_BUILD:-}" = "1" ]]; then echo "setting openmpi environment variables for conda-build" + # build-time variables + for _var in CC CXX FC CPPFLAGS CFLAGS CXXFLAGS FCFLAGS LDFLAGS; do + if [[ ! -z "${!_var:-}" ]]; then + declare -x OMPI_${_var}=${!_var} + fi + done + + # runtime variables export OMPI_MCA_plm_ssh_agent=false export OMPI_MCA_pml=ob1 export OMPI_MCA_mpi_yield_when_idle=true diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 6d1b5159..1760f8a2 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -32,7 +32,12 @@ if [[ $PKG_NAME == "openmpi-mpicc" ]]; then command -v mpicc mpicc -show - mpicc $CFLAGS $LDFLAGS helloworld.c -o helloworld_c + test ! -z "${OMPI_CC:-}" + test ! -z "${OMPI_CFLAGS:-}" + test ! -z "${OMPI_CPPFLAGS:-}" + test ! -z "${OMPI_LDFLAGS:-}" + + mpicc helloworld.c -o helloworld_c $MPIEXEC -n 4 ./helloworld_c fi @@ -40,30 +45,36 @@ if [[ $PKG_NAME == "openmpi-mpicxx" ]]; then command -v mpicxx mpicxx -show - mpicxx $CXXFLAGS $LDFLAGS helloworld.cxx -o helloworld_cxx + test ! -z "${OMPI_CXX:-}" + test ! -z "${OMPI_CXXFLAGS:-}" + + mpicxx helloworld.cxx -o helloworld_cxx $MPIEXEC -n 4 ./helloworld_cxx fi if [[ $PKG_NAME == "openmpi-mpifort" ]]; then command -v mpifort mpifort -show + + test ! -z "${OMPI_FC:-}" + test ! -z "${OMPI_FCFLAGS:-}" - mpifort $FFLAGS $LDFLAGS helloworld.f -o helloworld1_f + mpifort helloworld.f -o helloworld1_f $MPIEXEC -n 4 ./helloworld1_f - mpifort $FFLAGS $LDFLAGS helloworld.f90 -o helloworld1_f90 + mpifort helloworld.f90 -o helloworld1_f90 $MPIEXEC -n 4 ./helloworld1_f90 command -v mpif77 mpif77 -show - mpif77 $FFLAGS $LDFLAGS helloworld.f -o helloworld2_f + mpif77 helloworld.f -o helloworld2_f $MPIEXEC -n 4 ./helloworld2_f command -v mpif90 mpif90 -show - mpif90 $FFLAGS $LDFLAGS helloworld.f90 -o helloworld2_f90 + mpif90 helloworld.f90 -o helloworld2_f90 $MPIEXEC -n 4 ./helloworld2_f90 fi From 46224b15254e26fd0c12f1978dacfce1e24eeffc Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 5 Jun 2024 11:35:34 +0200 Subject: [PATCH 085/224] install .mod files in include like every other fortran package --- recipe/build-mpi.sh | 4 ++++ recipe/run_test.sh | 3 +++ 2 files changed, 7 insertions(+) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 95462aa7..52f55e1f 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -73,6 +73,10 @@ fi make -j"${CPU_COUNT:-1}" make install +# openmpi installs .mod files in the wrong prefix (/lib instead of /include) +ls -l $PREFIX/lib/*.mod +mv -v $PREFIX/lib/*.mod $PREFIX/include/ + POST_LINK=$PREFIX/bin/.openmpi-post-link.sh if [ -n "$build_with_ucx" ]; then echo "setting MCA pml to ^ucx..." diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 1760f8a2..bbd1136e 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -26,6 +26,9 @@ if [[ $PKG_NAME == "openmpi" ]]; then command -v mpiexec $MPIEXEC --help $MPIEXEC -n 4 ./helloworld.sh + + test -f $PREFIX/include/mpi.mod + test ! -f $PREFIX/include/mpi.mod fi if [[ $PKG_NAME == "openmpi-mpicc" ]]; then From 1d09c4c3a423573ce9aa64b318c7c02e3d3744b3 Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 5 Jun 2024 12:26:26 +0200 Subject: [PATCH 086/224] shouldn't find fortran modules in lib --- recipe/run_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/run_test.sh b/recipe/run_test.sh index bbd1136e..81a19036 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -28,7 +28,7 @@ if [[ $PKG_NAME == "openmpi" ]]; then $MPIEXEC -n 4 ./helloworld.sh test -f $PREFIX/include/mpi.mod - test ! -f $PREFIX/include/mpi.mod + test ! -f $PREFIX/lib/mpi.mod fi if [[ $PKG_NAME == "openmpi-mpicc" ]]; then From a1016cfd561bbb32be4a27c4a6f67b0228576d1f Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 5 Jun 2024 13:08:41 +0200 Subject: [PATCH 087/224] declare quotes --- recipe/openmpi_activate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/openmpi_activate.sh b/recipe/openmpi_activate.sh index f880b307..96cc46b1 100755 --- a/recipe/openmpi_activate.sh +++ b/recipe/openmpi_activate.sh @@ -3,7 +3,7 @@ if [[ "${CONDA_BUILD:-}" = "1" ]]; then # build-time variables for _var in CC CXX FC CPPFLAGS CFLAGS CXXFLAGS FCFLAGS LDFLAGS; do if [[ ! -z "${!_var:-}" ]]; then - declare -x OMPI_${_var}=${!_var} + declare -x "OMPI_${_var}=${!_var}" fi done From 5fa25d882d01c6e229cc1bad8ab27435ee59b716 Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 5 Jun 2024 13:41:39 +0200 Subject: [PATCH 088/224] set OPAL_PREFIX --- recipe/openmpi_activate.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/openmpi_activate.sh b/recipe/openmpi_activate.sh index 96cc46b1..70ff89d2 100755 --- a/recipe/openmpi_activate.sh +++ b/recipe/openmpi_activate.sh @@ -6,6 +6,7 @@ if [[ "${CONDA_BUILD:-}" = "1" ]]; then declare -x "OMPI_${_var}=${!_var}" fi done + export OPAL_PREFIX="$PREFIX" # runtime variables export OMPI_MCA_plm_ssh_agent=false From 28e6a1402082890a73465e2fcb8d1b7b09b2ebcc Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 5 Jun 2024 14:28:10 +0200 Subject: [PATCH 089/224] declare global ensures export --- recipe/openmpi_activate.sh | 3 ++- recipe/run_test.sh | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/recipe/openmpi_activate.sh b/recipe/openmpi_activate.sh index 70ff89d2..c1eec889 100755 --- a/recipe/openmpi_activate.sh +++ b/recipe/openmpi_activate.sh @@ -3,7 +3,8 @@ if [[ "${CONDA_BUILD:-}" = "1" ]]; then # build-time variables for _var in CC CXX FC CPPFLAGS CFLAGS CXXFLAGS FCFLAGS LDFLAGS; do if [[ ! -z "${!_var:-}" ]]; then - declare -x "OMPI_${_var}=${!_var}" + echo "OMPI_${_var}=${!_var}" + declare -gx "OMPI_${_var}=${!_var}" fi done export OPAL_PREFIX="$PREFIX" diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 81a19036..2a511d42 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -35,6 +35,8 @@ if [[ $PKG_NAME == "openmpi-mpicc" ]]; then command -v mpicc mpicc -show + env | grep OMPI + test ! -z "${OMPI_CC:-}" test ! -z "${OMPI_CFLAGS:-}" test ! -z "${OMPI_CPPFLAGS:-}" From 250f5292d87680eb1659131eebc7e518e737f7da Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 5 Jun 2024 15:07:21 +0200 Subject: [PATCH 090/224] export works I'll get it one of these days --- recipe/openmpi_activate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/openmpi_activate.sh b/recipe/openmpi_activate.sh index c1eec889..92effaa0 100755 --- a/recipe/openmpi_activate.sh +++ b/recipe/openmpi_activate.sh @@ -4,7 +4,7 @@ if [[ "${CONDA_BUILD:-}" = "1" ]]; then for _var in CC CXX FC CPPFLAGS CFLAGS CXXFLAGS FCFLAGS LDFLAGS; do if [[ ! -z "${!_var:-}" ]]; then echo "OMPI_${_var}=${!_var}" - declare -gx "OMPI_${_var}=${!_var}" + export OMPI_${_var}="${!_var}" fi done export OPAL_PREFIX="$PREFIX" From 3c69da01db3fd77a3cd8f27912eb0d4d266d3042 Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 5 Jun 2024 15:13:16 +0200 Subject: [PATCH 091/224] FCFLAGS is FFLAGS --- recipe/openmpi_activate.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/openmpi_activate.sh b/recipe/openmpi_activate.sh index 92effaa0..858cd017 100755 --- a/recipe/openmpi_activate.sh +++ b/recipe/openmpi_activate.sh @@ -6,6 +6,9 @@ if [[ "${CONDA_BUILD:-}" = "1" ]]; then echo "OMPI_${_var}=${!_var}" export OMPI_${_var}="${!_var}" fi + if [[ -z "${OMPI_FCFLAGS}" && ! -z "${FFLAGS}" ]]; then + export OMPI_FCFLAGS="$FFLAGS" + fi done export OPAL_PREFIX="$PREFIX" From 6cb13641afe0c16d02f0a82cc0acce17bb5945eb Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 5 Jun 2024 22:46:48 +0200 Subject: [PATCH 092/224] -I in FFLAGS --- recipe/openmpi_activate.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/openmpi_activate.sh b/recipe/openmpi_activate.sh index 858cd017..66318f50 100755 --- a/recipe/openmpi_activate.sh +++ b/recipe/openmpi_activate.sh @@ -7,7 +7,8 @@ if [[ "${CONDA_BUILD:-}" = "1" ]]; then export OMPI_${_var}="${!_var}" fi if [[ -z "${OMPI_FCFLAGS}" && ! -z "${FFLAGS}" ]]; then - export OMPI_FCFLAGS="$FFLAGS" + echo OMPI_FCFLAGS="-I$PREFIX/include $FFLAGS" + export OMPI_FCFLAGS="-I$PREFIX/include $FFLAGS" fi done export OPAL_PREFIX="$PREFIX" From f61a0b27e1d89ad2e031a45b9efdaf1e192f466f Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 5 Jun 2024 23:16:38 +0200 Subject: [PATCH 093/224] symlink instead of copy for fortran module includes --- recipe/build-mpi.sh | 7 +++++-- recipe/run_test.sh | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 52f55e1f..8df268a7 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -74,8 +74,11 @@ make -j"${CPU_COUNT:-1}" make install # openmpi installs .mod files in the wrong prefix (/lib instead of /include) -ls -l $PREFIX/lib/*.mod -mv -v $PREFIX/lib/*.mod $PREFIX/include/ +# symlink instead of copy to avoid breaking anything (unlikely) +for f in $PREFIX/lib/*.mod; do + modname=$(basename "$f") + ln -sv "../lib/${modname}" "$PREFIX/include/${modname}" +done POST_LINK=$PREFIX/bin/.openmpi-post-link.sh if [ -n "$build_with_ucx" ]; then diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 2a511d42..23c8510b 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -28,7 +28,8 @@ if [[ $PKG_NAME == "openmpi" ]]; then $MPIEXEC -n 4 ./helloworld.sh test -f $PREFIX/include/mpi.mod - test ! -f $PREFIX/lib/mpi.mod + # keep duplicates in original location for now + test -f $PREFIX/lib/mpi.mod fi if [[ $PKG_NAME == "openmpi-mpicc" ]]; then From 51203d342100f9f005cd82a2bdf583dc21bd2875 Mon Sep 17 00:00:00 2001 From: Min RK Date: Sat, 8 Jun 2024 17:32:35 +0200 Subject: [PATCH 094/224] only set wrapper args for cross compilation defaults are not likely to be wrong for native compilation, don't mess with them and don't passthrough $LDFLAGS, etc., set the actual correct values from the wrappers with the right prefix --- recipe/meta.yaml | 2 +- recipe/openmpi_activate.sh | 35 +++++++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9d42c322..db42f8b3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.3" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 5 %} +{% set build = 6 %} # give conda package a higher build number {% if mpi_type == 'conda' %} diff --git a/recipe/openmpi_activate.sh b/recipe/openmpi_activate.sh index 66318f50..725de449 100755 --- a/recipe/openmpi_activate.sh +++ b/recipe/openmpi_activate.sh @@ -1,17 +1,32 @@ if [[ "${CONDA_BUILD:-}" = "1" ]]; then echo "setting openmpi environment variables for conda-build" - # build-time variables - for _var in CC CXX FC CPPFLAGS CFLAGS CXXFLAGS FCFLAGS LDFLAGS; do - if [[ ! -z "${!_var:-}" ]]; then - echo "OMPI_${_var}=${!_var}" - export OMPI_${_var}="${!_var}" + if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" = "1" ]]; then + # set compilation variables during cross compilation + for _var in CC CXX FC; do + if [[ ! -z "${!_var:-}" ]]; then + echo "OMPI_${_var}=${!_var}" + export OMPI_${_var}="${!_var}" + fi + done + # require pkg-config? + if [[ -z "${OMPI_CFLAGS:-}" ]]; then + # pkg-config --cflags ompi + export OMPI_CFLAGS="-I$PREFIX/include" fi - if [[ -z "${OMPI_FCFLAGS}" && ! -z "${FFLAGS}" ]]; then - echo OMPI_FCFLAGS="-I$PREFIX/include $FFLAGS" - export OMPI_FCFLAGS="-I$PREFIX/include $FFLAGS" + if [[ -z "${OMPI_CXXFLAGS:-}" ]]; then + # pkg-config --cflags ompi-cxx + export OMPI_CXXFLAGS="-I$PREFIX/include" fi - done - export OPAL_PREFIX="$PREFIX" + if [[ -z "${OMPI_FCFLAGS:-}" ]]; then + # pkg-config --cflags ompi-fort + export OMPI_FCFLAGS="-I$PREFIX/include" + fi + if [[ -z "${OMPI_LDFLAGS:-}" ]]; then + # pkg-config --libs-only-L --libs-only-other ompi + export OMPI_LDFLAGS="-L$PREFIX/lib -Wl,-rpath,$PREFIX/lib" + fi + export OPAL_PREFIX="$PREFIX" + fi # runtime variables export OMPI_MCA_plm_ssh_agent=false From a4b6e511dbc90ac0dad6d4c554868324aa3d5f52 Mon Sep 17 00:00:00 2001 From: Min RK Date: Sat, 8 Jun 2024 19:31:54 +0200 Subject: [PATCH 095/224] expect empty overrides unless cross compiling --- recipe/run_test.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 23c8510b..38c4a0c1 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -38,10 +38,10 @@ if [[ $PKG_NAME == "openmpi-mpicc" ]]; then env | grep OMPI - test ! -z "${OMPI_CC:-}" - test ! -z "${OMPI_CFLAGS:-}" - test ! -z "${OMPI_CPPFLAGS:-}" - test ! -z "${OMPI_LDFLAGS:-}" + test -z "${OMPI_CC:-}" + test -z "${OMPI_CFLAGS:-}" + test -z "${OMPI_CPPFLAGS:-}" + test -z "${OMPI_LDFLAGS:-}" mpicc helloworld.c -o helloworld_c $MPIEXEC -n 4 ./helloworld_c @@ -51,8 +51,8 @@ if [[ $PKG_NAME == "openmpi-mpicxx" ]]; then command -v mpicxx mpicxx -show - test ! -z "${OMPI_CXX:-}" - test ! -z "${OMPI_CXXFLAGS:-}" + test -z "${OMPI_CXX:-}" + test -z "${OMPI_CXXFLAGS:-}" mpicxx helloworld.cxx -o helloworld_cxx $MPIEXEC -n 4 ./helloworld_cxx @@ -62,8 +62,8 @@ if [[ $PKG_NAME == "openmpi-mpifort" ]]; then command -v mpifort mpifort -show - test ! -z "${OMPI_FC:-}" - test ! -z "${OMPI_FCFLAGS:-}" + test -z "${OMPI_FC:-}" + test -z "${OMPI_FCFLAGS:-}" mpifort helloworld.f -o helloworld1_f $MPIEXEC -n 4 ./helloworld1_f From 11d1bd180dc591ce3d9ea3ec99dbee2922d2b71a Mon Sep 17 00:00:00 2001 From: Min RK Date: Sat, 8 Jun 2024 22:14:19 +0200 Subject: [PATCH 096/224] build on cos7 updates c_stdlib reliably --- conda-forge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index 1392287c..55b23c9e 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -12,6 +12,8 @@ conda_forge_output_validation: true github: branch_name: main tooling_branch_name: main +os_version: + linux_64: cos7 provider: linux_aarch64: default linux_ppc64le: default From 4c33c1c1965d8aedf1052d8ab1be36724064b842 Mon Sep 17 00:00:00 2001 From: Min RK Date: Sat, 8 Jun 2024 22:16:22 +0200 Subject: [PATCH 097/224] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.36.1, and conda-forge-pinning 2024.06.08.16.24.57 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ++++---- ...version11fortran_compiler_version11mpi_typeconda.yaml} | 2 +- ...sion11fortran_compiler_version11mpi_typeexternal.yaml} | 2 +- ..._version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...rsion11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- ..._version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...rsion11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- README.md | 8 ++++---- 10 files changed, 16 insertions(+), 16 deletions(-) rename .ci_support/{linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml => linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml} (98%) rename .ci_support/{linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml => linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml} (98%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 4d4b72cc..abf7edd5 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,12 +8,12 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - ? linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda - : CONFIG: linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda + ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda + : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - ? linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal - : CONFIG: linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal + ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal + : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 ? linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda diff --git a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml similarity index 98% rename from .ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 32496fc3..751555c6 100644 --- a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -46,4 +46,4 @@ zip_keys: - cuda_compiler_version - docker_image zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml similarity index 98% rename from .ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index ef4e65a1..a0989355 100644 --- a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -46,4 +46,4 @@ zip_keys: - cuda_compiler_version - docker_image zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 5617c36f..c1c631a8 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -50,4 +50,4 @@ zip_keys: - cuda_compiler_version - docker_image zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index f820b94f..5090c0ce 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -50,4 +50,4 @@ zip_keys: - cuda_compiler_version - docker_image zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 2b08b265..cce7ab8a 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -46,4 +46,4 @@ zip_keys: - cuda_compiler_version - docker_image zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index ee8620c9..aedf5bee 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -46,4 +46,4 @@ zip_keys: - cuda_compiler_version - docker_image zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index b58cbac4..6cc18dfa 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -41,4 +41,4 @@ zip_keys: - cxx_compiler_version - fortran_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 22d4772c..8ffb47d9 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -41,4 +41,4 @@ zip_keys: - cxx_compiler_version - fortran_compiler_version zlib: -- '1.2' +- '1' diff --git a/README.md b/README.md index bf5fdd94..9b2d8fac 100644 --- a/README.md +++ b/README.md @@ -36,17 +36,17 @@ Current build status
VariantStatus
linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typecondalinux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda - variant + variant
linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternallinux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal - variant + variant
- + - + From 3546c823eaa5891f9cebd2accbbd7dbd784bc08b Mon Sep 17 00:00:00 2001 From: Min RK Date: Sat, 8 Jun 2024 22:30:27 +0200 Subject: [PATCH 098/224] restore compiler flags in tests appears to be required for proper sysroot linkage on linux but these don't belong in the compiler wrappers themselves --- recipe/run_test.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 38c4a0c1..bed81c1f 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -43,7 +43,7 @@ if [[ $PKG_NAME == "openmpi-mpicc" ]]; then test -z "${OMPI_CPPFLAGS:-}" test -z "${OMPI_LDFLAGS:-}" - mpicc helloworld.c -o helloworld_c + mpicc $CFLAGS $LDFLAGS helloworld.c -o helloworld_c $MPIEXEC -n 4 ./helloworld_c fi @@ -54,7 +54,7 @@ if [[ $PKG_NAME == "openmpi-mpicxx" ]]; then test -z "${OMPI_CXX:-}" test -z "${OMPI_CXXFLAGS:-}" - mpicxx helloworld.cxx -o helloworld_cxx + mpicxx $CXXFLAGS $LDFLAGS helloworld.cxx -o helloworld_cxx $MPIEXEC -n 4 ./helloworld_cxx fi @@ -65,22 +65,22 @@ if [[ $PKG_NAME == "openmpi-mpifort" ]]; then test -z "${OMPI_FC:-}" test -z "${OMPI_FCFLAGS:-}" - mpifort helloworld.f -o helloworld1_f + mpifort $FFLAGS $LDFLAGS helloworld.f -o helloworld1_f $MPIEXEC -n 4 ./helloworld1_f - mpifort helloworld.f90 -o helloworld1_f90 + mpifort $FFLAGS $LDFLAGS helloworld.f90 -o helloworld1_f90 $MPIEXEC -n 4 ./helloworld1_f90 command -v mpif77 mpif77 -show - mpif77 helloworld.f -o helloworld2_f + mpif77 $FFLAGS $LDFLAGS helloworld.f -o helloworld2_f $MPIEXEC -n 4 ./helloworld2_f command -v mpif90 mpif90 -show - mpif90 helloworld.f90 -o helloworld2_f90 + mpif90 $FFLAGS $LDFLAGS helloworld.f90 -o helloworld2_f90 $MPIEXEC -n 4 ./helloworld2_f90 fi From ead313481ca3a6ff59afb73eeab83fc7152be7de Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 10 Jun 2024 12:48:29 +0200 Subject: [PATCH 099/224] add -Wl,--allow-shlib-undefined to wrapper ldflags fixes glibc lookup when building dependents with sysroot 2.12 avoids need for excessive flags in test env --- recipe/build-mpi.sh | 6 +++++- recipe/openmpi_activate.sh | 3 +++ recipe/run_test.sh | 12 ++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 8df268a7..7894969e 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -11,6 +11,7 @@ export FC=$(basename "$FC") unset FFLAGS F77 F90 F95 # tweak compiler flags +wrapper_ldflags="-L$PREFIX/lib -Wl,-rpath,$PREFIX/lib" export LIBRARY_PATH="$PREFIX/lib" if [[ "$target_platform" == osx-* ]]; then if [[ -n "$CONDA_BUILD_SYSROOT" ]]; then @@ -23,6 +24,9 @@ fi build_with_ucx="" if [[ "$target_platform" == linux-* ]]; then build_with_ucx="--with-ucx=$PREFIX" + # allow-shlib-undefined required for dependencies to link against older sysroot + # avoids undefined + wrapper_ldflags="${wrapper_ldflags} -Wl,--allow-shlib-undefined" fi # CUDA support @@ -60,7 +64,7 @@ fi --with-wrapper-cflags="-I$PREFIX/include" \ --with-wrapper-cxxflags="-I$PREFIX/include" \ --with-wrapper-fcflags="-I$PREFIX/include" \ - --with-wrapper-ldflags="-L$PREFIX/lib -Wl,-rpath,$PREFIX/lib" \ + --with-wrapper-ldflags="${wrapper_ldflags}" \ --with-sge \ --with-hwloc=$PREFIX \ --with-libevent=$PREFIX \ diff --git a/recipe/openmpi_activate.sh b/recipe/openmpi_activate.sh index 725de449..4279fd30 100755 --- a/recipe/openmpi_activate.sh +++ b/recipe/openmpi_activate.sh @@ -24,6 +24,9 @@ if [[ "${CONDA_BUILD:-}" = "1" ]]; then if [[ -z "${OMPI_LDFLAGS:-}" ]]; then # pkg-config --libs-only-L --libs-only-other ompi export OMPI_LDFLAGS="-L$PREFIX/lib -Wl,-rpath,$PREFIX/lib" + if [[ "${target_platform:-}" == linux-* ]]; then + export OMPI_LDFLAGS="${OMPI_LDFLAGS} -Wl,--allow-shlib-undefined" + fi fi export OPAL_PREFIX="$PREFIX" fi diff --git a/recipe/run_test.sh b/recipe/run_test.sh index bed81c1f..38c4a0c1 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -43,7 +43,7 @@ if [[ $PKG_NAME == "openmpi-mpicc" ]]; then test -z "${OMPI_CPPFLAGS:-}" test -z "${OMPI_LDFLAGS:-}" - mpicc $CFLAGS $LDFLAGS helloworld.c -o helloworld_c + mpicc helloworld.c -o helloworld_c $MPIEXEC -n 4 ./helloworld_c fi @@ -54,7 +54,7 @@ if [[ $PKG_NAME == "openmpi-mpicxx" ]]; then test -z "${OMPI_CXX:-}" test -z "${OMPI_CXXFLAGS:-}" - mpicxx $CXXFLAGS $LDFLAGS helloworld.cxx -o helloworld_cxx + mpicxx helloworld.cxx -o helloworld_cxx $MPIEXEC -n 4 ./helloworld_cxx fi @@ -65,22 +65,22 @@ if [[ $PKG_NAME == "openmpi-mpifort" ]]; then test -z "${OMPI_FC:-}" test -z "${OMPI_FCFLAGS:-}" - mpifort $FFLAGS $LDFLAGS helloworld.f -o helloworld1_f + mpifort helloworld.f -o helloworld1_f $MPIEXEC -n 4 ./helloworld1_f - mpifort $FFLAGS $LDFLAGS helloworld.f90 -o helloworld1_f90 + mpifort helloworld.f90 -o helloworld1_f90 $MPIEXEC -n 4 ./helloworld1_f90 command -v mpif77 mpif77 -show - mpif77 $FFLAGS $LDFLAGS helloworld.f -o helloworld2_f + mpif77 helloworld.f -o helloworld2_f $MPIEXEC -n 4 ./helloworld2_f command -v mpif90 mpif90 -show - mpif90 $FFLAGS $LDFLAGS helloworld.f90 -o helloworld2_f90 + mpif90 helloworld.f90 -o helloworld2_f90 $MPIEXEC -n 4 ./helloworld2_f90 fi From 38388f32e99d23755bafc9086e7f2f12d2c6f255 Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 11 Jun 2024 13:24:31 +0200 Subject: [PATCH 100/224] specify cos7 for all linux Co-authored-by: jakirkham --- conda-forge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index 55b23c9e..831dd508 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -14,6 +14,8 @@ github: tooling_branch_name: main os_version: linux_64: cos7 + linux_aarch64: cos7 + linux_ppc64le: cos7 provider: linux_aarch64: default linux_ppc64le: default From 775f10d654445ef3336a47d04e0cb7744671d1e2 Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 11 Jun 2024 13:25:33 +0200 Subject: [PATCH 101/224] remove redundant c_stdlib_version config --- recipe/conda_build_config.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 04316567..339d5f09 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,6 +1,3 @@ -c_stdlib_version: # [linux] - - 2.17 # [linux] - mpi_type: - external # [linux] - conda From 10901ebca0117c6b9994c342784d95aa58b81d88 Mon Sep 17 00:00:00 2001 From: Kian-Tat Lim Date: Wed, 12 Jun 2024 19:52:17 +0000 Subject: [PATCH 102/224] Make activate script POSIX-compatible. --- recipe/openmpi_activate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/openmpi_activate.sh b/recipe/openmpi_activate.sh index 66318f50..cab4f503 100755 --- a/recipe/openmpi_activate.sh +++ b/recipe/openmpi_activate.sh @@ -1,4 +1,4 @@ -if [[ "${CONDA_BUILD:-}" = "1" ]]; then +if [ "${CONDA_BUILD:-}" = "1" ]; then echo "setting openmpi environment variables for conda-build" # build-time variables for _var in CC CXX FC CPPFLAGS CFLAGS CXXFLAGS FCFLAGS LDFLAGS; do From 3c569ba99bf08c7c6b792b03ee2926a65d65abc0 Mon Sep 17 00:00:00 2001 From: Kian-Tat Lim Date: Wed, 12 Jun 2024 19:53:58 +0000 Subject: [PATCH 103/224] Bump build number. --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9d42c322..db42f8b3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.3" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 5 %} +{% set build = 6 %} # give conda package a higher build number {% if mpi_type == 'conda' %} From 8b36843ae85fdf5ec6d0514a61193fc4326ba0cc Mon Sep 17 00:00:00 2001 From: Min RK Date: Thu, 13 Jun 2024 08:57:47 +0200 Subject: [PATCH 104/224] avoid bash features in activation script bash is the only shell that will take these steps, but it won't be the only shell to process the file as a whole --- recipe/meta.yaml | 2 +- recipe/openmpi_activate.sh | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index db42f8b3..45d4486b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.3" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 6 %} +{% set build = 7 %} # give conda package a higher build number {% if mpi_type == 'conda' %} diff --git a/recipe/openmpi_activate.sh b/recipe/openmpi_activate.sh index 888566a2..bebc706e 100755 --- a/recipe/openmpi_activate.sh +++ b/recipe/openmpi_activate.sh @@ -2,12 +2,21 @@ if [ "${CONDA_BUILD:-}" = "1" ]; then echo "setting openmpi environment variables for conda-build" if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" = "1" ]]; then # set compilation variables during cross compilation - for _var in CC CXX FC; do - if [[ ! -z "${!_var:-}" ]]; then - echo "OMPI_${_var}=${!_var}" - export OMPI_${_var}="${!_var}" - fi - done + if [[ -z "${OMPI_CC:-}" && ! -z "${CC:-}" ]]; then + echo "OMPI_CC=${CC}" + export "OMPI_CC=${CC}" + fi + + if [[ -z "${OMPI_CXX:-}" && ! -z "${CXX:-}" ]]; then + echo "OMPI_CXX=${CXX}" + export "OMPI_CXX=${CXX}" + fi + + if [[ -z "${OMPI_FC:-}" && ! -z "${FC:-}" ]]; then + echo "OMPI_FC=${FC}" + export "OMPI_FC=${FC}" + fi + # require pkg-config? if [[ -z "${OMPI_CFLAGS:-}" ]]; then # pkg-config --cflags ompi From 9de4c85b16d0d17ad13197bf32077774cc9e3d36 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 3 Jul 2024 17:34:11 +0000 Subject: [PATCH 105/224] Rebuild for libhwloc 2.11.0 --- .ci_support/migrations/libhwloc2110.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libhwloc2110.yaml diff --git a/.ci_support/migrations/libhwloc2110.yaml b/.ci_support/migrations/libhwloc2110.yaml new file mode 100644 index 00000000..f82784e1 --- /dev/null +++ b/.ci_support/migrations/libhwloc2110.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libhwloc 2.11.0 + kind: version + migration_number: 1 +libhwloc: +- 2.11.0 +migrator_ts: 1719349281.82988 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 45d4486b..2ac201a8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.3" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 7 %} +{% set build = 8 %} # give conda package a higher build number {% if mpi_type == 'conda' %} From 79bd592780228ac42713998ca1f16333e9858398 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 3 Jul 2024 17:36:00 +0000 Subject: [PATCH 106/224] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.03.17.21.50 --- ...r_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ersion11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- ...r_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ersion11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- ...r_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ersion11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .scripts/build_steps.sh | 7 +++++++ .scripts/run_osx_build.sh | 7 +++++++ 10 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 751555c6..f4f1537d 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.10.0 +- 2.11.0 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index a0989355..023921cc 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.10.0 +- 2.11.0 mpi_type: - external target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index c1c631a8..c89cc55d 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -33,7 +33,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.10.0 +- 2.11.0 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 5090c0ce..9da7e768 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -33,7 +33,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.10.0 +- 2.11.0 mpi_type: - external target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index cce7ab8a..72b41d61 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.10.0 +- 2.11.0 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index aedf5bee..2a1eff60 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.10.0 +- 2.11.0 mpi_type: - external target_platform: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 6cc18dfa..aea8e574 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.10.0 +- 2.11.0 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 8ffb47d9..51007da4 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.10.0 +- 2.11.0 macos_machine: - arm64-apple-darwin20.0.0 mpi_type: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 899ba03c..a5836e8d 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,6 +72,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff219..ba0c8791 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -85,6 +85,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" From ebc007613802519772363b495b0820a581dff34c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 9 Jul 2024 00:40:43 +0000 Subject: [PATCH 107/224] Rebuild for libhwloc 2.11.1 --- .ci_support/migrations/libhwloc2111.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libhwloc2111.yaml diff --git a/.ci_support/migrations/libhwloc2111.yaml b/.ci_support/migrations/libhwloc2111.yaml new file mode 100644 index 00000000..ca90c7a1 --- /dev/null +++ b/.ci_support/migrations/libhwloc2111.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libhwloc 2.11.1 + kind: version + migration_number: 1 +libhwloc: +- 2.11.1 +migrator_ts: 1720471981.8039248 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2ac201a8..4579d90b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.3" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 8 %} +{% set build = 9 %} # give conda package a higher build number {% if mpi_type == 'conda' %} From be43c43d292185bfae3e4be63024f843fbd84be0 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 9 Jul 2024 00:42:37 +0000 Subject: [PATCH 108/224] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.08.21.10.22 --- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index f4f1537d..ebedeaf5 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.11.0 +- 2.11.1 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 023921cc..11c3d9c7 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.11.0 +- 2.11.1 mpi_type: - external target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index c89cc55d..faaf389e 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -33,7 +33,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.11.0 +- 2.11.1 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 9da7e768..6498347b 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -33,7 +33,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.11.0 +- 2.11.1 mpi_type: - external target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 72b41d61..14e371a5 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.11.0 +- 2.11.1 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 2a1eff60..66101802 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.11.0 +- 2.11.1 mpi_type: - external target_platform: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index aea8e574..aec1bf49 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.11.0 +- 2.11.1 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 51007da4..045503e1 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.11.0 +- 2.11.1 macos_machine: - arm64-apple-darwin20.0.0 mpi_type: From fb7ed8ebf002955dcbd4d9dab7285a2c60b69b72 Mon Sep 17 00:00:00 2001 From: Chen-Yu Ho Date: Wed, 10 Jul 2024 14:36:07 -0700 Subject: [PATCH 109/224] Add --enable-ipv6 flag to build-mpi.sh configure --- recipe/build-mpi.sh | 1 + recipe/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 7894969e..5ebf122a 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -70,6 +70,7 @@ fi --with-libevent=$PREFIX \ --with-zlib=$PREFIX \ --enable-mca-dso \ + --enable-ipv6 \ $build_with_ucx \ $build_with_cuda \ || (cat config.log; false) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4579d90b..4578cdd7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.3" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 9 %} +{% set build = 10 %} # give conda package a higher build number {% if mpi_type == 'conda' %} From 306e5c86e36a900eceddd6a25078d3b89a5169a6 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 06:08:19 +0000 Subject: [PATCH 110/224] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.11.04.41.36 --- .ci_support/migrations/libhwloc2110.yaml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .ci_support/migrations/libhwloc2110.yaml diff --git a/.ci_support/migrations/libhwloc2110.yaml b/.ci_support/migrations/libhwloc2110.yaml deleted file mode 100644 index f82784e1..00000000 --- a/.ci_support/migrations/libhwloc2110.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libhwloc 2.11.0 - kind: version - migration_number: 1 -libhwloc: -- 2.11.0 -migrator_ts: 1719349281.82988 From f629ea3f862800e9ec06cf4d2b321282f72b5bcf Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 19 Jul 2024 21:17:18 +0000 Subject: [PATCH 111/224] updated v5.0.4 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4578cdd7..5e6cbbde 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ -{% set version = "5.0.3" %} +{% set version = "5.0.4" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 10 %} +{% set build = 0 %} # give conda package a higher build number {% if mpi_type == 'conda' %} @@ -16,7 +16,7 @@ package: source: fn: openmpi-{{ version }}.tar.bz2 url: https://www.open-mpi.org/software/ompi/v{{ major }}/downloads/openmpi-{{ version }}.tar.bz2 - sha256: 990582f206b3ab32e938aa31bbf07c639368e4405dca196fabe7f0f76eeda90b + sha256: 64526852cdd88b2d30e022087c16ab3e03806c451b10cd691d5c1ac887d8ef9d build: number: {{ build }} From 5adcced88bcacf89775a7a1f47dfcd6fe3aecc3c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 19 Jul 2024 21:19:21 +0000 Subject: [PATCH 112/224] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.19.18.26.47 --- .scripts/build_steps.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a5836e8d..ba4b251c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,7 +72,6 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" - ( startgroup "Inspecting artifacts" ) 2> /dev/null # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 From 3c2f5f7109732c716e66ed08d71027aafba74ca8 Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Tue, 23 Jul 2024 09:47:25 +0300 Subject: [PATCH 113/224] recipe: Add patch from open-mpi/ompi#12694 --- recipe/meta.yaml | 2 ++ recipe/pr12694.patch | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 recipe/pr12694.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5e6cbbde..ccf6a579 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,6 +17,8 @@ source: fn: openmpi-{{ version }}.tar.bz2 url: https://www.open-mpi.org/software/ompi/v{{ major }}/downloads/openmpi-{{ version }}.tar.bz2 sha256: 64526852cdd88b2d30e022087c16ab3e03806c451b10cd691d5c1ac887d8ef9d + patches: + - pr12694.patch build: number: {{ build }} diff --git a/recipe/pr12694.patch b/recipe/pr12694.patch new file mode 100644 index 00000000..e63c3467 --- /dev/null +++ b/recipe/pr12694.patch @@ -0,0 +1,24 @@ +From 2085433c0977d37cbd1631fa7695a29de3f578c5 Mon Sep 17 00:00:00 2001 +From: Jeff Squyres +Date: Thu, 6 Jun 2024 11:22:53 -0400 +Subject: [PATCH] aarch64_functions.c: fix trivial typo + +Signed-off-by: Jeff Squyres +(cherry picked from commit 7c5ef484b6f8ee4d13a40e2d6cd84dc11c19c6fe) +--- + ompi/mca/op/aarch64/op_aarch64_functions.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ompi/mca/op/aarch64/op_aarch64_functions.c b/ompi/mca/op/aarch64/op_aarch64_functions.c +index ea4fd488655..d5878913f2f 100644 +--- a/ompi/mca/op/aarch64/op_aarch64_functions.c ++++ b/ompi/mca/op/aarch64/op_aarch64_functions.c +@@ -119,7 +119,7 @@ _Generic((*(out)), \ + int left_over = *count; \ + type##type_size##_t *in = (type##type_size##_t *) _in, \ + *out = (type##type_size##_t *) _out; \ +- OP_CONCAT(OMPI_OP_TYPE_PREPEND, type##type_size####x##type_cnt##_t) vsrc, vdst; \ ++ OP_CONCAT(OMPI_OP_TYPE_PREPEND, type##type_size##x##type_cnt##_t) vsrc, vdst; \ + for (; left_over >= type_cnt; left_over -= type_cnt) { \ + vsrc = vld1q##_##type_name##type_size(in); \ + vdst = vld1q##_##type_name##type_size(out); \ From 30561c7c3e185b45e913e4dd9870ff5fb33ed3f2 Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 29 Jul 2024 12:52:42 +0200 Subject: [PATCH 114/224] patch for LDFLAGS typo on mac --- recipe/build-mpi.sh | 2 ++ recipe/ldflags-mac.patch | 31 +++++++++++++++++++++++++++++++ recipe/meta.yaml | 9 ++++++--- 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 recipe/ldflags-mac.patch diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 5ebf122a..078c8c20 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -14,6 +14,8 @@ unset FFLAGS F77 F90 F95 wrapper_ldflags="-L$PREFIX/lib -Wl,-rpath,$PREFIX/lib" export LIBRARY_PATH="$PREFIX/lib" if [[ "$target_platform" == osx-* ]]; then + # FIXME: remove autogen when autotools patch no longer required + perl autogen.pl --force if [[ -n "$CONDA_BUILD_SYSROOT" ]]; then export CFLAGS="$CFLAGS -isysroot $CONDA_BUILD_SYSROOT" export CXXFLAGS="$CXXFLAGS -isysroot $CONDA_BUILD_SYSROOT" diff --git a/recipe/ldflags-mac.patch b/recipe/ldflags-mac.patch new file mode 100644 index 00000000..dcedc7b5 --- /dev/null +++ b/recipe/ldflags-mac.patch @@ -0,0 +1,31 @@ +From e70f0a4afb1277e52389267777d260229b468ec0 Mon Sep 17 00:00:00 2001 +From: Min RK +Date: Mon, 29 Jul 2024 12:50:59 +0200 +Subject: [PATCH] typo in LDFLAGS_save_xcode variable name + +resulted in effectively overriding LDFLAGS='' on mac +--- + config/ompi_setup_fc.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config/ompi_setup_fc.m4 b/config/ompi_setup_fc.m4 +index 53c3cd96da..c147bf2b60 100644 +--- a/config/ompi_setup_fc.m4 ++++ b/config/ompi_setup_fc.m4 +@@ -212,11 +212,11 @@ end program + AS_IF([test $xcode_happy -eq 1], + [ # Restore LDFLAFGS + the new flags (i.e., get rid of the + # "-L." we added for this test) +- LDFLAGS="$LDFLAGS_xcode_save $1" ++ LDFLAGS="$LDFLAGS_save_xcode $1" + $2], + [ # If we failed the test, reset LDFLAGS back to its + # original value. +- LDFLAGS=$LDFLAGS_xcode_save ++ LDFLAGS=$LDFLAGS_save_xcode + $3]) + + OPAL_VAR_SCOPE_POP +-- +2.45.0 + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ccf6a579..4fd8f393 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,7 +18,8 @@ source: url: https://www.open-mpi.org/software/ompi/v{{ major }}/downloads/openmpi-{{ version }}.tar.bz2 sha256: 64526852cdd88b2d30e022087c16ab3e03806c451b10cd691d5c1ac887d8ef9d patches: - - pr12694.patch + - pr12694.patch # remove after 5.0.5 + - ldflags-mac.patch # [osx] build: number: {{ build }} @@ -50,8 +51,10 @@ outputs: - {{ compiler('cuda') }} # [cuda_compiler != "None"] - {{ compiler('fortran') }} - {{ stdlib('c') }} - #- autoconf # [unix] - #- automake # [unix] + # FIXME: autotools, perl required for ldflags-mac.patch + - perl # [osx] + - autoconf # [osx] + - automake # [osx] - libtool # [unix] - make # [unix] host: From 3852b259725f1ef85594c1fb14669b6ef7518c5b Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 29 Jul 2024 13:26:18 +0200 Subject: [PATCH 115/224] use --with-mpi-moduledir to put mods in include official, no longer need symlinks --- recipe/build-mpi.sh | 8 +------- recipe/run_test.sh | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 078c8c20..7d8979e9 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -63,6 +63,7 @@ fi --enable-mpi-fortran \ --disable-wrapper-rpath \ --disable-wrapper-runpath \ + --with-mpi-moduledir="$PREFIX/include" \ --with-wrapper-cflags="-I$PREFIX/include" \ --with-wrapper-cxxflags="-I$PREFIX/include" \ --with-wrapper-fcflags="-I$PREFIX/include" \ @@ -80,13 +81,6 @@ fi make -j"${CPU_COUNT:-1}" make install -# openmpi installs .mod files in the wrong prefix (/lib instead of /include) -# symlink instead of copy to avoid breaking anything (unlikely) -for f in $PREFIX/lib/*.mod; do - modname=$(basename "$f") - ln -sv "../lib/${modname}" "$PREFIX/include/${modname}" -done - POST_LINK=$PREFIX/bin/.openmpi-post-link.sh if [ -n "$build_with_ucx" ]; then echo "setting MCA pml to ^ucx..." diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 38c4a0c1..e03f4f6c 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -28,8 +28,6 @@ if [[ $PKG_NAME == "openmpi" ]]; then $MPIEXEC -n 4 ./helloworld.sh test -f $PREFIX/include/mpi.mod - # keep duplicates in original location for now - test -f $PREFIX/lib/mpi.mod fi if [[ $PKG_NAME == "openmpi-mpicc" ]]; then From 1cee4bdeea70c26033866384b3f1f2ad06cc1feb Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 30 Jul 2024 08:21:47 +0200 Subject: [PATCH 116/224] use internal ${includedir} variable for moduledir Co-authored-by: Lisandro Dalcin --- recipe/build-mpi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 7d8979e9..749e5672 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -63,7 +63,7 @@ fi --enable-mpi-fortran \ --disable-wrapper-rpath \ --disable-wrapper-runpath \ - --with-mpi-moduledir="$PREFIX/include" \ + --with-mpi-moduledir='${includedir}' \ --with-wrapper-cflags="-I$PREFIX/include" \ --with-wrapper-cxxflags="-I$PREFIX/include" \ --with-wrapper-fcflags="-I$PREFIX/include" \ From 9dbe6f21e8cbd70d6ad36219529614beca125e0a Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Tue, 30 Jul 2024 12:44:30 +0300 Subject: [PATCH 117/224] recipe: simplify configuration of MPI compiler wrapper flags --- recipe/build-mpi.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 749e5672..e8e364d5 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -11,7 +11,6 @@ export FC=$(basename "$FC") unset FFLAGS F77 F90 F95 # tweak compiler flags -wrapper_ldflags="-L$PREFIX/lib -Wl,-rpath,$PREFIX/lib" export LIBRARY_PATH="$PREFIX/lib" if [[ "$target_platform" == osx-* ]]; then # FIXME: remove autogen when autotools patch no longer required @@ -22,13 +21,22 @@ if [[ "$target_platform" == osx-* ]]; then fi fi +# tweak wrapper ldflags +wrapper_ldflags="" +if [[ "$target_platform" == linux-* ]]; then + # allow-shlib-undefined required for dependencies to link against older sysroot + # avoids undefined + wrapper_ldflags='-Wl,--allow-shlib-undefined' +fi +if [[ "$target_platform" == osx-* ]]; then + # rpath required for '@rpath/libmpi.*.dylib' to be found at runtime + wrapper_ldflags='-Wl,-rpath,${libdir}' +fi + # UCX support build_with_ucx="" if [[ "$target_platform" == linux-* ]]; then build_with_ucx="--with-ucx=$PREFIX" - # allow-shlib-undefined required for dependencies to link against older sysroot - # avoids undefined - wrapper_ldflags="${wrapper_ldflags} -Wl,--allow-shlib-undefined" fi # CUDA support @@ -61,12 +69,7 @@ fi ./configure --prefix=$PREFIX \ --disable-dependency-tracking \ --enable-mpi-fortran \ - --disable-wrapper-rpath \ - --disable-wrapper-runpath \ --with-mpi-moduledir='${includedir}' \ - --with-wrapper-cflags="-I$PREFIX/include" \ - --with-wrapper-cxxflags="-I$PREFIX/include" \ - --with-wrapper-fcflags="-I$PREFIX/include" \ --with-wrapper-ldflags="${wrapper_ldflags}" \ --with-sge \ --with-hwloc=$PREFIX \ From 33a3a67f207ee199ae7d285868836dc7f54de427 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 30 Jul 2024 19:59:31 +0000 Subject: [PATCH 118/224] updated v5.0.5 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4fd8f393..24a3fed0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "5.0.4" %} +{% set version = "5.0.5" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} {% set build = 0 %} @@ -16,7 +16,7 @@ package: source: fn: openmpi-{{ version }}.tar.bz2 url: https://www.open-mpi.org/software/ompi/v{{ major }}/downloads/openmpi-{{ version }}.tar.bz2 - sha256: 64526852cdd88b2d30e022087c16ab3e03806c451b10cd691d5c1ac887d8ef9d + sha256: 6588d57c0a4bd299a24103f4e196051b29e8b55fbda49e11d5b3d32030a32776 patches: - pr12694.patch # remove after 5.0.5 - ldflags-mac.patch # [osx] From 0a5afeee609c9dc051562ddb8892b10986013dae Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 30 Jul 2024 20:02:07 +0000 Subject: [PATCH 119/224] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.30.01.49.09 --- .ci_support/migrations/libhwloc2111.yaml | 8 -------- .ci_support/osx_64_.yaml | 2 ++ .ci_support/osx_arm64_.yaml | 2 ++ 3 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 .ci_support/migrations/libhwloc2111.yaml diff --git a/.ci_support/migrations/libhwloc2111.yaml b/.ci_support/migrations/libhwloc2111.yaml deleted file mode 100644 index ca90c7a1..00000000 --- a/.ci_support/migrations/libhwloc2111.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libhwloc 2.11.1 - kind: version - migration_number: 1 -libhwloc: -- 2.11.1 -migrator_ts: 1720471981.8039248 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index aec1bf49..3187478c 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -34,6 +34,8 @@ macos_machine: - x86_64-apple-darwin13.4.0 mpi_type: - conda +perl: +- 5.32.1 target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 045503e1..5a3a7e70 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -34,6 +34,8 @@ macos_machine: - arm64-apple-darwin20.0.0 mpi_type: - conda +perl: +- 5.32.1 target_platform: - osx-arm64 zip_keys: From a96a42881c621940eb524efa06e25e45f5b7a03f Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 31 Jul 2024 08:36:03 +0200 Subject: [PATCH 120/224] remove outdated patch --- recipe/meta.yaml | 1 - recipe/pr12694.patch | 24 ------------------------ 2 files changed, 25 deletions(-) delete mode 100644 recipe/pr12694.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 24a3fed0..8d81d4dc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,7 +18,6 @@ source: url: https://www.open-mpi.org/software/ompi/v{{ major }}/downloads/openmpi-{{ version }}.tar.bz2 sha256: 6588d57c0a4bd299a24103f4e196051b29e8b55fbda49e11d5b3d32030a32776 patches: - - pr12694.patch # remove after 5.0.5 - ldflags-mac.patch # [osx] build: diff --git a/recipe/pr12694.patch b/recipe/pr12694.patch deleted file mode 100644 index e63c3467..00000000 --- a/recipe/pr12694.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2085433c0977d37cbd1631fa7695a29de3f578c5 Mon Sep 17 00:00:00 2001 -From: Jeff Squyres -Date: Thu, 6 Jun 2024 11:22:53 -0400 -Subject: [PATCH] aarch64_functions.c: fix trivial typo - -Signed-off-by: Jeff Squyres -(cherry picked from commit 7c5ef484b6f8ee4d13a40e2d6cd84dc11c19c6fe) ---- - ompi/mca/op/aarch64/op_aarch64_functions.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ompi/mca/op/aarch64/op_aarch64_functions.c b/ompi/mca/op/aarch64/op_aarch64_functions.c -index ea4fd488655..d5878913f2f 100644 ---- a/ompi/mca/op/aarch64/op_aarch64_functions.c -+++ b/ompi/mca/op/aarch64/op_aarch64_functions.c -@@ -119,7 +119,7 @@ _Generic((*(out)), \ - int left_over = *count; \ - type##type_size##_t *in = (type##type_size##_t *) _in, \ - *out = (type##type_size##_t *) _out; \ -- OP_CONCAT(OMPI_OP_TYPE_PREPEND, type##type_size####x##type_cnt##_t) vsrc, vdst; \ -+ OP_CONCAT(OMPI_OP_TYPE_PREPEND, type##type_size##x##type_cnt##_t) vsrc, vdst; \ - for (; left_over >= type_cnt; left_over -= type_cnt) { \ - vsrc = vld1q##_##type_name##type_size(in); \ - vdst = vld1q##_##type_name##type_size(out); \ From 2a3ef75df2e51eac0ac4029f0b30499f3f03317f Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 31 Jul 2024 08:37:49 +0200 Subject: [PATCH 121/224] revert removal of disable-wrapper-runpath --- recipe/build-mpi.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index e8e364d5..990bde8e 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -66,8 +66,11 @@ if [[ $CONDA_BUILD_CROSS_COMPILATION == "1" ]]; then source $RECIPE_DIR/cross-gfortran.$target_platform.sh fi +# disable wrapper-runpath for consistency with conda-forge wrt dtags +# openmpi's runpath adds new dtags to compiler wrappers ./configure --prefix=$PREFIX \ --disable-dependency-tracking \ + --disable-wrapper-runpath \ --enable-mpi-fortran \ --with-mpi-moduledir='${includedir}' \ --with-wrapper-ldflags="${wrapper_ldflags}" \ From acc3c896dcc51a327f5e82513a37f61042b3b91f Mon Sep 17 00:00:00 2001 From: j34ni Date: Thu, 19 Sep 2024 19:04:37 +0000 Subject: [PATCH 122/224] Added pmix (internal) and libevent/hwloc/ucc (external) dependencies; FCFLAGS (allow-argument-mismatch) and fixed UCX dependency test --- recipe/build-mpi.sh | 9 ++++++++- recipe/meta.yaml | 48 ++++++++++++++++++++++++++++++++++++++++----- recipe/run_test.sh | 5 ++++- 3 files changed, 55 insertions(+), 7 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 990bde8e..671514a1 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -10,6 +10,9 @@ export FC=$(basename "$FC") # unset unused Fortran compiler variables unset FFLAGS F77 F90 F95 +# add -fallow-argument-mismatch to FCFLAGS +export FCFLAGS="-fallow-argument-mismatch ${FCFLAGS}" + # tweak compiler flags export LIBRARY_PATH="$PREFIX/lib" if [[ "$target_platform" == osx-* ]]; then @@ -33,10 +36,12 @@ if [[ "$target_platform" == osx-* ]]; then wrapper_ldflags='-Wl,-rpath,${libdir}' fi -# UCX support +# UCX/UCC support build_with_ucx="" +build_with_ucc="" if [[ "$target_platform" == linux-* ]]; then build_with_ucx="--with-ucx=$PREFIX" + build_with_ucc="--with-ucc=$PREFIX" fi # CUDA support @@ -75,12 +80,14 @@ fi --with-mpi-moduledir='${includedir}' \ --with-wrapper-ldflags="${wrapper_ldflags}" \ --with-sge \ + --with-pmix=internal \ --with-hwloc=$PREFIX \ --with-libevent=$PREFIX \ --with-zlib=$PREFIX \ --enable-mca-dso \ --enable-ipv6 \ $build_with_ucx \ + $build_with_ucc \ $build_with_cuda \ || (cat config.log; false) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8d81d4dc..923ef7a6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -41,6 +41,7 @@ outputs: {% endif %} ignore_run_exports: - ucx # [linux] + - ucc # [linux] ignore_run_exports_from: - {{ compiler('cuda') }} # [cuda_compiler != "None"] requirements: @@ -51,26 +52,49 @@ outputs: - {{ compiler('fortran') }} - {{ stdlib('c') }} # FIXME: autotools, perl required for ldflags-mac.patch - - perl # [osx] + - perl # [osx] - autoconf # [osx] - automake # [osx] - - libtool # [unix] - - make # [unix] + - binutils # [linux] + - libevent # [linux] + - libhwloc # [linux] + - libmagic # [linux] + - libnl # [linux] + - libnuma # [linux] + - libudev1 # [linux] + - make # [linux] + - numactl # [linux] + - pkg-config # [linux] + - rdma-core # [linux] + - ucc # [linux] + - ucx # [linux] + - zlib # [linux] host: #- openpmix #- prrte - libhwloc - libevent - - libnl # [linux] + - libnl # [linux] - zlib - - ucx # [linux] + - ucc # [linux] - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] run: - mpi 1.0 openmpi #- openpmix #- prrte + - libevent # [linux] + - libhwloc # [linux] + - libnl # [linux] + - libnuma # [linux] + - libudev1 # [linux] + - numactl # [linux] + - rdma-core # [linux] + - ucc # [linux] + - ucx # [linux] + - zlib # [linux] run_constrained: - {{ pin_compatible("ucx", max_pin="x.x") }} # [linux] + - {{ pin_compatible("ucc", max_pin="x.x") }} # [linux] # Open MPI only uses CUDA Driver APIs, set the minimal driver version - __cuda >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] # Ensure a consistent CUDA environment @@ -120,6 +144,19 @@ outputs: # host C compilers work fine (better) on mac - {{ compiler('cxx') }} test: + # Ensure the correct dependencies are available for testing + requires: + - mpi 1.0 openmpi + - libevent # [linux] + - libhwloc # [linux] + - libnl # [linux] + - libnuma # [linux] + - libudev1 # [linux] + - numactl # [linux] + - rdma-core # [linux] + - ucc # [linux] + - ucx # [linux] + - zlib # [linux] script: run_test.sh files: - tests/helloworld.cxx @@ -167,3 +204,4 @@ extra: - msarahan - ocefpaf - beckermr + - j34ni diff --git a/recipe/run_test.sh b/recipe/run_test.sh index e03f4f6c..00129ecc 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -7,7 +7,10 @@ pushd "tests" if [[ $PKG_NAME == "openmpi" ]]; then - if [[ -n "$(conda list | grep ucx)" ]]; then +# -n : string is not null +# -z : string is null, that is, has zero length + + if [[ -z "$(conda list | grep ucx)" ]]; then echo "Improper UCX dependency!" exit 1 fi From 83a67f4b8948a387755de99380ac24e663b78bc6 Mon Sep 17 00:00:00 2001 From: j34ni Date: Thu, 19 Sep 2024 21:58:23 +0000 Subject: [PATCH 123/224] Fixed POST_LINK tests --- recipe/build-mpi.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) mode change 100755 => 100644 recipe/build-mpi.sh diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh old mode 100755 new mode 100644 index 671514a1..2f2c63bb --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -40,6 +40,7 @@ fi build_with_ucx="" build_with_ucc="" if [[ "$target_platform" == linux-* ]]; then + echo "Build with UCX/UCC support" build_with_ucx="--with-ucx=$PREFIX" build_with_ucc="--with-ucc=$PREFIX" fi @@ -47,6 +48,7 @@ fi # CUDA support build_with_cuda="" if [[ -n "$CUDA_HOME" ]]; then + echo "Build with CUDA support" build_with_cuda="--with-cuda=$CUDA_HOME --with-cuda-libdir=$CUDA_HOME/lib64/stubs" fi @@ -80,7 +82,7 @@ fi --with-mpi-moduledir='${includedir}' \ --with-wrapper-ldflags="${wrapper_ldflags}" \ --with-sge \ - --with-pmix=internal \ + --with-pmix=internal \ --with-hwloc=$PREFIX \ --with-libevent=$PREFIX \ --with-zlib=$PREFIX \ @@ -95,14 +97,16 @@ make -j"${CPU_COUNT:-1}" make install POST_LINK=$PREFIX/bin/.openmpi-post-link.sh -if [ -n "$build_with_ucx" ]; then +if [ -z "$build_with_ucx" ]; then + echo "No UCX/UCC support" echo "setting MCA pml to ^ucx..." echo "pml = ^ucx" >> $PREFIX/etc/openmpi-mca-params.conf echo "setting MCA osc to ^ucx..." echo "osc = ^ucx" >> $PREFIX/etc/openmpi-mca-params.conf cat $RECIPE_DIR/post-link-ucx.sh >> $POST_LINK fi -if [ -n "$build_with_cuda" ]; then +if [ -z "$build_with_cuda" ]; then + echo "No CUDA support" echo "setting MCA mca_base_component_show_load_errors to 0..." echo "mca_base_component_show_load_errors = 0" >> $PREFIX/etc/openmpi-mca-params.conf echo "setting MCA opal_warn_on_missing_libcuda to 0..." From 18799e054c26684fe1a52757b1cd72d60e0103b7 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Fri, 20 Sep 2024 12:05:30 +0200 Subject: [PATCH 124/224] Update run_test.sh Commented out test on mpi.mod (which fail) --- recipe/run_test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 00129ecc..0e662540 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -30,7 +30,8 @@ if [[ $PKG_NAME == "openmpi" ]]; then $MPIEXEC --help $MPIEXEC -n 4 ./helloworld.sh - test -f $PREFIX/include/mpi.mod +# test -f $PREFIX/include/mpi.mod + fi if [[ $PKG_NAME == "openmpi-mpicc" ]]; then From 82a76b1970fa41caef1bbd5da575b85b92a15265 Mon Sep 17 00:00:00 2001 From: j34ni Date: Sat, 21 Sep 2024 18:09:47 +0000 Subject: [PATCH 125/224] Removed configure option --enable-mca-dso to ensure compatibility with UCX/UCC --- recipe/build-mpi.sh | 4 ++-- recipe/meta.yaml | 43 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 2f2c63bb..cbd7674d 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -86,14 +86,14 @@ fi --with-hwloc=$PREFIX \ --with-libevent=$PREFIX \ --with-zlib=$PREFIX \ - --enable-mca-dso \ --enable-ipv6 \ $build_with_ucx \ $build_with_ucc \ $build_with_cuda \ || (cat config.log; false) -make -j"${CPU_COUNT:-1}" +# Building with 16 CPUs +make -j16 make install POST_LINK=$PREFIX/bin/.openmpi-post-link.sh diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 923ef7a6..48a64263 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.5" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 0 %} +{% set build = 1 %} # give conda package a higher build number {% if mpi_type == 'conda' %} @@ -69,14 +69,24 @@ outputs: - ucc # [linux] - ucx # [linux] - zlib # [linux] + host: #- openpmix #- prrte - - libhwloc - - libevent + - binutils # [linux] + - libevent # [linux] + - libhwloc # [linux] + - libmagic # [linux] - libnl # [linux] - - zlib + - libnuma # [linux] + - libudev1 # [linux] + - make # [linux] + - numactl # [linux] + - pkg-config # [linux] + - rdma-core # [linux] - ucc # [linux] + - ucx # [linux] + - zlib # [linux] - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] run: - mpi 1.0 openmpi @@ -125,6 +135,19 @@ outputs: # host C compilers work fine (better) on mac - {{ compiler('c') }} test: + # Ensure the correct dependencies are available for testing + requires: + - mpi 1.0 openmpi + - libevent # [linux] + - libhwloc # [linux] + - libnl # [linux] + - libnuma # [linux] + - libudev1 # [linux] + - numactl # [linux] + - rdma-core # [linux] + - ucc # [linux] + - ucx # [linux] + - zlib # [linux] script: run_test.sh files: - tests/helloworld.c @@ -175,6 +198,18 @@ outputs: - {{ pin_subpackage('openmpi', exact=True) }} - {{ compiler('fortran') }} test: + requires: + - mpi 1.0 openmpi + - libevent # [linux] + - libhwloc # [linux] + - libnl # [linux] + - libnuma # [linux] + - libudev1 # [linux] + - numactl # [linux] + - rdma-core # [linux] + - ucc # [linux] + - ucx # [linux] + - zlib # [linux] script: run_test.sh files: - tests/helloworld.f From bde2bf274ed3e2d394cdfc78947c9979a0153725 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sat, 21 Sep 2024 21:16:58 +0200 Subject: [PATCH 126/224] Update meta.yaml Ensured #[] --- recipe/meta.yaml | 126 +++++++++++++++++++++++------------------------ 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 48a64263..59371f3a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -52,56 +52,56 @@ outputs: - {{ compiler('fortran') }} - {{ stdlib('c') }} # FIXME: autotools, perl required for ldflags-mac.patch - - perl # [osx] + - perl # [osx] - autoconf # [osx] - automake # [osx] - - binutils # [linux] - - libevent # [linux] - - libhwloc # [linux] - - libmagic # [linux] - - libnl # [linux] - - libnuma # [linux] - - libudev1 # [linux] - - make # [linux] - - numactl # [linux] - - pkg-config # [linux] + - binutils # [linux] + - libevent # [linux] + - libhwloc # [linux] + - libmagic # [linux] + - libnl # [linux] + - libnuma # [linux] + - libudev1 # [linux] + - make # [linux] + - numactl # [linux] + - pkg-config # [linux] - rdma-core # [linux] - - ucc # [linux] - - ucx # [linux] - - zlib # [linux] + - ucc # [linux] + - ucx # [linux] + - zlib # [linux] host: #- openpmix #- prrte - - binutils # [linux] - - libevent # [linux] - - libhwloc # [linux] - - libmagic # [linux] - - libnl # [linux] - - libnuma # [linux] - - libudev1 # [linux] - - make # [linux] - - numactl # [linux] - - pkg-config # [linux] + - binutils # [linux] + - libevent # [linux] + - libhwloc # [linux] + - libmagic # [linux] + - libnl # [linux] + - libnuma # [linux] + - libudev1 # [linux] + - make # [linux] + - numactl # [linux] + - pkg-config # [linux] - rdma-core # [linux] - - ucc # [linux] - - ucx # [linux] - - zlib # [linux] + - ucc # [linux] + - ucx # [linux] + - zlib # [linux] - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] run: - mpi 1.0 openmpi #- openpmix #- prrte - - libevent # [linux] - - libhwloc # [linux] - - libnl # [linux] - - libnuma # [linux] - - libudev1 # [linux] - - numactl # [linux] + - libevent # [linux] + - libhwloc # [linux] + - libnl # [linux] + - libnuma # [linux] + - libudev1 # [linux] + - numactl # [linux] - rdma-core # [linux] - - ucc # [linux] - - ucx # [linux] - - zlib # [linux] + - ucc # [linux] + - ucx # [linux] + - zlib # [linux] run_constrained: - {{ pin_compatible("ucx", max_pin="x.x") }} # [linux] - {{ pin_compatible("ucc", max_pin="x.x") }} # [linux] @@ -138,16 +138,16 @@ outputs: # Ensure the correct dependencies are available for testing requires: - mpi 1.0 openmpi - - libevent # [linux] - - libhwloc # [linux] - - libnl # [linux] - - libnuma # [linux] - - libudev1 # [linux] - - numactl # [linux] + - libevent # [linux] + - libhwloc # [linux] + - libnl # [linux] + - libnuma # [linux] + - libudev1 # [linux] + - numactl # [linux] - rdma-core # [linux] - - ucc # [linux] - - ucx # [linux] - - zlib # [linux] + - ucc # [linux] + - ucx # [linux] + - zlib # [linux] script: run_test.sh files: - tests/helloworld.c @@ -170,16 +170,16 @@ outputs: # Ensure the correct dependencies are available for testing requires: - mpi 1.0 openmpi - - libevent # [linux] - - libhwloc # [linux] - - libnl # [linux] - - libnuma # [linux] - - libudev1 # [linux] - - numactl # [linux] + - libevent # [linux] + - libhwloc # [linux] + - libnl # [linux] + - libnuma # [linux] + - libudev1 # [linux] + - numactl # [linux] - rdma-core # [linux] - - ucc # [linux] - - ucx # [linux] - - zlib # [linux] + - ucc # [linux] + - ucx # [linux] + - zlib # [linux] script: run_test.sh files: - tests/helloworld.cxx @@ -200,16 +200,16 @@ outputs: test: requires: - mpi 1.0 openmpi - - libevent # [linux] - - libhwloc # [linux] - - libnl # [linux] - - libnuma # [linux] - - libudev1 # [linux] - - numactl # [linux] + - libevent # [linux] + - libhwloc # [linux] + - libnl # [linux] + - libnuma # [linux] + - libudev1 # [linux] + - numactl # [linux] - rdma-core # [linux] - - ucc # [linux] - - ucx # [linux] - - zlib # [linux] + - ucc # [linux] + - ucx # [linux] + - zlib # [linux] script: run_test.sh files: - tests/helloworld.f From 968cde7e0e22f7677a3e4d217c8f6a1d13b9a2e1 Mon Sep 17 00:00:00 2001 From: j34ni Date: Sat, 21 Sep 2024 19:25:54 +0000 Subject: [PATCH 127/224] After conda smithy recipe-lint --conda-forge --- recipe/meta.yaml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 59371f3a..95f07a3a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -52,23 +52,23 @@ outputs: - {{ compiler('fortran') }} - {{ stdlib('c') }} # FIXME: autotools, perl required for ldflags-mac.patch - - perl # [osx] - - autoconf # [osx] - - automake # [osx] - - binutils # [linux] - - libevent # [linux] - - libhwloc # [linux] - - libmagic # [linux] - - libnl # [linux] - - libnuma # [linux] - - libudev1 # [linux] - - make # [linux] - - numactl # [linux] - - pkg-config # [linux] - - rdma-core # [linux] - - ucc # [linux] - - ucx # [linux] - - zlib # [linux] + - perl + - autoconf + - automake + - binutils + - libevent + - libhwloc + - libmagic + - libnl + - libnuma + - libudev1 + - make + - numactl + - pkg-config + - rdma-core + - ucc + - ucx + - zlib host: #- openpmix From 9806f8a3390c245d31b5767532b2a0e4739c133c Mon Sep 17 00:00:00 2001 From: j34ni Date: Sat, 21 Sep 2024 20:27:30 +0000 Subject: [PATCH 128/224] Build with --- recipe/build-mpi.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index cbd7674d..3c893a68 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -92,8 +92,7 @@ fi $build_with_cuda \ || (cat config.log; false) -# Building with 16 CPUs -make -j16 +make -j"${CPU_COUNT:-1}" make install POST_LINK=$PREFIX/bin/.openmpi-post-link.sh From 4bd2922ff87fc5faeabd5215a1c013e7a08ee047 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 09:17:08 +0200 Subject: [PATCH 129/224] Update meta.yaml Tried to fix build issues for OSX (where there is no need for Infiniband related libraries) --- recipe/meta.yaml | 58 ++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 95f07a3a..cdd260de 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -52,48 +52,48 @@ outputs: - {{ compiler('fortran') }} - {{ stdlib('c') }} # FIXME: autotools, perl required for ldflags-mac.patch - - perl - - autoconf - - automake + - perl # [osx] + - autoconf # [osx] + - automake # [osx] - binutils - libevent - libhwloc - libmagic - - libnl - - libnuma - - libudev1 - - make - - numactl + - libnl # [linux] + - libnuma # [linux] + - libtool # [unix] + - libudev1 # [linux] + - make # [unix] + - numactl # [linux] - pkg-config - - rdma-core - - ucc - - ucx + - rdma-core # [linux] + - ucc # [linux] + - ucx # [linux] - zlib host: #- openpmix #- prrte - - binutils # [linux] - - libevent # [linux] - - libhwloc # [linux] - - libmagic # [linux] + - binutils + - libevent + - libhwloc + - libmagic - libnl # [linux] - libnuma # [linux] - libudev1 # [linux] - - make # [linux] - numactl # [linux] - pkg-config # [linux] - rdma-core # [linux] - ucc # [linux] - ucx # [linux] - - zlib # [linux] + - zlib - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] run: - mpi 1.0 openmpi #- openpmix #- prrte - - libevent # [linux] - - libhwloc # [linux] + - libevent + - libhwloc - libnl # [linux] - libnuma # [linux] - libudev1 # [linux] @@ -101,7 +101,7 @@ outputs: - rdma-core # [linux] - ucc # [linux] - ucx # [linux] - - zlib # [linux] + - zlib run_constrained: - {{ pin_compatible("ucx", max_pin="x.x") }} # [linux] - {{ pin_compatible("ucc", max_pin="x.x") }} # [linux] @@ -138,8 +138,8 @@ outputs: # Ensure the correct dependencies are available for testing requires: - mpi 1.0 openmpi - - libevent # [linux] - - libhwloc # [linux] + - libevent + - libhwloc - libnl # [linux] - libnuma # [linux] - libudev1 # [linux] @@ -147,7 +147,7 @@ outputs: - rdma-core # [linux] - ucc # [linux] - ucx # [linux] - - zlib # [linux] + - zlib script: run_test.sh files: - tests/helloworld.c @@ -170,8 +170,8 @@ outputs: # Ensure the correct dependencies are available for testing requires: - mpi 1.0 openmpi - - libevent # [linux] - - libhwloc # [linux] + - libevent + - libhwloc - libnl # [linux] - libnuma # [linux] - libudev1 # [linux] @@ -179,7 +179,7 @@ outputs: - rdma-core # [linux] - ucc # [linux] - ucx # [linux] - - zlib # [linux] + - zlib script: run_test.sh files: - tests/helloworld.cxx @@ -200,8 +200,8 @@ outputs: test: requires: - mpi 1.0 openmpi - - libevent # [linux] - - libhwloc # [linux] + - libevent + - libhwloc - libnl # [linux] - libnuma # [linux] - libudev1 # [linux] @@ -209,7 +209,7 @@ outputs: - rdma-core # [linux] - ucc # [linux] - ucx # [linux] - - zlib # [linux] + - zlib script: run_test.sh files: - tests/helloworld.f From 296d267ad2bdc89ec700fce036b9837023d1ae7d Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 09:25:19 +0200 Subject: [PATCH 130/224] Update meta.yaml Nothing provides `binutils` for the OSX build --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cdd260de..00e06aca 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -55,7 +55,7 @@ outputs: - perl # [osx] - autoconf # [osx] - automake # [osx] - - binutils + - binutils # [linux] - libevent - libhwloc - libmagic @@ -74,7 +74,7 @@ outputs: host: #- openpmix #- prrte - - binutils + - binutils # [linux] - libevent - libhwloc - libmagic From f747a3405a44b9452be695975a949e3fdf11c675 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 10:31:35 +0200 Subject: [PATCH 131/224] Update meta.yaml ucc does not seem to exist for ppc64le --- recipe/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 00e06aca..12935fc0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,7 +67,7 @@ outputs: - numactl # [linux] - pkg-config - rdma-core # [linux] - - ucc # [linux] + - ucc # [linux_64 and linux_aarch64 and osx_arm64] - ucx # [linux] - zlib @@ -84,7 +84,7 @@ outputs: - numactl # [linux] - pkg-config # [linux] - rdma-core # [linux] - - ucc # [linux] + - ucc # [linux_64 and linux_aarch64 and osx_arm64] - ucx # [linux] - zlib - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] @@ -99,7 +99,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux] + - ucc # [linux_64 and linux_aarch64 and osx_arm64] - ucx # [linux] - zlib run_constrained: @@ -145,7 +145,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux] + - ucc # [linux_64 and linux_aarch64 and osx_arm64] - ucx # [linux] - zlib script: run_test.sh @@ -177,7 +177,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux] + - ucc # [linux_64 and linux_aarch64 and osx_arm64] - ucx # [linux] - zlib script: run_test.sh @@ -207,7 +207,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux] + - ucc # [linux_64 and linux_aarch64 and osx_arm64] - ucx # [linux] - zlib script: run_test.sh From 46878f6ec749c35d61c3956d441394d71f3e1c5a Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 11:32:53 +0200 Subject: [PATCH 132/224] Update meta.yaml Trying with `ucc # [linux and not ppc64le]` --- recipe/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 12935fc0..02178341 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,7 +67,7 @@ outputs: - numactl # [linux] - pkg-config - rdma-core # [linux] - - ucc # [linux_64 and linux_aarch64 and osx_arm64] + - ucc # [linux and not ppc64le] - ucx # [linux] - zlib @@ -84,7 +84,7 @@ outputs: - numactl # [linux] - pkg-config # [linux] - rdma-core # [linux] - - ucc # [linux_64 and linux_aarch64 and osx_arm64] + - ucc # [linux and not ppc64le - ucx # [linux] - zlib - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] @@ -99,7 +99,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux_64 and linux_aarch64 and osx_arm64] + - ucc # [linux and not ppc64le] - ucx # [linux] - zlib run_constrained: @@ -145,7 +145,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux_64 and linux_aarch64 and osx_arm64] + - ucc # [linux and not ppc64le] - ucx # [linux] - zlib script: run_test.sh @@ -177,7 +177,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux_64 and linux_aarch64 and osx_arm64] + - ucc # [linux and not ppc64le] - ucx # [linux] - zlib script: run_test.sh @@ -207,7 +207,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux_64 and linux_aarch64 and osx_arm64] + - ucc # [linux and not ppc64le] - ucx # [linux] - zlib script: run_test.sh From 0512defc616de0eaca81576a5d94f379ea272876 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 11:42:53 +0200 Subject: [PATCH 133/224] Update meta.yaml `- ucc # [linux and not ppc64le and not osx]` --- recipe/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 02178341..e0349e68 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,7 +67,7 @@ outputs: - numactl # [linux] - pkg-config - rdma-core # [linux] - - ucc # [linux and not ppc64le] + - ucc # [linux and not ppc64le and not osx] - ucx # [linux] - zlib @@ -84,7 +84,7 @@ outputs: - numactl # [linux] - pkg-config # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le + - ucc # [linux and not ppc64le and not osx] - ucx # [linux] - zlib - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] @@ -99,7 +99,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le] + - ucc # [linux and not ppc64le and not osx] - ucx # [linux] - zlib run_constrained: @@ -145,7 +145,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le] + - ucc # [linux and not ppc64le and not osx] - ucx # [linux] - zlib script: run_test.sh @@ -177,7 +177,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le] + - ucc # [linux and not ppc64le and not osx] - ucx # [linux] - zlib script: run_test.sh @@ -207,7 +207,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le] + - ucc # [linux and not ppc64le and not osx] - ucx # [linux] - zlib script: run_test.sh From 840530b2b9c9d87cab7e87c01517314a369a96ef Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 12:20:42 +0200 Subject: [PATCH 134/224] Update meta.yaml `- ucc # [linux and not linux-ppc64le and not osx]` --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e0349e68..de88e3f8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,7 +67,7 @@ outputs: - numactl # [linux] - pkg-config - rdma-core # [linux] - - ucc # [linux and not ppc64le and not osx] + - ucc # [linux and not linux-ppc64le and not osx] - ucx # [linux] - zlib @@ -84,7 +84,7 @@ outputs: - numactl # [linux] - pkg-config # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le and not osx] + - ucc # [linux and not linux-ppc64le and not osx] - ucx # [linux] - zlib - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] @@ -145,7 +145,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le and not osx] + - ucc # [linux and not linux-ppc64le and not osx] - ucx # [linux] - zlib script: run_test.sh @@ -177,7 +177,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le and not osx] + - ucc # [linux and not linux-ppc64le and not osx] - ucx # [linux] - zlib script: run_test.sh @@ -207,7 +207,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le and not osx] + - ucc # [linux and not linux-ppc64le and not osx] - ucx # [linux] - zlib script: run_test.sh From acb11de52e8facbaa2e397b1b0b867a88b3a23f7 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 13:03:17 +0200 Subject: [PATCH 135/224] Update meta.yaml Back to `- ucc # [linux and not ppc64le and not osx]` --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index de88e3f8..e0349e68 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,7 +67,7 @@ outputs: - numactl # [linux] - pkg-config - rdma-core # [linux] - - ucc # [linux and not linux-ppc64le and not osx] + - ucc # [linux and not ppc64le and not osx] - ucx # [linux] - zlib @@ -84,7 +84,7 @@ outputs: - numactl # [linux] - pkg-config # [linux] - rdma-core # [linux] - - ucc # [linux and not linux-ppc64le and not osx] + - ucc # [linux and not ppc64le and not osx] - ucx # [linux] - zlib - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] @@ -145,7 +145,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not linux-ppc64le and not osx] + - ucc # [linux and not ppc64le and not osx] - ucx # [linux] - zlib script: run_test.sh @@ -177,7 +177,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not linux-ppc64le and not osx] + - ucc # [linux and not ppc64le and not osx] - ucx # [linux] - zlib script: run_test.sh @@ -207,7 +207,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not linux-ppc64le and not osx] + - ucc # [linux and not ppc64le and not osx] - ucx # [linux] - zlib script: run_test.sh From 554f11b9e3f03c186bd48397ab44f6ee7d055bd0 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 14:18:55 +0200 Subject: [PATCH 136/224] Update meta.yaml - ucc # [linux_64] - ucx # [linux and not osx] --- recipe/meta.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e0349e68..92b72c08 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,8 +67,8 @@ outputs: - numactl # [linux] - pkg-config - rdma-core # [linux] - - ucc # [linux and not ppc64le and not osx] - - ucx # [linux] + - ucc # [linux_64] + - ucx # [linux and not osx] - zlib host: @@ -84,8 +84,8 @@ outputs: - numactl # [linux] - pkg-config # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le and not osx] - - ucx # [linux] + - ucc # [linux_64] + - ucx # [linux and not osx] - zlib - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] run: @@ -99,8 +99,8 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le and not osx] - - ucx # [linux] + - ucc # [linux_64] + - ucx # [linux and not osx] - zlib run_constrained: - {{ pin_compatible("ucx", max_pin="x.x") }} # [linux] @@ -145,8 +145,8 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le and not osx] - - ucx # [linux] + - ucc # [linux_64] + - ucx # [linux and not osx] - zlib script: run_test.sh files: @@ -177,8 +177,8 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le and not osx] - - ucx # [linux] + - ucc # [linux_64] + - ucx # [linux and not osx] - zlib script: run_test.sh files: @@ -207,8 +207,8 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le and not osx] - - ucx # [linux] + - ucc # [linux_64] + - ucx # [linux and not osx] - zlib script: run_test.sh files: From 398f33293d924d1ddcdd61ceab1d5e72d25d99a8 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 15:14:55 +0200 Subject: [PATCH 137/224] Update meta.yaml - ucc # [linux and not ppc64le and not osx] - ucx # [linux and not osx] --- recipe/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 92b72c08..6a0b71fe 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,7 +67,7 @@ outputs: - numactl # [linux] - pkg-config - rdma-core # [linux] - - ucc # [linux_64] + - ucc # [linux and not ppc64le and not osx] - ucx # [linux and not osx] - zlib @@ -84,7 +84,7 @@ outputs: - numactl # [linux] - pkg-config # [linux] - rdma-core # [linux] - - ucc # [linux_64] + - ucc # [linux and not ppc64le and not osx] - ucx # [linux and not osx] - zlib - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] @@ -99,7 +99,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux_64] + - ucc # [linux and not ppc64le and not osx] - ucx # [linux and not osx] - zlib run_constrained: @@ -145,7 +145,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux_64] + - ucc # [linux and not ppc64le and not osx] - ucx # [linux and not osx] - zlib script: run_test.sh @@ -177,7 +177,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux_64] + - ucc # [linux and not ppc64le and not osx] - ucx # [linux and not osx] - zlib script: run_test.sh @@ -207,7 +207,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux_64] + - ucc # [linux and not ppc64le and not osx] - ucx # [linux and not osx] - zlib script: run_test.sh From 4917ead01a477364d07a92e43aba4588b38b0096 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 15:41:08 +0200 Subject: [PATCH 138/224] Update run_test.sh Modified test to check that OpenMPI was configured and build with UCX (rather then that the conda list contains a package called UCX which may or may not be of any use) Also excludes the osx_64 platform for which it does not exist --- recipe/run_test.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 0e662540..f3d93b88 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -10,13 +10,17 @@ if [[ $PKG_NAME == "openmpi" ]]; then # -n : string is not null # -z : string is null, that is, has zero length - if [[ -z "$(conda list | grep ucx)" ]]; then - echo "Improper UCX dependency!" - exit 1 +# No UCX available on osx_64 platform + + if [[ "$target_platform" != osx_64 ]]; then + if [[ -z "$(ompi_info | grep ucx)" ]]; then + echo "OpenMPI configured without UCX support!" + exit 1 + fi fi - if [[ -n "$(conda list | grep cuda-version)" ]]; then - echo "Improper CUDA dependency!" + if [[ -z "$(ompi_info | grep cuda)" ]]; then + echo "OpenMPI configured without CUDA support!" exit 1 fi From 5ef282be8f24a7974e748c216ef10cfc8a119527 Mon Sep 17 00:00:00 2001 From: j34ni Date: Sun, 22 Sep 2024 14:26:28 +0000 Subject: [PATCH 139/224] Fixed typos woth linux-64 and osx-64 --- recipe/meta.yaml | 12 ++++++------ recipe/run_test.sh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6a0b71fe..d28bb89c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,7 +67,7 @@ outputs: - numactl # [linux] - pkg-config - rdma-core # [linux] - - ucc # [linux and not ppc64le and not osx] + - ucc # [linux-64] - ucx # [linux and not osx] - zlib @@ -84,7 +84,7 @@ outputs: - numactl # [linux] - pkg-config # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le and not osx] + - ucc # [linux-64] - ucx # [linux and not osx] - zlib - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] @@ -99,7 +99,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le and not osx] + - ucc # [linux-64] - ucx # [linux and not osx] - zlib run_constrained: @@ -145,7 +145,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le and not osx] + - ucc # [linux-64] - ucx # [linux and not osx] - zlib script: run_test.sh @@ -177,7 +177,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le and not osx] + - ucc # [linux-64] - ucx # [linux and not osx] - zlib script: run_test.sh @@ -207,7 +207,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not ppc64le and not osx] + - ucc # [linux-64] - ucx # [linux and not osx] - zlib script: run_test.sh diff --git a/recipe/run_test.sh b/recipe/run_test.sh index f3d93b88..a6c262e0 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -12,7 +12,7 @@ if [[ $PKG_NAME == "openmpi" ]]; then # No UCX available on osx_64 platform - if [[ "$target_platform" != osx_64 ]]; then + if [[ "$target_platform" != osx-64 ]]; then if [[ -z "$(ompi_info | grep ucx)" ]]; then echo "OpenMPI configured without UCX support!" exit 1 From 01691ccbf746ec59e55803ebbd2f751a173a3ca3 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 16:35:58 +0200 Subject: [PATCH 140/224] Update meta.yaml - ucc # [linux-64 and not osx] --- recipe/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d28bb89c..280c837e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,7 +67,7 @@ outputs: - numactl # [linux] - pkg-config - rdma-core # [linux] - - ucc # [linux-64] + - ucc # [linux-64 and not osx] - ucx # [linux and not osx] - zlib @@ -84,7 +84,7 @@ outputs: - numactl # [linux] - pkg-config # [linux] - rdma-core # [linux] - - ucc # [linux-64] + - ucc # [linux-64 and not osx] - ucx # [linux and not osx] - zlib - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] @@ -99,7 +99,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux-64] + - ucc # [linux-64 and not osx] - ucx # [linux and not osx] - zlib run_constrained: @@ -145,7 +145,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux-64] + - ucc # [linux-64 and not osx] - ucx # [linux and not osx] - zlib script: run_test.sh @@ -177,7 +177,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux-64] + - ucc # [linux-64 and not osx] - ucx # [linux and not osx] - zlib script: run_test.sh @@ -207,7 +207,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux-64] + - ucc # [linux-64 and not osx] - ucx # [linux and not osx] - zlib script: run_test.sh From c0168c58d3d221634bce9853e23ac7b8eb2b2ee6 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 16:50:31 +0200 Subject: [PATCH 141/224] Update meta.yaml - ucc # [linux-64 and not linux-ppc64le and not osx] --- recipe/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 280c837e..04c72a16 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,7 +67,7 @@ outputs: - numactl # [linux] - pkg-config - rdma-core # [linux] - - ucc # [linux-64 and not osx] + - ucc # [linux-64 and not linux-ppc64le and not osx] - ucx # [linux and not osx] - zlib @@ -84,7 +84,7 @@ outputs: - numactl # [linux] - pkg-config # [linux] - rdma-core # [linux] - - ucc # [linux-64 and not osx] + - ucc # [linux-64 and not linux-ppc64le and not osx] - ucx # [linux and not osx] - zlib - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] @@ -99,7 +99,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux-64 and not osx] + - ucc # [linux-64 and not linux-ppc64le and not osx] - ucx # [linux and not osx] - zlib run_constrained: @@ -145,7 +145,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux-64 and not osx] + - ucc # [linux-64 and not linux-ppc64le and not osx] - ucx # [linux and not osx] - zlib script: run_test.sh @@ -177,7 +177,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux-64 and not osx] + - ucc # [linux-64 and not linux-ppc64le and not osx] - ucx # [linux and not osx] - zlib script: run_test.sh @@ -207,7 +207,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux-64 and not osx] + - ucc # [linux-64 and not linux-ppc64le and not osx] - ucx # [linux and not osx] - zlib script: run_test.sh From fbc426cc031792cb079a79cb33289959c35ea81b Mon Sep 17 00:00:00 2001 From: j34ni Date: Sun, 22 Sep 2024 15:29:57 +0000 Subject: [PATCH 142/224] Still issues with ppc64le --- recipe/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 04c72a16..2e7e3ee4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,7 +67,7 @@ outputs: - numactl # [linux] - pkg-config - rdma-core # [linux] - - ucc # [linux-64 and not linux-ppc64le and not osx] + - ucc # [linux and not osx] - ucx # [linux and not osx] - zlib @@ -84,7 +84,7 @@ outputs: - numactl # [linux] - pkg-config # [linux] - rdma-core # [linux] - - ucc # [linux-64 and not linux-ppc64le and not osx] + - ucc # [linux and not osx] - ucx # [linux and not osx] - zlib - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] @@ -99,7 +99,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux-64 and not linux-ppc64le and not osx] + - ucc # [linux and not osx] - ucx # [linux and not osx] - zlib run_constrained: @@ -145,7 +145,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux-64 and not linux-ppc64le and not osx] + - ucc # [linux and not osx] - ucx # [linux and not osx] - zlib script: run_test.sh @@ -177,7 +177,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux-64 and not linux-ppc64le and not osx] + - ucc # [linux and not osx] - ucx # [linux and not osx] - zlib script: run_test.sh @@ -207,7 +207,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux-64 and not linux-ppc64le and not osx] + - ucc # [linux and not osx] - ucx # [linux and not osx] - zlib script: run_test.sh From 9a4e097eeb61459701baaacd7738b71d42c0e2ee Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 18:07:52 +0200 Subject: [PATCH 143/224] Update meta.yaml Restored `- ucc # [linux and not osx and not ppc64le]` everywhere and added in run_constrained: `- {{ pin_compatible("ucc", max_pin="x.x") }} # [linux and not ppc64le]` which will hopefully solve the ppc64le issues --- recipe/meta.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2e7e3ee4..bcb1b5fb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,7 +67,7 @@ outputs: - numactl # [linux] - pkg-config - rdma-core # [linux] - - ucc # [linux and not osx] + - ucc # [linux and not osx and not ppc64le] - ucx # [linux and not osx] - zlib @@ -84,7 +84,7 @@ outputs: - numactl # [linux] - pkg-config # [linux] - rdma-core # [linux] - - ucc # [linux and not osx] + - ucc # [linux and not osx and not ppc64le] - ucx # [linux and not osx] - zlib - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] @@ -99,12 +99,12 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not osx] + - ucc # [linux and not osx and not ppc64le] - ucx # [linux and not osx] - zlib run_constrained: - {{ pin_compatible("ucx", max_pin="x.x") }} # [linux] - - {{ pin_compatible("ucc", max_pin="x.x") }} # [linux] + - {{ pin_compatible("ucc", max_pin="x.x") }} # [linux and not ppc64le] # Open MPI only uses CUDA Driver APIs, set the minimal driver version - __cuda >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] # Ensure a consistent CUDA environment @@ -145,7 +145,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not osx] + - ucc # [linux and not osx and not ppc64le] - ucx # [linux and not osx] - zlib script: run_test.sh @@ -177,7 +177,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not osx] + - ucc # [linux and not osx and not ppc64le] - ucx # [linux and not osx] - zlib script: run_test.sh @@ -207,7 +207,7 @@ outputs: - libudev1 # [linux] - numactl # [linux] - rdma-core # [linux] - - ucc # [linux and not osx] + - ucc # [linux and not osx and not ppc64le] - ucx # [linux and not osx] - zlib script: run_test.sh From 0e17698d968cf79bf64457c66a84fe218be35af5 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 18:52:10 +0200 Subject: [PATCH 144/224] Update build-mpi.sh Trying to debug the failed build for ppc64le --- recipe/build-mpi.sh | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 3c893a68..2b504eca 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -73,6 +73,9 @@ if [[ $CONDA_BUILD_CROSS_COMPILATION == "1" ]]; then source $RECIPE_DIR/cross-gfortran.$target_platform.sh fi +# Ensure a log directory exists +mkdir -p ${SRC_DIR}/logs + # disable wrapper-runpath for consistency with conda-forge wrt dtags # openmpi's runpath adds new dtags to compiler wrappers ./configure --prefix=$PREFIX \ @@ -90,10 +93,20 @@ fi $build_with_ucx \ $build_with_ucc \ $build_with_cuda \ - || (cat config.log; false) + 2>&1 | tee ${SRC_DIR}/logs/configure.log + +# Capture the exit status of configure +configure_status=$? + +# If configure fails, copy config.log for debugging +if [ $configure_status -ne 0 ]; then + cat config.log || true # Concatenate config.log to stdout + cp config.log ${SRC_DIR}/logs/ + exit 1 +fi -make -j"${CPU_COUNT:-1}" -make install +make -j"${CPU_COUNT:-1}" 2>&1 | tee ${SRC_DIR}/logs/make.log +make install 2>&1 | tee ${SRC_DIR}/logs/make_install.log POST_LINK=$PREFIX/bin/.openmpi-post-link.sh if [ -z "$build_with_ucx" ]; then From 9d7ace81c382a06e41a6bba7a61c3d5739179ab8 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 19:41:38 +0200 Subject: [PATCH 145/224] Update build-mpi.sh handling UCC support conditionally --- recipe/build-mpi.sh | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 2b504eca..d5a65bb4 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -39,10 +39,13 @@ fi # UCX/UCC support build_with_ucx="" build_with_ucc="" -if [[ "$target_platform" == linux-* ]]; then +if [[ "$target_platform" == "linux-64" ]]; then echo "Build with UCX/UCC support" build_with_ucx="--with-ucx=$PREFIX" build_with_ucc="--with-ucc=$PREFIX" +else + echo "UCC support not available for $target_platform, proceeding without it" + build_with_ucx="--with-ucx=$PREFIX" fi # CUDA support @@ -73,9 +76,6 @@ if [[ $CONDA_BUILD_CROSS_COMPILATION == "1" ]]; then source $RECIPE_DIR/cross-gfortran.$target_platform.sh fi -# Ensure a log directory exists -mkdir -p ${SRC_DIR}/logs - # disable wrapper-runpath for consistency with conda-forge wrt dtags # openmpi's runpath adds new dtags to compiler wrappers ./configure --prefix=$PREFIX \ @@ -93,20 +93,10 @@ mkdir -p ${SRC_DIR}/logs $build_with_ucx \ $build_with_ucc \ $build_with_cuda \ - 2>&1 | tee ${SRC_DIR}/logs/configure.log - -# Capture the exit status of configure -configure_status=$? - -# If configure fails, copy config.log for debugging -if [ $configure_status -ne 0 ]; then - cat config.log || true # Concatenate config.log to stdout - cp config.log ${SRC_DIR}/logs/ - exit 1 -fi + || (cat config.log; false) -make -j"${CPU_COUNT:-1}" 2>&1 | tee ${SRC_DIR}/logs/make.log -make install 2>&1 | tee ${SRC_DIR}/logs/make_install.log +make -j"${CPU_COUNT:-1}" +make install POST_LINK=$PREFIX/bin/.openmpi-post-link.sh if [ -z "$build_with_ucx" ]; then From e8882335230acc8c4969bd29fc1fcdbee0282c98 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 20:25:16 +0200 Subject: [PATCH 146/224] Update build-mpi.sh refined test for UCX/UCC support --- recipe/build-mpi.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index d5a65bb4..def51f9d 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -43,9 +43,11 @@ if [[ "$target_platform" == "linux-64" ]]; then echo "Build with UCX/UCC support" build_with_ucx="--with-ucx=$PREFIX" build_with_ucc="--with-ucc=$PREFIX" -else - echo "UCC support not available for $target_platform, proceeding without it" +elif [[ "$target_platform" == linux-* ]]; then + echo "Build with UCX support, without UCC" build_with_ucx="--with-ucx=$PREFIX" +else + echo "UCX and UCC support not available for $target_platform, proceeding without them" fi # CUDA support From bdf7b05ad4dffeb8ffcc15d7ac47be36e3e5aac0 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 21:33:15 +0200 Subject: [PATCH 147/224] Update build-mpi.sh The build finished without error for ppc64le but the resulting ompi_info does not mention ucx, and hence the modified test failed, whereas it would have previously passed since the conda list contains ucx 1.16.0-hfbcfdbd_5 I do not have access to a ppc64le machine to check if linux-ppc64le/openmpi-5.0.5-h2fa3e9f_100.conda was effectively built with UCX support, but it would be interesting to do it... In these conditions, it seems pragmatic to temporarily disable UCX support for ppc64le --- recipe/build-mpi.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index def51f9d..feb32c5b 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -39,15 +39,15 @@ fi # UCX/UCC support build_with_ucx="" build_with_ucc="" -if [[ "$target_platform" == "linux-64" ]]; then - echo "Build with UCX/UCC support" + +if [[ "$target_platform" == "linux-64" || "$target_platform" == "linux-aarch64" ]]; then + echo "Building on $target_platform: UCX and UCC support" build_with_ucx="--with-ucx=$PREFIX" build_with_ucc="--with-ucc=$PREFIX" -elif [[ "$target_platform" == linux-* ]]; then - echo "Build with UCX support, without UCC" - build_with_ucx="--with-ucx=$PREFIX" +elif [[ "$target_platform" == "linux-ppc64le" ]]; then + echo "Building on ppc64le: UCX support skipped for now" else - echo "UCX and UCC support not available for $target_platform, proceeding without them" + echo "Other platform: No UCX/UCC support" fi # CUDA support From cff4502bbe931b7d5ffc86e1420c0c660af7d24b Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 22:11:26 +0200 Subject: [PATCH 148/224] Update run_test.sh Updated test on ompi_info for osx_64 and ppc64le platforms --- recipe/run_test.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/recipe/run_test.sh b/recipe/run_test.sh index a6c262e0..2a0a55ed 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -10,14 +10,13 @@ if [[ $PKG_NAME == "openmpi" ]]; then # -n : string is not null # -z : string is null, that is, has zero length -# No UCX available on osx_64 platform - - if [[ "$target_platform" != osx-64 ]]; then +# No UCX available on osx_64 and ppc64le platforms +if [[ "$target_platform" != "osx-64" && "$target_platform" != "linux-ppc64le" ]]; then if [[ -z "$(ompi_info | grep ucx)" ]]; then - echo "OpenMPI configured without UCX support!" - exit 1 + echo "OpenMPI configured without UCX support on $target_platform!" + exit 1 fi - fi +fi if [[ -z "$(ompi_info | grep cuda)" ]]; then echo "OpenMPI configured without CUDA support!" From 3f27611542c10ffd2f875db95740b4e0f015bf0a Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 22:12:49 +0200 Subject: [PATCH 149/224] Update run_test.sh Fixed indentation --- recipe/run_test.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 2a0a55ed..2636b412 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -11,12 +11,12 @@ if [[ $PKG_NAME == "openmpi" ]]; then # -z : string is null, that is, has zero length # No UCX available on osx_64 and ppc64le platforms -if [[ "$target_platform" != "osx-64" && "$target_platform" != "linux-ppc64le" ]]; then - if [[ -z "$(ompi_info | grep ucx)" ]]; then - echo "OpenMPI configured without UCX support on $target_platform!" - exit 1 - fi -fi + if [[ "$target_platform" != "osx-64" && "$target_platform" != "linux-ppc64le" ]]; then + if [[ -z "$(ompi_info | grep ucx)" ]]; then + echo "OpenMPI configured without UCX support on $target_platform!" + exit 1 + fi + fi if [[ -z "$(ompi_info | grep cuda)" ]]; then echo "OpenMPI configured without CUDA support!" From 533399ba6fe9ae2a612052767587f8694bc9ccd7 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 22:56:12 +0200 Subject: [PATCH 150/224] Update run_test.sh same test --- recipe/run_test.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 2636b412..3eee368c 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -10,13 +10,13 @@ if [[ $PKG_NAME == "openmpi" ]]; then # -n : string is not null # -z : string is null, that is, has zero length -# No UCX available on osx_64 and ppc64le platforms - if [[ "$target_platform" != "osx-64" && "$target_platform" != "linux-ppc64le" ]]; then - if [[ -z "$(ompi_info | grep ucx)" ]]; then - echo "OpenMPI configured without UCX support on $target_platform!" - exit 1 - fi - fi + # No UCX available on osx_64 and ppc64le platforms + if [[ "$target_platform" != "osx-64" && "$target_platform" != "linux-ppc64le" ]]; then + if [[ -z "$(ompi_info | grep ucx)" ]]; then + echo "OpenMPI configured without UCX support on $target_platform!" + exit 1 + fi + fi if [[ -z "$(ompi_info | grep cuda)" ]]; then echo "OpenMPI configured without CUDA support!" From 130649f63a68d5f33f85e3d69f9b49e24ce073c4 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Sun, 22 Sep 2024 23:28:06 +0200 Subject: [PATCH 151/224] Update run_test.sh Skip CUDA checks for platforms not supporting it --- recipe/run_test.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 3eee368c..6c5d9141 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -7,20 +7,20 @@ pushd "tests" if [[ $PKG_NAME == "openmpi" ]]; then -# -n : string is not null -# -z : string is null, that is, has zero length - - # No UCX available on osx_64 and ppc64le platforms - if [[ "$target_platform" != "osx-64" && "$target_platform" != "linux-ppc64le" ]]; then - if [[ -z "$(ompi_info | grep ucx)" ]]; then - echo "OpenMPI configured without UCX support on $target_platform!" - exit 1 - fi - fi - - if [[ -z "$(ompi_info | grep cuda)" ]]; then - echo "OpenMPI configured without CUDA support!" - exit 1 + # Skip UCX checks for platforms not supporting it + if [[ "$target_platform" != "osx-64" && "$target_platform" != "linux-ppc64le" ]]; then + if [[ -z "$(ompi_info | grep ucx)" ]]; then + echo "OpenMPI configured without UCX support on $target_platform!" + exit 1 + fi + fi + + # Skip CUDA checks for platforms not supporting it + if [[ "$target_platform" != "linux-ppc64le" ]]; then + if [[ -z "$(ompi_info | grep cuda)" ]]; then + echo "OpenMPI configured without CUDA support on $target_platform!" + exit 1 + fi fi command -v ompi_info From 3475244b0c11e73cddcab43bfa8c998b04eec3f9 Mon Sep 17 00:00:00 2001 From: j34ni Date: Mon, 23 Sep 2024 06:03:54 +0000 Subject: [PATCH 152/224] --enable-debug --- recipe/build-mpi.sh | 16 +++++++++------- recipe/run_test.sh | 27 +++++++++++++-------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index feb32c5b..aa491cc8 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -14,7 +14,8 @@ unset FFLAGS F77 F90 F95 export FCFLAGS="-fallow-argument-mismatch ${FCFLAGS}" # tweak compiler flags -export LIBRARY_PATH="$PREFIX/lib" +export LIBRARY_PATH="$PREFIX/lib:$LIBRARY_PATH" +export LIBRARY_PATH="$PREFIX/lib64:$LIBRARY_PATH" if [[ "$target_platform" == osx-* ]]; then # FIXME: remove autogen when autotools patch no longer required perl autogen.pl --force @@ -39,13 +40,10 @@ fi # UCX/UCC support build_with_ucx="" build_with_ucc="" - -if [[ "$target_platform" == "linux-64" || "$target_platform" == "linux-aarch64" ]]; then - echo "Building on $target_platform: UCX and UCC support" +if [[ "$target_platform" == "linux-*" ]]; then + echo "Building on $target_platform with UCX and UCC support" build_with_ucx="--with-ucx=$PREFIX" build_with_ucc="--with-ucc=$PREFIX" -elif [[ "$target_platform" == "linux-ppc64le" ]]; then - echo "Building on ppc64le: UCX support skipped for now" else echo "Other platform: No UCX/UCC support" fi @@ -55,6 +53,8 @@ build_with_cuda="" if [[ -n "$CUDA_HOME" ]]; then echo "Build with CUDA support" build_with_cuda="--with-cuda=$CUDA_HOME --with-cuda-libdir=$CUDA_HOME/lib64/stubs" +else + "No CUDA support" fi if [[ $CONDA_BUILD_CROSS_COMPILATION == "1" ]]; then @@ -92,12 +92,14 @@ fi --with-libevent=$PREFIX \ --with-zlib=$PREFIX \ --enable-ipv6 \ + --enable-debug \ $build_with_ucx \ $build_with_ucc \ $build_with_cuda \ || (cat config.log; false) -make -j"${CPU_COUNT:-1}" +make -j16 +###make -j"${CPU_COUNT:-1}" make install POST_LINK=$PREFIX/bin/.openmpi-post-link.sh diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 6c5d9141..628cc4f2 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -7,33 +7,32 @@ pushd "tests" if [[ $PKG_NAME == "openmpi" ]]; then + command -v ompi_info + ompi_info + + command -v prte_info + prte_info + + echo "Ttarget_platform=$target_platform" # Skip UCX checks for platforms not supporting it - if [[ "$target_platform" != "osx-64" && "$target_platform" != "linux-ppc64le" ]]; then + if [[ "$target_platform" == "linux-*" ]]; then if [[ -z "$(ompi_info | grep ucx)" ]]; then echo "OpenMPI configured without UCX support on $target_platform!" exit 1 fi fi - # Skip CUDA checks for platforms not supporting it - if [[ "$target_platform" != "linux-ppc64le" ]]; then - if [[ -z "$(ompi_info | grep cuda)" ]]; then - echo "OpenMPI configured without CUDA support on $target_platform!" - exit 1 - fi + # CUDA checks for all platforms + if [[ -z "$(ompi_info | grep cuda)" ]]; then + echo "OpenMPI configured without CUDA support on $target_platform!" + exit 1 fi - command -v ompi_info - ompi_info - - command -v prte_info - prte_info - command -v mpiexec $MPIEXEC --help $MPIEXEC -n 4 ./helloworld.sh -# test -f $PREFIX/include/mpi.mod + test -f $PREFIX/include/mpi.mod fi From c7c9572e872d92a3a7ff6921a3a812388e6beab8 Mon Sep 17 00:00:00 2001 From: j34ni Date: Mon, 23 Sep 2024 07:01:09 +0000 Subject: [PATCH 153/224] fixed typos --- recipe/build-mpi.sh | 3 +-- recipe/run_test.sh | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index aa491cc8..877ceb62 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -15,7 +15,6 @@ export FCFLAGS="-fallow-argument-mismatch ${FCFLAGS}" # tweak compiler flags export LIBRARY_PATH="$PREFIX/lib:$LIBRARY_PATH" -export LIBRARY_PATH="$PREFIX/lib64:$LIBRARY_PATH" if [[ "$target_platform" == osx-* ]]; then # FIXME: remove autogen when autotools patch no longer required perl autogen.pl --force @@ -54,7 +53,7 @@ if [[ -n "$CUDA_HOME" ]]; then echo "Build with CUDA support" build_with_cuda="--with-cuda=$CUDA_HOME --with-cuda-libdir=$CUDA_HOME/lib64/stubs" else - "No CUDA support" + echo "No CUDA support" fi if [[ $CONDA_BUILD_CROSS_COMPILATION == "1" ]]; then diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 628cc4f2..1b0d456b 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -32,8 +32,6 @@ if [[ $PKG_NAME == "openmpi" ]]; then $MPIEXEC --help $MPIEXEC -n 4 ./helloworld.sh - test -f $PREFIX/include/mpi.mod - fi if [[ $PKG_NAME == "openmpi-mpicc" ]]; then From 4c6a12d89ef298a8e7502c02eff4e9024a2da25f Mon Sep 17 00:00:00 2001 From: j34ni Date: Mon, 23 Sep 2024 07:30:51 +0000 Subject: [PATCH 154/224] back to 9a4e097 --- recipe/build-mpi.sh | 14 ++++---------- recipe/run_test.sh | 32 ++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 877ceb62..3c893a68 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -14,7 +14,7 @@ unset FFLAGS F77 F90 F95 export FCFLAGS="-fallow-argument-mismatch ${FCFLAGS}" # tweak compiler flags -export LIBRARY_PATH="$PREFIX/lib:$LIBRARY_PATH" +export LIBRARY_PATH="$PREFIX/lib" if [[ "$target_platform" == osx-* ]]; then # FIXME: remove autogen when autotools patch no longer required perl autogen.pl --force @@ -39,12 +39,10 @@ fi # UCX/UCC support build_with_ucx="" build_with_ucc="" -if [[ "$target_platform" == "linux-*" ]]; then - echo "Building on $target_platform with UCX and UCC support" +if [[ "$target_platform" == linux-* ]]; then + echo "Build with UCX/UCC support" build_with_ucx="--with-ucx=$PREFIX" build_with_ucc="--with-ucc=$PREFIX" -else - echo "Other platform: No UCX/UCC support" fi # CUDA support @@ -52,8 +50,6 @@ build_with_cuda="" if [[ -n "$CUDA_HOME" ]]; then echo "Build with CUDA support" build_with_cuda="--with-cuda=$CUDA_HOME --with-cuda-libdir=$CUDA_HOME/lib64/stubs" -else - echo "No CUDA support" fi if [[ $CONDA_BUILD_CROSS_COMPILATION == "1" ]]; then @@ -91,14 +87,12 @@ fi --with-libevent=$PREFIX \ --with-zlib=$PREFIX \ --enable-ipv6 \ - --enable-debug \ $build_with_ucx \ $build_with_ucc \ $build_with_cuda \ || (cat config.log; false) -make -j16 -###make -j"${CPU_COUNT:-1}" +make -j"${CPU_COUNT:-1}" make install POST_LINK=$PREFIX/bin/.openmpi-post-link.sh diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 1b0d456b..a6c262e0 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -7,31 +7,35 @@ pushd "tests" if [[ $PKG_NAME == "openmpi" ]]; then - command -v ompi_info - ompi_info +# -n : string is not null +# -z : string is null, that is, has zero length - command -v prte_info - prte_info +# No UCX available on osx_64 platform - echo "Ttarget_platform=$target_platform" - # Skip UCX checks for platforms not supporting it - if [[ "$target_platform" == "linux-*" ]]; then - if [[ -z "$(ompi_info | grep ucx)" ]]; then - echo "OpenMPI configured without UCX support on $target_platform!" - exit 1 - fi + if [[ "$target_platform" != osx-64 ]]; then + if [[ -z "$(ompi_info | grep ucx)" ]]; then + echo "OpenMPI configured without UCX support!" + exit 1 + fi fi - # CUDA checks for all platforms if [[ -z "$(ompi_info | grep cuda)" ]]; then - echo "OpenMPI configured without CUDA support on $target_platform!" - exit 1 + echo "OpenMPI configured without CUDA support!" + exit 1 fi + command -v ompi_info + ompi_info + + command -v prte_info + prte_info + command -v mpiexec $MPIEXEC --help $MPIEXEC -n 4 ./helloworld.sh +# test -f $PREFIX/include/mpi.mod + fi if [[ $PKG_NAME == "openmpi-mpicc" ]]; then From 9539371d37e243528a1b949f175be73a413e3855 Mon Sep 17 00:00:00 2001 From: j34ni Date: Mon, 23 Sep 2024 13:15:37 +0000 Subject: [PATCH 155/224] More consistent requirements for build/host/run/test --- recipe/meta.yaml | 68 ++++++++-------------------------------------- recipe/run_test.sh | 2 +- 2 files changed, 12 insertions(+), 58 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bcb1b5fb..605fb291 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -56,52 +56,30 @@ outputs: - autoconf # [osx] - automake # [osx] - binutils # [linux] - - libevent - - libhwloc - - libmagic - - libnl # [linux] - - libnuma # [linux] + - libmagic # [linux] - libtool # [unix] - - libudev1 # [linux] - - make # [unix] - - numactl # [linux] - pkg-config - - rdma-core # [linux] - - ucc # [linux and not osx and not ppc64le] - - ucx # [linux and not osx] - - zlib - host: #- openpmix #- prrte - binutils # [linux] - libevent - libhwloc - - libmagic - libnl # [linux] - libnuma # [linux] - libudev1 # [linux] - numactl # [linux] - - pkg-config # [linux] - rdma-core # [linux] - - ucc # [linux and not osx and not ppc64le] - - ucx # [linux and not osx] + - ucc # [linux and not ppc64le] + - ucx # [linux] - zlib - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] run: - mpi 1.0 openmpi #- openpmix #- prrte - - libevent - - libhwloc - - libnl # [linux] - - libnuma # [linux] - - libudev1 # [linux] - - numactl # [linux] - - rdma-core # [linux] - - ucc # [linux and not osx and not ppc64le] - - ucx # [linux and not osx] - - zlib + - ucc # [linux and not ppc64le] + - ucx # [linux] run_constrained: - {{ pin_compatible("ucx", max_pin="x.x") }} # [linux] - {{ pin_compatible("ucc", max_pin="x.x") }} # [linux and not ppc64le] @@ -138,16 +116,8 @@ outputs: # Ensure the correct dependencies are available for testing requires: - mpi 1.0 openmpi - - libevent - - libhwloc - - libnl # [linux] - - libnuma # [linux] - - libudev1 # [linux] - - numactl # [linux] - - rdma-core # [linux] - - ucc # [linux and not osx and not ppc64le] - - ucx # [linux and not osx] - - zlib + - ucc # [linux and not ppc64le] + - ucx # [linux] script: run_test.sh files: - tests/helloworld.c @@ -170,16 +140,8 @@ outputs: # Ensure the correct dependencies are available for testing requires: - mpi 1.0 openmpi - - libevent - - libhwloc - - libnl # [linux] - - libnuma # [linux] - - libudev1 # [linux] - - numactl # [linux] - - rdma-core # [linux] - - ucc # [linux and not osx and not ppc64le] - - ucx # [linux and not osx] - - zlib + - ucc # [linux and not ppc64le] + - ucx # [linux] script: run_test.sh files: - tests/helloworld.cxx @@ -200,16 +162,8 @@ outputs: test: requires: - mpi 1.0 openmpi - - libevent - - libhwloc - - libnl # [linux] - - libnuma # [linux] - - libudev1 # [linux] - - numactl # [linux] - - rdma-core # [linux] - - ucc # [linux and not osx and not ppc64le] - - ucx # [linux and not osx] - - zlib + - ucc # [linux and not ppc64le] + - ucx # [linux] script: run_test.sh files: - tests/helloworld.f diff --git a/recipe/run_test.sh b/recipe/run_test.sh index a6c262e0..e9b19575 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -34,7 +34,7 @@ if [[ $PKG_NAME == "openmpi" ]]; then $MPIEXEC --help $MPIEXEC -n 4 ./helloworld.sh -# test -f $PREFIX/include/mpi.mod + test -f $PREFIX/include/mpi.mod fi From 808b63f3047f6a56df5c823cf45cadaf46707551 Mon Sep 17 00:00:00 2001 From: j34ni Date: Mon, 23 Sep 2024 15:29:02 +0000 Subject: [PATCH 156/224] Introduced --- recipe/build-mpi.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 3c893a68..f89b1376 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -40,9 +40,19 @@ fi build_with_ucx="" build_with_ucc="" if [[ "$target_platform" == linux-* ]]; then - echo "Build with UCX/UCC support" + echo "Build with UCX support" build_with_ucx="--with-ucx=$PREFIX" - build_with_ucc="--with-ucc=$PREFIX" + if [[ "$target_platform" != linux-ppc64le ]]; then + echo "Build with UCC support also" + build_with_ucc="--with-ucc=$PREFIX" + fi +fi + +# PMIx support +build_with_pmix="" +if [[ "$target_platform" == linux-* && "$target_platform" != linux-ppc64le* ]]; then + echo "Build with PMIx support" + build_with_pmix="--with-pmix=internal" fi # CUDA support @@ -82,11 +92,11 @@ fi --with-mpi-moduledir='${includedir}' \ --with-wrapper-ldflags="${wrapper_ldflags}" \ --with-sge \ - --with-pmix=internal \ --with-hwloc=$PREFIX \ --with-libevent=$PREFIX \ --with-zlib=$PREFIX \ --enable-ipv6 \ + $build_with_pmix \ $build_with_ucx \ $build_with_ucc \ $build_with_cuda \ From 2e57c798519c8739c0a5e33a25809adf972267dd Mon Sep 17 00:00:00 2001 From: j34ni Date: Mon, 23 Sep 2024 16:29:54 +0000 Subject: [PATCH 157/224] With DSOs --- recipe/build-mpi.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index f89b1376..4528143e 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -96,13 +96,14 @@ fi --with-libevent=$PREFIX \ --with-zlib=$PREFIX \ --enable-ipv6 \ - $build_with_pmix \ + --enable-mca-dso \ + $build_with_pmix \ $build_with_ucx \ $build_with_ucc \ $build_with_cuda \ || (cat config.log; false) -make -j"${CPU_COUNT:-1}" +make -j"${CPU_COUNT:-1}" make install POST_LINK=$PREFIX/bin/.openmpi-post-link.sh From d5393e32e12746e3d049c6fd348488dc224ea47e Mon Sep 17 00:00:00 2001 From: j34ni Date: Mon, 23 Sep 2024 16:47:15 +0000 Subject: [PATCH 158/224] Force rebuild after Connection broken: IncompleteRead --- recipe/build-mpi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 4528143e..7ddef39b 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -36,7 +36,7 @@ if [[ "$target_platform" == osx-* ]]; then wrapper_ldflags='-Wl,-rpath,${libdir}' fi -# UCX/UCC support +# UCX and UCC support build_with_ucx="" build_with_ucc="" if [[ "$target_platform" == linux-* ]]; then From fdcec3109214b4a7b2d91442a911e02513f3494d Mon Sep 17 00:00:00 2001 From: j34ni Date: Mon, 23 Sep 2024 17:57:15 +0000 Subject: [PATCH 159/224] Adjusted test on ompi_info to platform --- recipe/run_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/run_test.sh b/recipe/run_test.sh index e9b19575..d34f74ef 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -10,9 +10,9 @@ if [[ $PKG_NAME == "openmpi" ]]; then # -n : string is not null # -z : string is null, that is, has zero length -# No UCX available on osx_64 platform +# No UCX support on osx-64 and ppc64le platforms - if [[ "$target_platform" != osx-64 ]]; then + if [[ "$target_platform" != osx-64 && "$target_platform" != ppc64le ]]; then if [[ -z "$(ompi_info | grep ucx)" ]]; then echo "OpenMPI configured without UCX support!" exit 1 From e7d473e07f0f6fae39a333d327733a264fa1b4a2 Mon Sep 17 00:00:00 2001 From: j34ni Date: Mon, 23 Sep 2024 18:13:28 +0000 Subject: [PATCH 160/224] Plateform name is linux-ppc64le (not ppc64le) --- recipe/run_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/run_test.sh b/recipe/run_test.sh index d34f74ef..1110872e 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -11,8 +11,8 @@ if [[ $PKG_NAME == "openmpi" ]]; then # -z : string is null, that is, has zero length # No UCX support on osx-64 and ppc64le platforms - - if [[ "$target_platform" != osx-64 && "$target_platform" != ppc64le ]]; then + echo "Target platform = $target_platform" + if [[ "$target_platform" != osx-64 && "$target_platform" != linux-ppc64le ]]; then if [[ -z "$(ompi_info | grep ucx)" ]]; then echo "OpenMPI configured without UCX support!" exit 1 From afcbd684c8a0beec2786fd8941337bc6d0ec5baf Mon Sep 17 00:00:00 2001 From: j34ni Date: Mon, 23 Sep 2024 19:11:05 +0000 Subject: [PATCH 161/224] Reinstated the original tests --- recipe/run_test.sh | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 1110872e..acc7bc51 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -7,20 +7,13 @@ pushd "tests" if [[ $PKG_NAME == "openmpi" ]]; then -# -n : string is not null -# -z : string is null, that is, has zero length - -# No UCX support on osx-64 and ppc64le platforms - echo "Target platform = $target_platform" - if [[ "$target_platform" != osx-64 && "$target_platform" != linux-ppc64le ]]; then - if [[ -z "$(ompi_info | grep ucx)" ]]; then - echo "OpenMPI configured without UCX support!" - exit 1 - fi + if [[ -n "$(conda list | grep ucx)" ]]; then + echo "Improper UCX dependency!" + exit 1 fi - if [[ -z "$(ompi_info | grep cuda)" ]]; then - echo "OpenMPI configured without CUDA support!" + if [[ -n "$(conda list | grep cuda-version)" ]]; then + echo "Improper CUDA dependency!" exit 1 fi @@ -35,7 +28,6 @@ if [[ $PKG_NAME == "openmpi" ]]; then $MPIEXEC -n 4 ./helloworld.sh test -f $PREFIX/include/mpi.mod - fi if [[ $PKG_NAME == "openmpi-mpicc" ]]; then @@ -92,3 +84,4 @@ if [[ $PKG_NAME == "openmpi-mpifort" ]]; then fi popd + From 6eab69dd2a4c6ad47db94f873b0d8e59fc76992b Mon Sep 17 00:00:00 2001 From: j34ni Date: Tue, 24 Sep 2024 05:32:24 +0000 Subject: [PATCH 162/224] Deactivated tests --- recipe/run_test.sh | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/recipe/run_test.sh b/recipe/run_test.sh index acc7bc51..b465bf15 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -7,15 +7,37 @@ pushd "tests" if [[ $PKG_NAME == "openmpi" ]]; then - if [[ -n "$(conda list | grep ucx)" ]]; then + echo "$target_platform $target_platform $target_platform $target_platform $target_platform $target_platform $target_platform " + echo "----- conda list ----- conda list ----- conda list ----- conda list ----- conda list ----- conda list" + conda list + echo "----- ompi_info ----- ompi_info ----- ompi_info ----- ompi_info ----- ompi_info ----- ompi_info ----- ompi_info" + ompi_info + + if [[ -z "$(conda list | grep ucx)" ]]; then echo "Improper UCX dependency!" - exit 1 +# exit 1 fi - if [[ -n "$(conda list | grep cuda-version)" ]]; then + if [[ -z "$(conda list | grep cuda-version)" ]]; then echo "Improper CUDA dependency!" - exit 1 +# exit 1 + fi + + # -n : string is not null + # -z : string is null, that is, has zero length + # UCX support on linux-64 platforms + echo "Target platform = $target_platform" + if [[ "$target_platform" == linux-64 ]]; then + if [[ -z "$(ompi_info | grep ucx)" ]]; then + echo "OpenMPI configured without UCX support!" + fi + fi + + # CUDA support on all platforms + if [[ -z "$(ompi_info | grep cuda)" ]]; then + echo "OpenMPI configured without CUDA support!" fi + echo "--------------------------------------------------------------------------------------------" command -v ompi_info ompi_info From 6f0983efabb63ea0e944ae048cb225613eb42860 Mon Sep 17 00:00:00 2001 From: j34ni Date: Tue, 24 Sep 2024 06:41:31 +0000 Subject: [PATCH 163/224] Testing on ompi_info rather than conda list --- recipe/build-mpi.sh | 9 +++------ recipe/run_test.sh | 18 +----------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 7ddef39b..d095934f 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -39,13 +39,10 @@ fi # UCX and UCC support build_with_ucx="" build_with_ucc="" -if [[ "$target_platform" == linux-* ]]; then - echo "Build with UCX support" +if [[ "$target_platform" == linux-* && "$target_platform" != linux-ppc64le ]]; then + echo "Build with UCX/UCC support" build_with_ucx="--with-ucx=$PREFIX" - if [[ "$target_platform" != linux-ppc64le ]]; then - echo "Build with UCC support also" - build_with_ucc="--with-ucc=$PREFIX" - fi + build_with_ucc="--with-ucc=$PREFIX" fi # PMIx support diff --git a/recipe/run_test.sh b/recipe/run_test.sh index b465bf15..0db73db6 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -7,24 +7,9 @@ pushd "tests" if [[ $PKG_NAME == "openmpi" ]]; then - echo "$target_platform $target_platform $target_platform $target_platform $target_platform $target_platform $target_platform " - echo "----- conda list ----- conda list ----- conda list ----- conda list ----- conda list ----- conda list" - conda list - echo "----- ompi_info ----- ompi_info ----- ompi_info ----- ompi_info ----- ompi_info ----- ompi_info ----- ompi_info" - ompi_info - - if [[ -z "$(conda list | grep ucx)" ]]; then - echo "Improper UCX dependency!" -# exit 1 - fi - - if [[ -z "$(conda list | grep cuda-version)" ]]; then - echo "Improper CUDA dependency!" -# exit 1 - fi - # -n : string is not null # -z : string is null, that is, has zero length + # UCX support on linux-64 platforms echo "Target platform = $target_platform" if [[ "$target_platform" == linux-64 ]]; then @@ -37,7 +22,6 @@ if [[ $PKG_NAME == "openmpi" ]]; then if [[ -z "$(ompi_info | grep cuda)" ]]; then echo "OpenMPI configured without CUDA support!" fi - echo "--------------------------------------------------------------------------------------------" command -v ompi_info ompi_info From 0525930684e470db52ca553a70e89ea8c83543ea Mon Sep 17 00:00:00 2001 From: j34ni Date: Tue, 24 Sep 2024 07:28:02 +0000 Subject: [PATCH 164/224] Build for ppc64le as it was originally --- recipe/build-mpi.sh | 24 ++++++++++++++++++++++-- recipe/run_test.sh | 18 +++++++++++------- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index d095934f..0b5dfc22 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -11,7 +11,9 @@ export FC=$(basename "$FC") unset FFLAGS F77 F90 F95 # add -fallow-argument-mismatch to FCFLAGS -export FCFLAGS="-fallow-argument-mismatch ${FCFLAGS}" +if [[ "$target_platform" != linux-ppc64le ]]; then + export FCFLAGS="-fallow-argument-mismatch ${FCFLAGS}" +fi # tweak compiler flags export LIBRARY_PATH="$PREFIX/lib" @@ -92,14 +94,32 @@ fi --with-hwloc=$PREFIX \ --with-libevent=$PREFIX \ --with-zlib=$PREFIX \ - --enable-ipv6 \ --enable-mca-dso \ + --enable-ipv6 \ $build_with_pmix \ $build_with_ucx \ $build_with_ucc \ $build_with_cuda \ || (cat config.log; false) +echo "./configure --prefix=$PREFIX \ + --disable-dependency-tracking \ + --disable-wrapper-runpath \ + --enable-mpi-fortran \ + --with-mpi-moduledir='${includedir}' \ + --with-wrapper-ldflags="${wrapper_ldflags}" \ + --with-sge \ + --with-hwloc=$PREFIX \ + --with-libevent=$PREFIX \ + --with-zlib=$PREFIX \ + --enable-mca-dso \ + --enable-ipv6 \ + $build_with_pmix \ + $build_with_ucx \ + $build_with_ucc \ + $build_with_cuda \ + || (cat config.log; false)" + make -j"${CPU_COUNT:-1}" make install diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 0db73db6..89aec3ef 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -10,17 +10,21 @@ if [[ $PKG_NAME == "openmpi" ]]; then # -n : string is not null # -z : string is null, that is, has zero length - # UCX support on linux-64 platforms + # UCX support echo "Target platform = $target_platform" if [[ "$target_platform" == linux-64 ]]; then - if [[ -z "$(ompi_info | grep ucx)" ]]; then - echo "OpenMPI configured without UCX support!" - fi + if [[ -z "$(ompi_info | grep ucx)" ]]; then + echo "OpenMPI configured without UCX support!" + exit 1 + fi fi - # CUDA support on all platforms - if [[ -z "$(ompi_info | grep cuda)" ]]; then - echo "OpenMPI configured without CUDA support!" + # CUDA support + if [[ "$target_platform" != linux-ppc64le ]]; then + if [[ -z "$(ompi_info | grep cuda)" ]]; then + echo "OpenMPI configured without CUDA support!" + exit 1 + fi fi command -v ompi_info From 19148dde027be4c10f9346f2d42cdab17537f80c Mon Sep 17 00:00:00 2001 From: j34ni Date: Tue, 24 Sep 2024 08:01:16 +0000 Subject: [PATCH 165/224] Replaced simple quote by double quote in configure --- recipe/build-mpi.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 0b5dfc22..d089143a 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -88,13 +88,13 @@ fi --disable-dependency-tracking \ --disable-wrapper-runpath \ --enable-mpi-fortran \ - --with-mpi-moduledir='${includedir}' \ + --with-mpi-moduledir="${includedir}" \ --with-wrapper-ldflags="${wrapper_ldflags}" \ --with-sge \ --with-hwloc=$PREFIX \ --with-libevent=$PREFIX \ --with-zlib=$PREFIX \ - --enable-mca-dso \ + --enable-mca-dso \ --enable-ipv6 \ $build_with_pmix \ $build_with_ucx \ @@ -107,7 +107,7 @@ echo "./configure --prefix=$PREFIX \ --disable-wrapper-runpath \ --enable-mpi-fortran \ --with-mpi-moduledir='${includedir}' \ - --with-wrapper-ldflags="${wrapper_ldflags}" \ + --with-wrapper-ldflags='${wrapper_ldflags}' \ --with-sge \ --with-hwloc=$PREFIX \ --with-libevent=$PREFIX \ From d10a926b9fe6e9c5d12bc3e12b6fa6806bad328d Mon Sep 17 00:00:00 2001 From: j34ni Date: Tue, 24 Sep 2024 08:37:09 +0000 Subject: [PATCH 166/224] Dependencies [linux and not linux-ppc64] --- recipe/meta.yaml | 23 ++++++++++------------- recipe/run_test.sh | 11 +++++------ 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 605fb291..5a90af9a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -55,23 +55,20 @@ outputs: - perl # [osx] - autoconf # [osx] - automake # [osx] - - binutils # [linux] - - libmagic # [linux] - libtool # [unix] - - pkg-config + - make # [unix] host: #- openpmix #- prrte - - binutils # [linux] - libevent - libhwloc - libnl # [linux] - - libnuma # [linux] - - libudev1 # [linux] - - numactl # [linux] - - rdma-core # [linux] + - libnuma # [linux and not ppc64le] + - libudev1 # [linux and not ppc64le] + - numactl # [linux and not ppc64le] + - rdma-core # [linux and not ppc64le] - ucc # [linux and not ppc64le] - - ucx # [linux] + - ucx # [linux and not ppc64le] - zlib - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] run: @@ -79,7 +76,7 @@ outputs: #- openpmix #- prrte - ucc # [linux and not ppc64le] - - ucx # [linux] + - ucx # [linux and not ppc64le] run_constrained: - {{ pin_compatible("ucx", max_pin="x.x") }} # [linux] - {{ pin_compatible("ucc", max_pin="x.x") }} # [linux and not ppc64le] @@ -117,7 +114,7 @@ outputs: requires: - mpi 1.0 openmpi - ucc # [linux and not ppc64le] - - ucx # [linux] + - ucx # [linux and not ppc64le] script: run_test.sh files: - tests/helloworld.c @@ -141,7 +138,7 @@ outputs: requires: - mpi 1.0 openmpi - ucc # [linux and not ppc64le] - - ucx # [linux] + - ucx # [linux and not ppc64le] script: run_test.sh files: - tests/helloworld.cxx @@ -163,7 +160,7 @@ outputs: requires: - mpi 1.0 openmpi - ucc # [linux and not ppc64le] - - ucx # [linux] + - ucx # [linux and not ppc64le] script: run_test.sh files: - tests/helloworld.f diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 89aec3ef..950d86e2 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -25,13 +25,12 @@ if [[ $PKG_NAME == "openmpi" ]]; then echo "OpenMPI configured without CUDA support!" exit 1 fi - fi - - command -v ompi_info - ompi_info + command -v ompi_info + ompi_info - command -v prte_info - prte_info + command -v prte_info + prte_info + fi command -v mpiexec $MPIEXEC --help From 0cd8996aff8b44661e7df94ccbced91afb6ea484 Mon Sep 17 00:00:00 2001 From: j34ni Date: Tue, 24 Sep 2024 08:38:41 +0000 Subject: [PATCH 167/224] Dependencies [linux and not linux-ppc64] --- recipe/meta.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5a90af9a..e7fb0497 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -63,23 +63,23 @@ outputs: - libevent - libhwloc - libnl # [linux] - - libnuma # [linux and not ppc64le] - - libudev1 # [linux and not ppc64le] - - numactl # [linux and not ppc64le] - - rdma-core # [linux and not ppc64le] - - ucc # [linux and not ppc64le] - - ucx # [linux and not ppc64le] + - libnuma # [linux and not linux-ppc64le] + - libudev1 # [linux and not linux-ppc64le] + - numactl # [linux and not linux-ppc64le] + - rdma-core # [linux and not linux-ppc64le] + - ucc # [linux and not linux-ppc64le] + - ucx # [linux and not linux-ppc64le] - zlib - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] run: - mpi 1.0 openmpi #- openpmix #- prrte - - ucc # [linux and not ppc64le] - - ucx # [linux and not ppc64le] + - ucc # [linux and not linux-ppc64le] + - ucx # [linux and not linux-ppc64le] run_constrained: - {{ pin_compatible("ucx", max_pin="x.x") }} # [linux] - - {{ pin_compatible("ucc", max_pin="x.x") }} # [linux and not ppc64le] + - {{ pin_compatible("ucc", max_pin="x.x") }} # [linux and not linux-ppc64le] # Open MPI only uses CUDA Driver APIs, set the minimal driver version - __cuda >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] # Ensure a consistent CUDA environment @@ -113,8 +113,8 @@ outputs: # Ensure the correct dependencies are available for testing requires: - mpi 1.0 openmpi - - ucc # [linux and not ppc64le] - - ucx # [linux and not ppc64le] + - ucc # [linux and not linux-ppc64le] + - ucx # [linux and not linux-ppc64le] script: run_test.sh files: - tests/helloworld.c @@ -137,8 +137,8 @@ outputs: # Ensure the correct dependencies are available for testing requires: - mpi 1.0 openmpi - - ucc # [linux and not ppc64le] - - ucx # [linux and not ppc64le] + - ucc # [linux and not linux-ppc64le] + - ucx # [linux and not linux-ppc64le] script: run_test.sh files: - tests/helloworld.cxx @@ -159,8 +159,8 @@ outputs: test: requires: - mpi 1.0 openmpi - - ucc # [linux and not ppc64le] - - ucx # [linux and not ppc64le] + - ucc # [linux and not linux-ppc64le] + - ucx # [linux and not linux-ppc64le] script: run_test.sh files: - tests/helloworld.f From fcc69e0792f7ecdf486fc0408b4e60c8acdc3f94 Mon Sep 17 00:00:00 2001 From: j34ni Date: Tue, 24 Sep 2024 08:44:45 +0000 Subject: [PATCH 168/224] Fixed tab --- recipe/run_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 950d86e2..baf8f5d7 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -15,7 +15,7 @@ if [[ $PKG_NAME == "openmpi" ]]; then if [[ "$target_platform" == linux-64 ]]; then if [[ -z "$(ompi_info | grep ucx)" ]]; then echo "OpenMPI configured without UCX support!" - exit 1 + exit 1 fi fi @@ -23,7 +23,7 @@ if [[ $PKG_NAME == "openmpi" ]]; then if [[ "$target_platform" != linux-ppc64le ]]; then if [[ -z "$(ompi_info | grep cuda)" ]]; then echo "OpenMPI configured without CUDA support!" - exit 1 + exit 1 fi command -v ompi_info ompi_info From 35a3de39174b98f6334ad92965b7a84818ef3c57 Mon Sep 17 00:00:00 2001 From: j34ni Date: Tue, 24 Sep 2024 09:01:11 +0000 Subject: [PATCH 169/224] Restored [linux and not ppc64] --- recipe/meta.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e7fb0497..f0887cbd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -41,7 +41,7 @@ outputs: {% endif %} ignore_run_exports: - ucx # [linux] - - ucc # [linux] + - ucc # [linux and not ppc64le] ignore_run_exports_from: - {{ compiler('cuda') }} # [cuda_compiler != "None"] requirements: @@ -63,23 +63,23 @@ outputs: - libevent - libhwloc - libnl # [linux] - - libnuma # [linux and not linux-ppc64le] - - libudev1 # [linux and not linux-ppc64le] - - numactl # [linux and not linux-ppc64le] - - rdma-core # [linux and not linux-ppc64le] - - ucc # [linux and not linux-ppc64le] - - ucx # [linux and not linux-ppc64le] + - libnuma # [linux and not ppc64le] + - libudev1 # [linux and not ppc64le] + - numactl # [linux and not ppc64le] + - rdma-core # [linux and not ppc64le] - zlib + - ucc # [linux and not ppc64le] + - ucx # [linux and not ppc64le] - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] run: - mpi 1.0 openmpi #- openpmix #- prrte - - ucc # [linux and not linux-ppc64le] - - ucx # [linux and not linux-ppc64le] + - ucc # [linux and not ppc64le] + - ucx # [linux and not ppc64le] run_constrained: - {{ pin_compatible("ucx", max_pin="x.x") }} # [linux] - - {{ pin_compatible("ucc", max_pin="x.x") }} # [linux and not linux-ppc64le] + - {{ pin_compatible("ucc", max_pin="x.x") }} # [linux and not ppc64le] # Open MPI only uses CUDA Driver APIs, set the minimal driver version - __cuda >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] # Ensure a consistent CUDA environment @@ -113,8 +113,8 @@ outputs: # Ensure the correct dependencies are available for testing requires: - mpi 1.0 openmpi - - ucc # [linux and not linux-ppc64le] - - ucx # [linux and not linux-ppc64le] + - ucc # [linux and not ppc64le] + - ucx # [linux and not ppc64le] script: run_test.sh files: - tests/helloworld.c @@ -137,8 +137,8 @@ outputs: # Ensure the correct dependencies are available for testing requires: - mpi 1.0 openmpi - - ucc # [linux and not linux-ppc64le] - - ucx # [linux and not linux-ppc64le] + - ucc # [linux and not ppc64le] + - ucx # [linux and not ppc64le] script: run_test.sh files: - tests/helloworld.cxx @@ -159,8 +159,8 @@ outputs: test: requires: - mpi 1.0 openmpi - - ucc # [linux and not linux-ppc64le] - - ucx # [linux and not linux-ppc64le] + - ucc # [linux and not ppc64le] + - ucx # [linux and not ppc64le] script: run_test.sh files: - tests/helloworld.f From 8210e3d9e7292bd8b8bf68ce6932d4881025ee01 Mon Sep 17 00:00:00 2001 From: j34ni Date: Tue, 24 Sep 2024 09:54:54 +0000 Subject: [PATCH 170/224] Restored simple quote in configure --- recipe/build-mpi.sh | 2 +- recipe/meta.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index d089143a..c0088307 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -88,7 +88,7 @@ fi --disable-dependency-tracking \ --disable-wrapper-runpath \ --enable-mpi-fortran \ - --with-mpi-moduledir="${includedir}" \ + --with-mpi-moduledir='${includedir}' \ --with-wrapper-ldflags="${wrapper_ldflags}" \ --with-sge \ --with-hwloc=$PREFIX \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f0887cbd..44610934 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -41,7 +41,7 @@ outputs: {% endif %} ignore_run_exports: - ucx # [linux] - - ucc # [linux and not ppc64le] + - ucc # [linux] ignore_run_exports_from: - {{ compiler('cuda') }} # [cuda_compiler != "None"] requirements: @@ -78,7 +78,7 @@ outputs: - ucc # [linux and not ppc64le] - ucx # [linux and not ppc64le] run_constrained: - - {{ pin_compatible("ucx", max_pin="x.x") }} # [linux] + - {{ pin_compatible("ucx", max_pin="x.x") }} # [linux and not ppc64le] - {{ pin_compatible("ucc", max_pin="x.x") }} # [linux and not ppc64le] # Open MPI only uses CUDA Driver APIs, set the minimal driver version - __cuda >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] From b4f4ef69160b33c4d28a92f1a5c05779df2cd437 Mon Sep 17 00:00:00 2001 From: j34ni Date: Tue, 24 Sep 2024 11:45:56 +0000 Subject: [PATCH 171/224] Removed debugging stuff --- recipe/build-mpi.sh | 18 ------------------ recipe/run_test.sh | 11 ++++++----- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index c0088307..75a7fd4d 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -102,24 +102,6 @@ fi $build_with_cuda \ || (cat config.log; false) -echo "./configure --prefix=$PREFIX \ - --disable-dependency-tracking \ - --disable-wrapper-runpath \ - --enable-mpi-fortran \ - --with-mpi-moduledir='${includedir}' \ - --with-wrapper-ldflags='${wrapper_ldflags}' \ - --with-sge \ - --with-hwloc=$PREFIX \ - --with-libevent=$PREFIX \ - --with-zlib=$PREFIX \ - --enable-mca-dso \ - --enable-ipv6 \ - $build_with_pmix \ - $build_with_ucx \ - $build_with_ucc \ - $build_with_cuda \ - || (cat config.log; false)" - make -j"${CPU_COUNT:-1}" make install diff --git a/recipe/run_test.sh b/recipe/run_test.sh index baf8f5d7..5dd012be 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -25,13 +25,14 @@ if [[ $PKG_NAME == "openmpi" ]]; then echo "OpenMPI configured without CUDA support!" exit 1 fi - command -v ompi_info - ompi_info - - command -v prte_info - prte_info fi + command -v ompi_info + ompi_info + + command -v prte_info + prte_info + command -v mpiexec $MPIEXEC --help $MPIEXEC -n 4 ./helloworld.sh From 9969ff60da95ba1c93a7b302f2f335f06f84c01c Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Wed, 25 Sep 2024 16:11:16 +0200 Subject: [PATCH 172/224] Update recipe/build-mpi.sh Co-authored-by: Leo Fang --- recipe/build-mpi.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 75a7fd4d..73d59b7d 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -106,8 +106,7 @@ make -j"${CPU_COUNT:-1}" make install POST_LINK=$PREFIX/bin/.openmpi-post-link.sh -if [ -z "$build_with_ucx" ]; then - echo "No UCX/UCC support" +if [ -n "$build_with_ucx" ]; then echo "setting MCA pml to ^ucx..." echo "pml = ^ucx" >> $PREFIX/etc/openmpi-mca-params.conf echo "setting MCA osc to ^ucx..." From cc5ae5127140b7ed4884d9d7ee64781d9c82b4b7 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Wed, 25 Sep 2024 16:13:45 +0200 Subject: [PATCH 173/224] Update recipe/build-mpi.sh Co-authored-by: Leo Fang --- recipe/build-mpi.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 73d59b7d..7d9feffa 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -113,8 +113,7 @@ if [ -n "$build_with_ucx" ]; then echo "osc = ^ucx" >> $PREFIX/etc/openmpi-mca-params.conf cat $RECIPE_DIR/post-link-ucx.sh >> $POST_LINK fi -if [ -z "$build_with_cuda" ]; then - echo "No CUDA support" +if [ -n "$build_with_cuda" ]; then echo "setting MCA mca_base_component_show_load_errors to 0..." echo "mca_base_component_show_load_errors = 0" >> $PREFIX/etc/openmpi-mca-params.conf echo "setting MCA opal_warn_on_missing_libcuda to 0..." From ebc95d780199621e79a657a928c70695188dd150 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Wed, 25 Sep 2024 16:13:57 +0200 Subject: [PATCH 174/224] Update recipe/meta.yaml Co-authored-by: Leo Fang --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 44610934..19e64b8a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -75,8 +75,6 @@ outputs: - mpi 1.0 openmpi #- openpmix #- prrte - - ucc # [linux and not ppc64le] - - ucx # [linux and not ppc64le] run_constrained: - {{ pin_compatible("ucx", max_pin="x.x") }} # [linux and not ppc64le] - {{ pin_compatible("ucc", max_pin="x.x") }} # [linux and not ppc64le] From 959ba0017aec3e6a09f8ecd5ffd7ca367ac77081 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Wed, 25 Sep 2024 16:14:06 +0200 Subject: [PATCH 175/224] Update recipe/meta.yaml Co-authored-by: Leo Fang --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 19e64b8a..3e82670c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -110,7 +110,6 @@ outputs: test: # Ensure the correct dependencies are available for testing requires: - - mpi 1.0 openmpi - ucc # [linux and not ppc64le] - ucx # [linux and not ppc64le] script: run_test.sh From 12de7d6fd25fab338fa9ebd44343b172c6d15526 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 02:37:24 +0000 Subject: [PATCH 176/224] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 9b2d8fac..14f891ae 100644 --- a/README.md +++ b/README.md @@ -232,3 +232,6 @@ Feedstock Maintainers * [@msarahan](https://github.com/msarahan/) * [@ocefpaf](https://github.com/ocefpaf/) + + + From 5f86ed308b71015b422d75b3663d73a2c1d86542 Mon Sep 17 00:00:00 2001 From: j34ni Date: Thu, 26 Sep 2024 08:23:47 +0000 Subject: [PATCH 177/224] Removed POST_LINK test for UCX and simplified deps --- recipe/build-mpi.sh | 7 ------- recipe/meta.yaml | 17 ----------------- 2 files changed, 24 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 7d9feffa..21183401 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -106,13 +106,6 @@ make -j"${CPU_COUNT:-1}" make install POST_LINK=$PREFIX/bin/.openmpi-post-link.sh -if [ -n "$build_with_ucx" ]; then - echo "setting MCA pml to ^ucx..." - echo "pml = ^ucx" >> $PREFIX/etc/openmpi-mca-params.conf - echo "setting MCA osc to ^ucx..." - echo "osc = ^ucx" >> $PREFIX/etc/openmpi-mca-params.conf - cat $RECIPE_DIR/post-link-ucx.sh >> $POST_LINK -fi if [ -n "$build_with_cuda" ]; then echo "setting MCA mca_base_component_show_load_errors to 0..." echo "mca_base_component_show_load_errors = 0" >> $PREFIX/etc/openmpi-mca-params.conf diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3e82670c..d5787c01 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -63,10 +63,6 @@ outputs: - libevent - libhwloc - libnl # [linux] - - libnuma # [linux and not ppc64le] - - libudev1 # [linux and not ppc64le] - - numactl # [linux and not ppc64le] - - rdma-core # [linux and not ppc64le] - zlib - ucc # [linux and not ppc64le] - ucx # [linux and not ppc64le] @@ -108,10 +104,6 @@ outputs: # host C compilers work fine (better) on mac - {{ compiler('c') }} test: - # Ensure the correct dependencies are available for testing - requires: - - ucc # [linux and not ppc64le] - - ucx # [linux and not ppc64le] script: run_test.sh files: - tests/helloworld.c @@ -131,11 +123,6 @@ outputs: # host C compilers work fine (better) on mac - {{ compiler('cxx') }} test: - # Ensure the correct dependencies are available for testing - requires: - - mpi 1.0 openmpi - - ucc # [linux and not ppc64le] - - ucx # [linux and not ppc64le] script: run_test.sh files: - tests/helloworld.cxx @@ -154,10 +141,6 @@ outputs: - {{ pin_subpackage('openmpi', exact=True) }} - {{ compiler('fortran') }} test: - requires: - - mpi 1.0 openmpi - - ucc # [linux and not ppc64le] - - ucx # [linux and not ppc64le] script: run_test.sh files: - tests/helloworld.f From 672ed2d8dd6c2d228e0ec8ea12b21a8df506ee38 Mon Sep 17 00:00:00 2001 From: j34ni Date: Thu, 26 Sep 2024 12:41:39 +0000 Subject: [PATCH 178/224] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.26.07.35.45 --- .ci_support/migrations/cuda120.yaml | 90 ----------------------------- .ci_support/osx_64_.yaml | 6 +- .ci_support/osx_arm64_.yaml | 6 +- .github/CODEOWNERS | 2 +- .scripts/build_steps.sh | 2 + .scripts/run_osx_build.sh | 2 +- README.md | 39 +++++++------ build-locally.py | 9 ++- 8 files changed, 36 insertions(+), 120 deletions(-) delete mode 100644 .ci_support/migrations/cuda120.yaml diff --git a/.ci_support/migrations/cuda120.yaml b/.ci_support/migrations/cuda120.yaml deleted file mode 100644 index abfb9cb8..00000000 --- a/.ci_support/migrations/cuda120.yaml +++ /dev/null @@ -1,90 +0,0 @@ -migrator_ts: 1682985063 -__migrator: - kind: - version - migration_number: - 3 - build_number: - 1 - paused: false - override_cbc_keys: - - cuda_compiler_stub - operation: key_add - check_solvable: false - primary_key: cuda_compiler_version - ordering: - cxx_compiler_version: - - 9 - - 8 - - 7 - c_compiler_version: - - 9 - - 8 - - 7 - fortran_compiler_version: - - 9 - - 8 - - 7 - docker_image: - - quay.io/condaforge/linux-anvil-comp7 # [os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-aarch64 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - - quay.io/condaforge/linux-anvil-ppc64le # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-armv7l # [os.environ.get("BUILD_PLATFORM") == "linux-armv7l"] - - quay.io/condaforge/linux-anvil-cuda:9.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:10.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:10.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:10.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # case: native compilation (build == target) - - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - # case: cross-compilation (build != target) - - quay.io/condaforge/linux-anvil-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # case: non-CUDA builds - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - cuda_compiler_version: - - None - - 10.2 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.0 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.1 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.2 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - commit_message: | - Rebuild for CUDA 12 w/arch + Windows support - - The transition to CUDA 12 SDK includes new packages for all CUDA libraries and - build tools. Notably, the cudatoolkit package no longer exists, and packages - should depend directly on the specific CUDA libraries (libcublas, libcusolver, - etc) as needed. For an in-depth overview of the changes and to report problems - [see this issue]( https://github.com/conda-forge/conda-forge.github.io/issues/1963 ). - Please feel free to raise any issues encountered there. Thank you! :pray: - -cuda_compiler: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - cuda-nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cuda_compiler_version: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -c_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cxx_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -fortran_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cdt_name: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-") and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - # case: native compilation (build == target) - - quay.io/condaforge/linux-anvil-ppc64le # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-aarch64 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - # case: cross-compilation (build != target) - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 3187478c..958c656c 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,11 +21,11 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' libevent: - 2.1.12 libhwloc: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 5a3a7e70..80df6431 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,11 +21,11 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' libevent: - 2.1.12 libhwloc: diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7271694c..27386d3a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @astrofrog @beckermr @bekozi @dalcinl @leofang @minrk @msarahan @ocefpaf \ No newline at end of file +* @astrofrog @beckermr @bekozi @dalcinl @j34ni @leofang @minrk @msarahan @ocefpaf \ No newline at end of file diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ba4b251c..856f469d 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,8 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index ba0c8791..420f051c 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} diff --git a/README.md b/README.md index 9b2d8fac..b5e125fb 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ About openmpi-mpi-feedstock =========================== -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/openmpi-feedstock/blob/main/LICENSE.txt) +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/openmpi-feedstock-renderer-feedstock/blob/main/LICENSE.txt) Home: https://www.open-mpi.org/ @@ -29,8 +29,8 @@ Current build status
VariantStatus
linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typecondalinux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda - variant + variant
linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternallinux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal - variant + variant
- - + + @@ -38,57 +38,57 @@ Current build status @@ -227,6 +227,7 @@ Feedstock Maintainers * [@beckermr](https://github.com/beckermr/) * [@bekozi](https://github.com/bekozi/) * [@dalcinl](https://github.com/dalcinl/) +* [@j34ni](https://github.com/j34ni/) * [@leofang](https://github.com/leofang/) * [@minrk](https://github.com/minrk/) * [@msarahan](https://github.com/msarahan/) diff --git a/build-locally.py b/build-locally.py index e0d408d0..6788aea6 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,13 +1,16 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): From cc7111dc8f45a04759fa8199d8e76628bf971016 Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:52:28 +0200 Subject: [PATCH 179/224] Update build-mpi.sh Restored POST_LINK for UCX --- recipe/build-mpi.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 21183401..7d9feffa 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -106,6 +106,13 @@ make -j"${CPU_COUNT:-1}" make install POST_LINK=$PREFIX/bin/.openmpi-post-link.sh +if [ -n "$build_with_ucx" ]; then + echo "setting MCA pml to ^ucx..." + echo "pml = ^ucx" >> $PREFIX/etc/openmpi-mca-params.conf + echo "setting MCA osc to ^ucx..." + echo "osc = ^ucx" >> $PREFIX/etc/openmpi-mca-params.conf + cat $RECIPE_DIR/post-link-ucx.sh >> $POST_LINK +fi if [ -n "$build_with_cuda" ]; then echo "setting MCA mca_base_component_show_load_errors to 0..." echo "mca_base_component_show_load_errors = 0" >> $PREFIX/etc/openmpi-mca-params.conf From 5764139387e36279855b3bda4be64ace2075ef8f Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Thu, 26 Sep 2024 20:42:53 +0200 Subject: [PATCH 180/224] Create post-link-ucc.sh --- recipe/post-link-ucc.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 recipe/post-link-ucc.sh diff --git a/recipe/post-link-ucc.sh b/recipe/post-link-ucc.sh new file mode 100644 index 00000000..dafcd81b --- /dev/null +++ b/recipe/post-link-ucc.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +cat << EOF >> $PREFIX/.messages.txt + +On Linux, Open MPI is built with UCC support but it is disabled by default. +To enable it, first install UCC (conda install -c conda-forge ucc). +Afterwards, set the environment variables +OMPI_MCA_coll_ucc_enable=1 +before launching your MPI processes. +Equivalently, you can set the MCA parameters in the command line: +mpiexec --mca coll_ucc_enable 1 ... + +EOF From 92254dc8f55aa253b7c4199644df6e176db1ac3e Mon Sep 17 00:00:00 2001 From: Jean Iaquinta <44261743+j34ni@users.noreply.github.com> Date: Thu, 26 Sep 2024 20:43:59 +0200 Subject: [PATCH 181/224] Update build-mpi.sh Updates POST_LINK to explain that UCC is disabled by default --- recipe/build-mpi.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 7d9feffa..015be6ee 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -113,6 +113,11 @@ if [ -n "$build_with_ucx" ]; then echo "osc = ^ucx" >> $PREFIX/etc/openmpi-mca-params.conf cat $RECIPE_DIR/post-link-ucx.sh >> $POST_LINK fi +if [ -n "$build_with_ucc" ]; then + echo "setting MCA coll_ucc_enable to 0..." + echo "coll_ucc_enable = 0" >> $PREFIX/etc/openmpi-mca-params.conf + cat $RECIPE_DIR/post-link-ucc.sh >> $POST_LINK +fi if [ -n "$build_with_cuda" ]; then echo "setting MCA mca_base_component_show_load_errors to 0..." echo "mca_base_component_show_load_errors = 0" >> $PREFIX/etc/openmpi-mca-params.conf From 53433874183380659a3d9ae3598991079cbcfc8f Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 26 Sep 2024 12:32:37 -0700 Subject: [PATCH 182/224] Guard `CONDA_BUILD_SYSROOT` usage Starting with conda-build 24.7.0, undefined Jinja variables are handled more strictly. So add guards around `CONDA_BUILD_SYSROOT` usage here. Also ensure the tests error if `CONDA_BUILD_SYSROOT` is still undefined at build time. --- recipe/meta.yaml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8d81d4dc..73573cea 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -92,7 +92,12 @@ outputs: - echo 'ok' # [not osx] # make CONDA_BUILD_SYSROOT a 'used variable' # so that conda-build knows to pass it to the test env - - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] + {% if CONDA_BUILD_SYSROOT is defined %} # [osx] + - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] + {% else %} # [osx] + - echo "CONDA_BUILD_SYSROOT is undefined" # [osx] + - exit 1 # [osx] + {% endif %} # [osx] requirements: build: - {{ stdlib('c') }} @@ -111,7 +116,12 @@ outputs: - echo 'ok' # [not osx] # make CONDA_BUILD_SYSROOT a 'used variable' # so that conda-build knows to pass it to the test env - - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] + {% if CONDA_BUILD_SYSROOT is defined %} # [osx] + - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] + {% else %} # [osx] + - echo "CONDA_BUILD_SYSROOT is undefined" # [osx] + - exit 1 # [osx] + {% endif %} # [osx] requirements: build: - {{ stdlib('c') }} @@ -130,7 +140,12 @@ outputs: - echo 'ok' # [not osx] # make CONDA_BUILD_SYSROOT a 'used variable' # so that conda-build knows to pass it to the test env - - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] + {% if CONDA_BUILD_SYSROOT is defined %} # [osx] + - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] + {% else %} # [osx] + - echo "CONDA_BUILD_SYSROOT is undefined" # [osx] + - exit 1 # [osx] + {% endif %} # [osx] requirements: build: - {{ stdlib('c') }} From e8c9c03bd525bc0a82e6703b730b0efd7bf33d2f Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 19:36:25 +0000 Subject: [PATCH 183/224] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.26.07.35.45 --- .ci_support/migrations/cuda120.yaml | 90 ----------------------------- .ci_support/osx_64_.yaml | 6 +- .ci_support/osx_arm64_.yaml | 6 +- .scripts/build_steps.sh | 2 + .scripts/run_osx_build.sh | 2 +- README.md | 3 - build-locally.py | 9 ++- 7 files changed, 15 insertions(+), 103 deletions(-) delete mode 100644 .ci_support/migrations/cuda120.yaml diff --git a/.ci_support/migrations/cuda120.yaml b/.ci_support/migrations/cuda120.yaml deleted file mode 100644 index abfb9cb8..00000000 --- a/.ci_support/migrations/cuda120.yaml +++ /dev/null @@ -1,90 +0,0 @@ -migrator_ts: 1682985063 -__migrator: - kind: - version - migration_number: - 3 - build_number: - 1 - paused: false - override_cbc_keys: - - cuda_compiler_stub - operation: key_add - check_solvable: false - primary_key: cuda_compiler_version - ordering: - cxx_compiler_version: - - 9 - - 8 - - 7 - c_compiler_version: - - 9 - - 8 - - 7 - fortran_compiler_version: - - 9 - - 8 - - 7 - docker_image: - - quay.io/condaforge/linux-anvil-comp7 # [os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-aarch64 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - - quay.io/condaforge/linux-anvil-ppc64le # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-armv7l # [os.environ.get("BUILD_PLATFORM") == "linux-armv7l"] - - quay.io/condaforge/linux-anvil-cuda:9.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:10.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:10.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:10.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # case: native compilation (build == target) - - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - # case: cross-compilation (build != target) - - quay.io/condaforge/linux-anvil-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # case: non-CUDA builds - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - cuda_compiler_version: - - None - - 10.2 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.0 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.1 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.2 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - commit_message: | - Rebuild for CUDA 12 w/arch + Windows support - - The transition to CUDA 12 SDK includes new packages for all CUDA libraries and - build tools. Notably, the cudatoolkit package no longer exists, and packages - should depend directly on the specific CUDA libraries (libcublas, libcusolver, - etc) as needed. For an in-depth overview of the changes and to report problems - [see this issue]( https://github.com/conda-forge/conda-forge.github.io/issues/1963 ). - Please feel free to raise any issues encountered there. Thank you! :pray: - -cuda_compiler: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - cuda-nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cuda_compiler_version: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -c_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cxx_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -fortran_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cdt_name: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-") and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - # case: native compilation (build == target) - - quay.io/condaforge/linux-anvil-ppc64le # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-aarch64 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - # case: cross-compilation (build != target) - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 3187478c..958c656c 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,11 +21,11 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' libevent: - 2.1.12 libhwloc: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 5a3a7e70..80df6431 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,11 +21,11 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' libevent: - 2.1.12 libhwloc: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ba4b251c..856f469d 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,8 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index ba0c8791..420f051c 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} diff --git a/README.md b/README.md index 14f891ae..9b2d8fac 100644 --- a/README.md +++ b/README.md @@ -232,6 +232,3 @@ Feedstock Maintainers * [@msarahan](https://github.com/msarahan/) * [@ocefpaf](https://github.com/ocefpaf/) - - - diff --git a/build-locally.py b/build-locally.py index e0d408d0..6788aea6 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,13 +1,16 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): From aaa2fbd1102219b933c5a25da40c57317a8dd6bc Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 26 Sep 2024 13:56:24 -0700 Subject: [PATCH 184/224] Drop `CONDA_BUILD_SYSROOT` workaround --- recipe/meta.yaml | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 73573cea..b636bedb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -89,15 +89,7 @@ outputs: - name: openmpi-mpicc build: script: - - echo 'ok' # [not osx] - # make CONDA_BUILD_SYSROOT a 'used variable' - # so that conda-build knows to pass it to the test env - {% if CONDA_BUILD_SYSROOT is defined %} # [osx] - - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] - {% else %} # [osx] - - echo "CONDA_BUILD_SYSROOT is undefined" # [osx] - - exit 1 # [osx] - {% endif %} # [osx] + - echo 'ok' requirements: build: - {{ stdlib('c') }} @@ -113,15 +105,7 @@ outputs: - name: openmpi-mpicxx build: script: - - echo 'ok' # [not osx] - # make CONDA_BUILD_SYSROOT a 'used variable' - # so that conda-build knows to pass it to the test env - {% if CONDA_BUILD_SYSROOT is defined %} # [osx] - - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] - {% else %} # [osx] - - echo "CONDA_BUILD_SYSROOT is undefined" # [osx] - - exit 1 # [osx] - {% endif %} # [osx] + - echo 'ok' requirements: build: - {{ stdlib('c') }} @@ -137,15 +121,7 @@ outputs: - name: openmpi-mpifort build: script: - - echo 'ok' # [not osx] - # make CONDA_BUILD_SYSROOT a 'used variable' - # so that conda-build knows to pass it to the test env - {% if CONDA_BUILD_SYSROOT is defined %} # [osx] - - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] - {% else %} # [osx] - - echo "CONDA_BUILD_SYSROOT is undefined" # [osx] - - exit 1 # [osx] - {% endif %} # [osx] + - echo 'ok' requirements: build: - {{ stdlib('c') }} From 27df17a6be90ccbdc96a7816a81504154fcffd08 Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Thu, 26 Sep 2024 17:14:19 -0400 Subject: [PATCH 185/224] avoid extra space --- recipe/build-mpi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 015be6ee..238d1110 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -102,7 +102,7 @@ fi $build_with_cuda \ || (cat config.log; false) -make -j"${CPU_COUNT:-1}" +make -j"${CPU_COUNT:-1}" make install POST_LINK=$PREFIX/bin/.openmpi-post-link.sh From 75e645a771f0477cfb4e9c0ef81d5fd0bc3034a4 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 22:49:56 +0000 Subject: [PATCH 186/224] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.26.19.22.15 --- README.md | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index b5e125fb..41027e97 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ About openmpi-mpi-feedstock =========================== -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/openmpi-feedstock-renderer-feedstock/blob/main/LICENSE.txt) +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/openmpi-feedstock/blob/main/LICENSE.txt) Home: https://www.open-mpi.org/ @@ -29,8 +29,8 @@ Current build status
linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda - - variant + + variant
linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal - - variant + + variant
linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda - - variant + + variant
linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal - - variant + + variant
linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda - - variant + + variant
linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal - - variant + + variant
osx_64 - - variant + + variant
osx_arm64 - - variant + + variant
- - + + @@ -38,57 +38,57 @@ Current build status From ee21f060372606335598eb47d5ad2ff76b4a5032 Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Thu, 26 Sep 2024 19:17:21 -0400 Subject: [PATCH 187/224] restore old tests --- recipe/run_test.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 5dd012be..e8424bc3 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -7,20 +7,22 @@ pushd "tests" if [[ $PKG_NAME == "openmpi" ]]; then - # -n : string is not null - # -z : string is null, that is, has zero length + if [[ -n "$(conda list | grep ucx)" ]]; then + echo "Improper UCX dependency!" + exit 1 - # UCX support - echo "Target platform = $target_platform" - if [[ "$target_platform" == linux-64 ]]; then + if [[ "$target_platform" == linux-64 || "$target_platform" == linux-aarch64 ]]; then if [[ -z "$(ompi_info | grep ucx)" ]]; then echo "OpenMPI configured without UCX support!" exit 1 fi fi - # CUDA support - if [[ "$target_platform" != linux-ppc64le ]]; then + if [[ -n "$(conda list | grep cuda-version)" ]]; then + echo "Improper CUDA dependency!" + exit 1 + + if [[ "$target_platform" == linux-64 || "$target_platform" == linux-aarch64 ]]; then if [[ -z "$(ompi_info | grep cuda)" ]]; then echo "OpenMPI configured without CUDA support!" exit 1 @@ -94,4 +96,3 @@ if [[ $PKG_NAME == "openmpi-mpifort" ]]; then fi popd - From 6569809473b0901ef8913b7c4a20349e14128a58 Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Thu, 26 Sep 2024 19:24:28 -0400 Subject: [PATCH 188/224] remove redundant pmix build option --- recipe/build-mpi.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 238d1110..a4ecaac7 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -47,12 +47,6 @@ if [[ "$target_platform" == linux-* && "$target_platform" != linux-ppc64le ]]; t build_with_ucc="--with-ucc=$PREFIX" fi -# PMIx support -build_with_pmix="" -if [[ "$target_platform" == linux-* && "$target_platform" != linux-ppc64le* ]]; then - echo "Build with PMIx support" - build_with_pmix="--with-pmix=internal" -fi # CUDA support build_with_cuda="" @@ -96,7 +90,6 @@ fi --with-zlib=$PREFIX \ --enable-mca-dso \ --enable-ipv6 \ - $build_with_pmix \ $build_with_ucx \ $build_with_ucc \ $build_with_cuda \ From d43fb968f734631875f7f4f22fe3de19fef988ef Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Thu, 26 Sep 2024 20:05:31 -0400 Subject: [PATCH 189/224] fix --- recipe/run_test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/run_test.sh b/recipe/run_test.sh index e8424bc3..1d1adc20 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -10,6 +10,7 @@ if [[ $PKG_NAME == "openmpi" ]]; then if [[ -n "$(conda list | grep ucx)" ]]; then echo "Improper UCX dependency!" exit 1 + fi if [[ "$target_platform" == linux-64 || "$target_platform" == linux-aarch64 ]]; then if [[ -z "$(ompi_info | grep ucx)" ]]; then @@ -21,6 +22,7 @@ if [[ $PKG_NAME == "openmpi" ]]; then if [[ -n "$(conda list | grep cuda-version)" ]]; then echo "Improper CUDA dependency!" exit 1 + fi if [[ "$target_platform" == linux-64 || "$target_platform" == linux-aarch64 ]]; then if [[ -z "$(ompi_info | grep cuda)" ]]; then From 006ffb0a59d35b476eb2276a0605ffe99e39c5dc Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 27 Sep 2024 04:21:20 +0000 Subject: [PATCH 190/224] Rebuild for libhwloc 2.11.2 --- .ci_support/migrations/libhwloc2112.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libhwloc2112.yaml diff --git a/.ci_support/migrations/libhwloc2112.yaml b/.ci_support/migrations/libhwloc2112.yaml new file mode 100644 index 00000000..664a50be --- /dev/null +++ b/.ci_support/migrations/libhwloc2112.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libhwloc 2.11.2 + kind: version + migration_number: 1 +libhwloc: +- 2.11.2 +migrator_ts: 1727390615.47357 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b636bedb..b7632c41 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.5" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 0 %} +{% set build = 1 %} # give conda package a higher build number {% if mpi_type == 'conda' %} From 9ce91d8719d4072182e35a94bc752da1d456681a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 27 Sep 2024 04:22:38 +0000 Subject: [PATCH 191/224] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.27.00.47.16 --- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index ebedeaf5..f322913f 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.11.1 +- 2.11.2 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 11c3d9c7..2546d653 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.11.1 +- 2.11.2 mpi_type: - external target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index faaf389e..f90c2eda 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -33,7 +33,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.11.1 +- 2.11.2 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 6498347b..e078e692 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -33,7 +33,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.11.1 +- 2.11.2 mpi_type: - external target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 14e371a5..707eaca4 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.11.1 +- 2.11.2 mpi_type: - conda target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 66101802..9bc89d27 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.11.1 +- 2.11.2 mpi_type: - external target_platform: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 958c656c..ca56024d 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.11.1 +- 2.11.2 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 80df6431..94dd2aa7 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -29,7 +29,7 @@ fortran_compiler_version: libevent: - 2.1.12 libhwloc: -- 2.11.1 +- 2.11.2 macos_machine: - arm64-apple-darwin20.0.0 mpi_type: From 0ce2826ef5aefd9f4cd35b433acc8b3ccc987c7c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 27 Sep 2024 04:28:33 +0000 Subject: [PATCH 192/224] Rebuild for ucx 1.17 --- .ci_support/migrations/ucx117.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/ucx117.yaml diff --git a/.ci_support/migrations/ucx117.yaml b/.ci_support/migrations/ucx117.yaml new file mode 100644 index 00000000..655562af --- /dev/null +++ b/.ci_support/migrations/ucx117.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for ucx 1.17 + kind: version + migration_number: 1 +migrator_ts: 1724319417.9572914 +ucx: +- '1.17' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b636bedb..b7632c41 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.5" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 0 %} +{% set build = 1 %} # give conda package a higher build number {% if mpi_type == 'conda' %} From a86c6254e323e7f77a7752b149a11e040a5c5e81 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 27 Sep 2024 04:30:13 +0000 Subject: [PATCH 193/224] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.27.00.47.16 --- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 +- ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index ebedeaf5..78644d9c 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -35,7 +35,7 @@ mpi_type: target_platform: - linux-64 ucx: -- 1.16.0 +- '1.17' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 11c3d9c7..89663e38 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -35,7 +35,7 @@ mpi_type: target_platform: - linux-64 ucx: -- 1.16.0 +- '1.17' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index faaf389e..0118240d 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -39,7 +39,7 @@ mpi_type: target_platform: - linux-aarch64 ucx: -- 1.16.0 +- '1.17' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 6498347b..809fbb00 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -39,7 +39,7 @@ mpi_type: target_platform: - linux-aarch64 ucx: -- 1.16.0 +- '1.17' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 14e371a5..c4e1890a 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -35,7 +35,7 @@ mpi_type: target_platform: - linux-ppc64le ucx: -- 1.16.0 +- '1.17' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 66101802..55b9f421 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -35,7 +35,7 @@ mpi_type: target_platform: - linux-ppc64le ucx: -- 1.16.0 +- '1.17' zip_keys: - - c_compiler_version - cxx_compiler_version From 72299b88d78559e59c6c46b34ac3d2bf3e93279e Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 27 Sep 2024 12:13:42 +0200 Subject: [PATCH 194/224] remove unused FCFLAGS --- recipe/build-mpi.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index a4ecaac7..655a7872 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -10,11 +10,6 @@ export FC=$(basename "$FC") # unset unused Fortran compiler variables unset FFLAGS F77 F90 F95 -# add -fallow-argument-mismatch to FCFLAGS -if [[ "$target_platform" != linux-ppc64le ]]; then - export FCFLAGS="-fallow-argument-mismatch ${FCFLAGS}" -fi - # tweak compiler flags export LIBRARY_PATH="$PREFIX/lib" if [[ "$target_platform" == osx-* ]]; then From 13f0e0f9e7df5f8698b4032f096d3e7aa893daf9 Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 27 Sep 2024 17:37:52 +0200 Subject: [PATCH 195/224] bump build --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 67c03a12..a626ad9a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.5" %} {% 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' %} From a5f45af16e7501067c6a2f7b4cf5d686098f00e7 Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 1 Oct 2024 12:18:14 +0200 Subject: [PATCH 196/224] backport patch fixing MPIEXEC_TIMEOUT support --- recipe/meta.yaml | 3 ++- recipe/prrte-mpiexec-timeout.patch | 42 ++++++++++++++++++++++++++++++ recipe/run_test.sh | 7 +++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 recipe/prrte-mpiexec-timeout.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a626ad9a..254848bc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.5" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 2 %} +{% set build = 3 %} # give conda package a higher build number {% if mpi_type == 'conda' %} @@ -19,6 +19,7 @@ source: sha256: 6588d57c0a4bd299a24103f4e196051b29e8b55fbda49e11d5b3d32030a32776 patches: - ldflags-mac.patch # [osx] + - prrte-mpiexec-timeout.patch build: number: {{ build }} diff --git a/recipe/prrte-mpiexec-timeout.patch b/recipe/prrte-mpiexec-timeout.patch new file mode 100644 index 00000000..dec59453 --- /dev/null +++ b/recipe/prrte-mpiexec-timeout.patch @@ -0,0 +1,42 @@ +From 5e3e8bf91d47db5134d73004a12dbe16984a461c Mon Sep 17 00:00:00 2001 +From: Min RK +Date: Tue, 1 Oct 2024 11:49:36 +0200 +Subject: [PATCH] 3.0: fix support for MPIEXEC_TIMEOUT + +linter fix for comparison of int to uint resulted in MPIEXEC_TIMEOUT env being ignored + +--- + src/tools/prte/prte.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/3rd-party/prrte/src/tools/prte/prte.c b/3rd-party/prrte/src/tools/prte/prte.c +index 62ff748566..5c1b7473cc 100644 +--- a/3rd-party/prrte/src/tools/prte/prte.c ++++ b/3rd-party/prrte/src/tools/prte/prte.c +@@ -256,7 +256,7 @@ int main(int argc, char *argv[]) + pmix_info_t *iptr, *iptr2, info; + pmix_status_t ret; + bool flag; +- size_t n, m, ninfo, param_len; ++ size_t n, ninfo, param_len; + pmix_app_t *papps; + size_t napps; + mylock_t mylock; +@@ -1085,11 +1085,11 @@ int main(int argc, char *argv[]) + opt = pmix_cmd_line_get_param(&results, PRTE_CLI_TIMEOUT); + if (NULL != opt || NULL != (timeoutenv = getenv("MPIEXEC_TIMEOUT"))) { + if (NULL != timeoutenv) { +- m = strtoul(timeoutenv, NULL, 10); ++ i = strtol(timeoutenv, NULL, 10); + /* both cannot be present, or they must agree */ + if (NULL != opt) { +- n = strtoul(opt->values[0], NULL, 10); +- if (m != n) { ++ n = strtol(opt->values[0], NULL, 10); ++ if (i != (int)n) { + pmix_show_help("help-prun.txt", "prun:timeoutconflict", false, + prte_tool_basename, n, timeoutenv); + PRTE_UPDATE_EXIT_STATUS(1); +-- +2.45.0 + diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 1d1adc20..0d7412e5 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -42,6 +42,13 @@ if [[ $PKG_NAME == "openmpi" ]]; then $MPIEXEC -n 4 ./helloworld.sh test -f $PREFIX/include/mpi.mod + + export MPIEXEC_TIMEOUT=1 + + if $MPIEXEC -n 2 sleep 5; then + echo "should have timed out" + exit 1 + fi fi if [[ $PKG_NAME == "openmpi-mpicc" ]]; then From 3d726bdddcab4df0fd772e1b7a684bcc2c340094 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Wed, 6 Nov 2024 08:25:12 +0000 Subject: [PATCH 197/224] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration RemoveAutomergeAndRerender --- .github/workflows/automerge.yml | 17 ----------------- .github/workflows/webservices.yml | 13 ------------- 2 files changed, 30 deletions(-) delete mode 100644 .github/workflows/automerge.yml delete mode 100644 .github/workflows/webservices.yml diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml deleted file mode 100644 index 0535f6aa..00000000 --- a/.github/workflows/automerge.yml +++ /dev/null @@ -1,17 +0,0 @@ -on: - status: {} - check_suite: - types: - - completed - -jobs: - automerge-action: - runs-on: ubuntu-latest - name: automerge - steps: - - name: automerge-action - id: automerge-action - uses: conda-forge/automerge-action@main - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml deleted file mode 100644 index d6f06b5c..00000000 --- a/.github/workflows/webservices.yml +++ /dev/null @@ -1,13 +0,0 @@ -on: repository_dispatch - -jobs: - webservices: - runs-on: ubuntu-latest - name: webservices - steps: - - name: webservices - id: webservices - uses: conda-forge/webservices-dispatch-action@main - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} From 66bb1402d3502819f34a98b3a83fa6bdf72f2d6f Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Thu, 24 Oct 2024 15:45:20 +0300 Subject: [PATCH 198/224] Update UCX/UCC support --- recipe/build-mpi.sh | 16 +--------------- recipe/meta.yaml | 7 +------ recipe/post-link-ucc.sh | 13 ------------- recipe/post-link-ucx.sh | 13 ------------- recipe/run_test.sh | 25 ++++++++++++------------- 5 files changed, 14 insertions(+), 60 deletions(-) delete mode 100644 recipe/post-link-ucc.sh delete mode 100644 recipe/post-link-ucx.sh diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 655a7872..b1d95a09 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -1,5 +1,4 @@ #!/bin/bash - set -ex # avoid absolute-paths in compilers @@ -83,29 +82,16 @@ fi --with-hwloc=$PREFIX \ --with-libevent=$PREFIX \ --with-zlib=$PREFIX \ - --enable-mca-dso \ --enable-ipv6 \ $build_with_ucx \ $build_with_ucc \ $build_with_cuda \ - || (cat config.log; false) + || (cat config.log; exit 1) make -j"${CPU_COUNT:-1}" make install POST_LINK=$PREFIX/bin/.openmpi-post-link.sh -if [ -n "$build_with_ucx" ]; then - echo "setting MCA pml to ^ucx..." - echo "pml = ^ucx" >> $PREFIX/etc/openmpi-mca-params.conf - echo "setting MCA osc to ^ucx..." - echo "osc = ^ucx" >> $PREFIX/etc/openmpi-mca-params.conf - cat $RECIPE_DIR/post-link-ucx.sh >> $POST_LINK -fi -if [ -n "$build_with_ucc" ]; then - echo "setting MCA coll_ucc_enable to 0..." - echo "coll_ucc_enable = 0" >> $PREFIX/etc/openmpi-mca-params.conf - cat $RECIPE_DIR/post-link-ucc.sh >> $POST_LINK -fi if [ -n "$build_with_cuda" ]; then echo "setting MCA mca_base_component_show_load_errors to 0..." echo "mca_base_component_show_load_errors = 0" >> $PREFIX/etc/openmpi-mca-params.conf diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 254848bc..1fea6b4d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.5" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 3 %} +{% set build = 4 %} # give conda package a higher build number {% if mpi_type == 'conda' %} @@ -40,9 +40,6 @@ outputs: track_features: - openmpi_{{ mpi_type }} {% endif %} - ignore_run_exports: - - ucx # [linux] - - ucc # [linux] ignore_run_exports_from: - {{ compiler('cuda') }} # [cuda_compiler != "None"] requirements: @@ -73,8 +70,6 @@ outputs: #- openpmix #- prrte run_constrained: - - {{ pin_compatible("ucx", max_pin="x.x") }} # [linux and not ppc64le] - - {{ pin_compatible("ucc", max_pin="x.x") }} # [linux and not ppc64le] # Open MPI only uses CUDA Driver APIs, set the minimal driver version - __cuda >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] # Ensure a consistent CUDA environment diff --git a/recipe/post-link-ucc.sh b/recipe/post-link-ucc.sh deleted file mode 100644 index dafcd81b..00000000 --- a/recipe/post-link-ucc.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -cat << EOF >> $PREFIX/.messages.txt - -On Linux, Open MPI is built with UCC support but it is disabled by default. -To enable it, first install UCC (conda install -c conda-forge ucc). -Afterwards, set the environment variables -OMPI_MCA_coll_ucc_enable=1 -before launching your MPI processes. -Equivalently, you can set the MCA parameters in the command line: -mpiexec --mca coll_ucc_enable 1 ... - -EOF diff --git a/recipe/post-link-ucx.sh b/recipe/post-link-ucx.sh deleted file mode 100644 index 2cf94669..00000000 --- a/recipe/post-link-ucx.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -cat << EOF >> $PREFIX/.messages.txt - -On Linux, Open MPI is built with UCX support but it is disabled by default. -To enable it, first install UCX (conda install -c conda-forge ucx). -Afterwards, set the environment variables -OMPI_MCA_pml=ucx OMPI_MCA_osc=ucx -before launching your MPI processes. -Equivalently, you can set the MCA parameters in the command line: -mpiexec --mca pml ucx --mca osc ucx ... - -EOF diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 0d7412e5..df783212 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -7,16 +7,15 @@ pushd "tests" if [[ $PKG_NAME == "openmpi" ]]; then - if [[ -n "$(conda list | grep ucx)" ]]; then - echo "Improper UCX dependency!" - exit 1 - fi - if [[ "$target_platform" == linux-64 || "$target_platform" == linux-aarch64 ]]; then - if [[ -z "$(ompi_info | grep ucx)" ]]; then - echo "OpenMPI configured without UCX support!" - exit 1 - fi + if [[ -z "$(ompi_info | grep ucc)" ]]; then + echo "OpenMPI configured without UCC support!" + exit 1 + fi + if [[ -z "$(ompi_info | grep ucx)" ]]; then + echo "OpenMPI configured without UCX support!" + exit 1 + fi fi if [[ -n "$(conda list | grep cuda-version)" ]]; then @@ -25,10 +24,10 @@ if [[ $PKG_NAME == "openmpi" ]]; then fi if [[ "$target_platform" == linux-64 || "$target_platform" == linux-aarch64 ]]; then - if [[ -z "$(ompi_info | grep cuda)" ]]; then - echo "OpenMPI configured without CUDA support!" - exit 1 - fi + if [[ -z "$(ompi_info | grep cuda)" ]]; then + echo "OpenMPI configured without CUDA support!" + exit 1 + fi fi command -v ompi_info From 575deada981d5d3069c62503c5d7ef144e71ed88 Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Wed, 13 Nov 2024 12:59:58 +0300 Subject: [PATCH 199/224] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.44.3, and conda-forge-pinning 2024.11.12.14.24.54 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- ...rtran_compiler_version11mpi_typeconda.yaml | 5 ++- ...an_compiler_version11mpi_typeexternal.yaml | 5 ++- ...rtran_compiler_version11mpi_typeconda.yaml | 5 ++- ...an_compiler_version11mpi_typeexternal.yaml | 5 ++- ...rtran_compiler_version11mpi_typeconda.yaml | 5 +-- ...an_compiler_version11mpi_typeexternal.yaml | 5 +-- .ci_support/migrations/ucx117.yaml | 8 ---- .ci_support/osx_64_.yaml | 4 +- .ci_support/osx_arm64_.yaml | 4 +- .github/workflows/automerge.yml | 17 ------- .github/workflows/webservices.yml | 13 ------ .scripts/build_steps.sh | 14 +++--- .scripts/run_osx_build.sh | 45 ++++++++++++------- azure-pipelines.yml | 31 +++++++++++-- 15 files changed, 82 insertions(+), 86 deletions(-) delete mode 100644 .ci_support/migrations/ucx117.yaml delete mode 100644 .github/workflows/automerge.yml delete mode 100644 .github/workflows/webservices.yml diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 7708e23e..ac0bf384 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-12 + vmImage: macOS-13 strategy: matrix: osx_64_: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 5f6d6117..5f78fb80 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -34,6 +34,8 @@ mpi_type: - conda target_platform: - linux-64 +ucc: +- '1' ucx: - '1.17' zip_keys: @@ -41,7 +43,6 @@ zip_keys: - cxx_compiler_version - fortran_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index da46a4dd..ef6972b0 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -34,6 +34,8 @@ mpi_type: - external target_platform: - linux-64 +ucc: +- '1' ucx: - '1.17' zip_keys: @@ -41,7 +43,6 @@ zip_keys: - cxx_compiler_version - fortran_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 07a04515..ad65fc77 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -11,7 +11,7 @@ c_stdlib_version: cdt_arch: - aarch64 cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -38,6 +38,8 @@ mpi_type: - conda target_platform: - linux-aarch64 +ucc: +- '1' ucx: - '1.17' zip_keys: @@ -45,7 +47,6 @@ zip_keys: - cxx_compiler_version - fortran_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index d601a105..76cb06b8 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -11,7 +11,7 @@ c_stdlib_version: cdt_arch: - aarch64 cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -38,6 +38,8 @@ mpi_type: - external target_platform: - linux-aarch64 +ucc: +- '1' ucx: - '1.17' zip_keys: @@ -45,7 +47,6 @@ zip_keys: - cxx_compiler_version - fortran_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index e6aae748..294bcfd0 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -34,14 +34,11 @@ mpi_type: - conda target_platform: - linux-ppc64le -ucx: -- '1.17' zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 6d89fd8d..6c210df7 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -34,14 +34,11 @@ mpi_type: - external target_platform: - linux-ppc64le -ucx: -- '1.17' zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/migrations/ucx117.yaml b/.ci_support/migrations/ucx117.yaml deleted file mode 100644 index 655562af..00000000 --- a/.ci_support/migrations/ucx117.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for ucx 1.17 - kind: version - migration_number: 1 -migrator_ts: 1724319417.9572914 -ucx: -- '1.17' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index ca56024d..83fa8d0e 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 94dd2aa7..4f8a481a 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml deleted file mode 100644 index 0535f6aa..00000000 --- a/.github/workflows/automerge.yml +++ /dev/null @@ -1,17 +0,0 @@ -on: - status: {} - check_suite: - types: - - completed - -jobs: - automerge-action: - runs-on: ubuntu-latest - name: automerge - steps: - - name: automerge-action - id: automerge-action - uses: conda-forge/automerge-action@main - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml deleted file mode 100644 index d6f06b5c..00000000 --- a/.github/workflows/webservices.yml +++ /dev/null @@ -1,13 +0,0 @@ -on: repository_dispatch - -jobs: - webservices: - runs-on: ubuntu-latest - name: webservices - steps: - - name: webservices - id: webservices - uses: conda-forge/webservices-dispatch-action@main - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 856f469d..827a29fb 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,13 +31,13 @@ pkgs_dirs: solver: libmamba CONDARC +mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) +echo > /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -76,8 +76,8 @@ else --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 420f051c..0b364984 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -7,28 +7,39 @@ source .scripts/logging_utils.sh set -xe MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} +MINIFORGE_HOME=${MINIFORGE_HOME%/} # remove trailing slash -( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null - -MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" -curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" -rm -rf ${MINIFORGE_HOME} -bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} - -( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null +( startgroup "Provisioning base env with micromamba" ) 2> /dev/null +MICROMAMBA_VERSION="1.5.10-0" +if [[ "$(uname -m)" == "arm64" ]]; then + osx_arch="osx-arm64" +else + osx_arch="osx-64" +fi +MICROMAMBA_URL="https://github.com/mamba-org/micromamba-releases/releases/download/${MICROMAMBA_VERSION}/micromamba-${osx_arch}" +MAMBA_ROOT_PREFIX="${MINIFORGE_HOME}-micromamba-$(date +%s)" +echo "Downloading micromamba ${MICROMAMBA_VERSION}" +micromamba_exe="$(mktemp -d)/micromamba" +curl -L -o "${micromamba_exe}" "${MICROMAMBA_URL}" +chmod +x "${micromamba_exe}" +echo "Creating environment" +"${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ + --channel conda-forge \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" +mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" +echo "Cleaning up micromamba" +rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true +( endgroup "Provisioning base env with micromamba" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null - -source ${MINIFORGE_HOME}/etc/profile.d/conda.sh +echo "Activating environment" +source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" conda activate base export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + @@ -88,8 +99,8 @@ else ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33a441c1..013bdc11 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,6 +2,31 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file From ae1977bf5bb4e099a082ec0a009c29c11dd48042 Mon Sep 17 00:00:00 2001 From: Min RK Date: Thu, 14 Nov 2024 11:52:16 +0100 Subject: [PATCH 200/224] test for cuda linkage doesn't fix anything yet, so the new test should fail --- recipe/build-mpi.sh | 2 +- recipe/meta.yaml | 6 +++++- recipe/run_test.sh | 4 +++- recipe/tests/test_ldd.py | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 recipe/tests/test_ldd.py diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index b1d95a09..b73e64d6 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -88,7 +88,7 @@ fi $build_with_cuda \ || (cat config.log; exit 1) -make -j"${CPU_COUNT:-1}" +make -j"${CPU_COUNT:-1}" V=1 make install POST_LINK=$PREFIX/bin/.openmpi-post-link.sh diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1fea6b4d..67c429d9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.5" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 4 %} +{% set build = 5 %} # give conda package a higher build number {% if mpi_type == 'conda' %} @@ -77,8 +77,12 @@ outputs: test: {% if mpi_type == 'conda' %} script: run_test.sh + requires: + - python + - psutil files: - tests/helloworld.sh + - tests/test_ldd.py {% else %} commands: - echo "It works!" diff --git a/recipe/run_test.sh b/recipe/run_test.sh index df783212..d06310da 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -23,11 +23,13 @@ if [[ $PKG_NAME == "openmpi" ]]; then exit 1 fi - if [[ "$target_platform" == linux-64 || "$target_platform" == linux-aarch64 ]]; then + if [[ "$target_platform" == linux-* ]]; then if [[ -z "$(ompi_info | grep cuda)" ]]; then echo "OpenMPI configured without CUDA support!" exit 1 fi + + python3 test_ldd.py fi command -v ompi_info diff --git a/recipe/tests/test_ldd.py b/recipe/tests/test_ldd.py new file mode 100644 index 00000000..7d976721 --- /dev/null +++ b/recipe/tests/test_ldd.py @@ -0,0 +1,36 @@ +import ctypes +import sys +from pathlib import Path + +import psutil + +# load every `libmpi*` shared library +for libmpi in (Path(sys.prefix) / "lib").glob("libmpi*.so"): + print(f"Loading {libmpi}") + ctypes.CDLL(libmpi) + +# check all loaded libraries +print("Listing all libraries loaded") +all_loaded = [] +for m in psutil.Process().memory_maps(): + p = m.path + if p.startswith('['): + # not a real library + continue + print(p) + if '.so' not in p: + # don't include things that aren't shared libs + continue + all_loaded.append(p) + +allowed_prefixes = ("/usr/lib", "/usr/lib64", sys.prefix) +print(f"Checking for libraries loaded outside {allowed_prefixes}") +for p in all_loaded: + if not p.startswith(sys.prefix + "/"): + print(p) + # make sure we don't load anything outside the env + # the main thing we are looking for is cuda, which is installed in /usr/local/cuda... + assert p.startswith(allowed_prefixes), p + # make sure we don't load any cuda libs + assert 'cudart' not in p, p + assert 'libcuda' not in p, p From 2ba3a501a0939ed9bb5e67647d3e79131adc4566 Mon Sep 17 00:00:00 2001 From: Min RK Date: Thu, 14 Nov 2024 13:22:13 +0100 Subject: [PATCH 201/224] keep a handle on CDLLs in test probably not needed, but helps us be sure --- recipe/tests/test_ldd.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/tests/test_ldd.py b/recipe/tests/test_ldd.py index 7d976721..dd291e97 100644 --- a/recipe/tests/test_ldd.py +++ b/recipe/tests/test_ldd.py @@ -5,9 +5,10 @@ import psutil # load every `libmpi*` shared library +mpi_libs = [] for libmpi in (Path(sys.prefix) / "lib").glob("libmpi*.so"): print(f"Loading {libmpi}") - ctypes.CDLL(libmpi) + mpi_libs.append(ctypes.CDLL(libmpi)) # check all loaded libraries print("Listing all libraries loaded") From 15dbb3c1c28d90ef9707f0001384b58247929893 Mon Sep 17 00:00:00 2001 From: Min RK Date: Thu, 14 Nov 2024 13:22:34 +0100 Subject: [PATCH 202/224] try to prevent romio from linking cudart --- recipe/build-mpi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index b73e64d6..c0bf5a7f 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -46,7 +46,7 @@ fi build_with_cuda="" if [[ -n "$CUDA_HOME" ]]; then echo "Build with CUDA support" - build_with_cuda="--with-cuda=$CUDA_HOME --with-cuda-libdir=$CUDA_HOME/lib64/stubs" + build_with_cuda="--with-cuda=$CUDA_HOME --with-cuda-libdir=$CUDA_HOME/lib64/stubs --with-io-romio-flags=ac_cv_lib_cudart_cudaStreamSynchronize=no" fi if [[ $CONDA_BUILD_CROSS_COMPILATION == "1" ]]; then From 10330bbe6460e69f5cd7da8b84014e294dd7aec2 Mon Sep 17 00:00:00 2001 From: Min RK Date: Thu, 14 Nov 2024 14:18:19 +0100 Subject: [PATCH 203/224] psutil memory_maps don't work in the cross-compiled envs --- recipe/meta.yaml | 1 - recipe/tests/test_ldd.py | 34 +++++++++++++++++++++------------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 67c429d9..c29443b0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -79,7 +79,6 @@ outputs: script: run_test.sh requires: - python - - psutil files: - tests/helloworld.sh - tests/test_ldd.py diff --git a/recipe/tests/test_ldd.py b/recipe/tests/test_ldd.py index dd291e97..52a010ec 100644 --- a/recipe/tests/test_ldd.py +++ b/recipe/tests/test_ldd.py @@ -1,9 +1,8 @@ import ctypes +import os import sys from pathlib import Path -import psutil - # load every `libmpi*` shared library mpi_libs = [] for libmpi in (Path(sys.prefix) / "lib").glob("libmpi*.so"): @@ -12,17 +11,26 @@ # check all loaded libraries print("Listing all libraries loaded") -all_loaded = [] -for m in psutil.Process().memory_maps(): - p = m.path - if p.startswith('['): - # not a real library - continue - print(p) - if '.so' not in p: - # don't include things that aren't shared libs - continue - all_loaded.append(p) +# psutil.Process.memory_maps() doesn't work in emulated builds, +# use procfs ourselves +all_loaded = set() +with open(f"/proc/{os.getpid()}/maps") as f: + for line in f.readlines(): + line = line.strip() + if not line: + continue + chunks = line.split(None, 5) + if len(chunks) <= 5: + continue + path = chunks[-1] + if path.startswith('['): + # not a real library + continue + print(path) + if '.so' not in path: + # don't include things that aren't shared libs + continue + all_loaded.add(path) allowed_prefixes = ("/usr/lib", "/usr/lib64", sys.prefix) print(f"Checking for libraries loaded outside {allowed_prefixes}") From 88188c0e79bb16126585ac564dd0c0a80220ac5d Mon Sep 17 00:00:00 2001 From: Min RK Date: Thu, 14 Nov 2024 14:37:06 +0100 Subject: [PATCH 204/224] simpler check for improper cuda link doesn't actually check if cuda will be loaded, but simpler than a Python test --- recipe/meta.yaml | 2 -- recipe/run_test.sh | 9 +++++++- recipe/tests/test_ldd.py | 45 ---------------------------------------- 3 files changed, 8 insertions(+), 48 deletions(-) delete mode 100644 recipe/tests/test_ldd.py diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c29443b0..24df285b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -77,8 +77,6 @@ outputs: test: {% if mpi_type == 'conda' %} script: run_test.sh - requires: - - python files: - tests/helloworld.sh - tests/test_ldd.py diff --git a/recipe/run_test.sh b/recipe/run_test.sh index d06310da..17bedf8c 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -29,7 +29,14 @@ if [[ $PKG_NAME == "openmpi" ]]; then exit 1 fi - python3 test_ldd.py + # make sure libmpi doesn't link cuda + # this doesn't actually check if cuda will be loaded, + # only a direct link in libmpi. + # But that's most likely if this gets mixed up again. + if [[ $(ldd $CONDA_PREFIX/lib/libmpi.so | grep -cE '/libcuda.*\.so') -gt 0 ]]; then + echo "improper dependency on CUDA shared libraries" + ldd $CONDA_PREFIX/lib/libmpi.so + fi fi command -v ompi_info diff --git a/recipe/tests/test_ldd.py b/recipe/tests/test_ldd.py deleted file mode 100644 index 52a010ec..00000000 --- a/recipe/tests/test_ldd.py +++ /dev/null @@ -1,45 +0,0 @@ -import ctypes -import os -import sys -from pathlib import Path - -# load every `libmpi*` shared library -mpi_libs = [] -for libmpi in (Path(sys.prefix) / "lib").glob("libmpi*.so"): - print(f"Loading {libmpi}") - mpi_libs.append(ctypes.CDLL(libmpi)) - -# check all loaded libraries -print("Listing all libraries loaded") -# psutil.Process.memory_maps() doesn't work in emulated builds, -# use procfs ourselves -all_loaded = set() -with open(f"/proc/{os.getpid()}/maps") as f: - for line in f.readlines(): - line = line.strip() - if not line: - continue - chunks = line.split(None, 5) - if len(chunks) <= 5: - continue - path = chunks[-1] - if path.startswith('['): - # not a real library - continue - print(path) - if '.so' not in path: - # don't include things that aren't shared libs - continue - all_loaded.add(path) - -allowed_prefixes = ("/usr/lib", "/usr/lib64", sys.prefix) -print(f"Checking for libraries loaded outside {allowed_prefixes}") -for p in all_loaded: - if not p.startswith(sys.prefix + "/"): - print(p) - # make sure we don't load anything outside the env - # the main thing we are looking for is cuda, which is installed in /usr/local/cuda... - assert p.startswith(allowed_prefixes), p - # make sure we don't load any cuda libs - assert 'cudart' not in p, p - assert 'libcuda' not in p, p From 605a7d176642d3cf8f5f0e541125b675a6481b56 Mon Sep 17 00:00:00 2001 From: Min RK Date: Thu, 14 Nov 2024 14:45:24 +0100 Subject: [PATCH 205/224] test links with patchelf instead of ldd --- recipe/meta.yaml | 3 ++- recipe/run_test.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 24df285b..8e53cb07 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -77,9 +77,10 @@ outputs: test: {% if mpi_type == 'conda' %} script: run_test.sh + requires: + - patchelf # [linux] files: - tests/helloworld.sh - - tests/test_ldd.py {% else %} commands: - echo "It works!" diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 17bedf8c..980c7ad8 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -33,9 +33,9 @@ if [[ $PKG_NAME == "openmpi" ]]; then # this doesn't actually check if cuda will be loaded, # only a direct link in libmpi. # But that's most likely if this gets mixed up again. - if [[ $(ldd $CONDA_PREFIX/lib/libmpi.so | grep -cE '/libcuda.*\.so') -gt 0 ]]; then + if [[ $(patchelf --print-needed $CONDA_PREFIX/lib/libmpi.so | grep -cE 'libcuda.*\.so') -gt 0 ]]; then echo "improper dependency on CUDA shared libraries" - ldd $CONDA_PREFIX/lib/libmpi.so + patchelf --print-needed $CONDA_PREFIX/lib/libmpi.so fi fi From 79f9761ff55fc94aac39ff7dfb83a2198336f64c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 15 Nov 2024 22:50:18 +0000 Subject: [PATCH 206/224] updated v5.0.6 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8e53cb07..a7bde524 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ -{% set version = "5.0.5" %} +{% set version = "5.0.6" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 5 %} +{% set build = 0 %} # give conda package a higher build number {% if mpi_type == 'conda' %} @@ -16,7 +16,7 @@ package: source: fn: openmpi-{{ version }}.tar.bz2 url: https://www.open-mpi.org/software/ompi/v{{ major }}/downloads/openmpi-{{ version }}.tar.bz2 - sha256: 6588d57c0a4bd299a24103f4e196051b29e8b55fbda49e11d5b3d32030a32776 + sha256: bd4183fcbc43477c254799b429df1a6e576c042e74a2d2f8b37d537b2ff98157 patches: - ldflags-mac.patch # [osx] - prrte-mpiexec-timeout.patch From 9235cfcd75cd8a78839db6824eaaee625f0bf063 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 15 Nov 2024 22:51:23 +0000 Subject: [PATCH 207/224] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.44.4, and conda-forge-pinning 2024.11.15.15.57.58 --- .ci_support/migrations/libhwloc2112.yaml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .ci_support/migrations/libhwloc2112.yaml diff --git a/.ci_support/migrations/libhwloc2112.yaml b/.ci_support/migrations/libhwloc2112.yaml deleted file mode 100644 index 664a50be..00000000 --- a/.ci_support/migrations/libhwloc2112.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libhwloc 2.11.2 - kind: version - migration_number: 1 -libhwloc: -- 2.11.2 -migrator_ts: 1727390615.47357 From b927f24143351cf103c9582efb4905530db0bbb4 Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 18 Nov 2024 11:35:20 +0100 Subject: [PATCH 208/224] remove outdated patches applied in 5.0.6 --- recipe/build-mpi.sh | 2 -- recipe/ldflags-mac.patch | 31 ---------------------- recipe/meta.yaml | 11 ++------ recipe/prrte-mpiexec-timeout.patch | 42 ------------------------------ 4 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 recipe/ldflags-mac.patch delete mode 100644 recipe/prrte-mpiexec-timeout.patch diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index c0bf5a7f..a04253e9 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -12,8 +12,6 @@ unset FFLAGS F77 F90 F95 # tweak compiler flags export LIBRARY_PATH="$PREFIX/lib" if [[ "$target_platform" == osx-* ]]; then - # FIXME: remove autogen when autotools patch no longer required - perl autogen.pl --force if [[ -n "$CONDA_BUILD_SYSROOT" ]]; then export CFLAGS="$CFLAGS -isysroot $CONDA_BUILD_SYSROOT" export CXXFLAGS="$CXXFLAGS -isysroot $CONDA_BUILD_SYSROOT" diff --git a/recipe/ldflags-mac.patch b/recipe/ldflags-mac.patch deleted file mode 100644 index dcedc7b5..00000000 --- a/recipe/ldflags-mac.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e70f0a4afb1277e52389267777d260229b468ec0 Mon Sep 17 00:00:00 2001 -From: Min RK -Date: Mon, 29 Jul 2024 12:50:59 +0200 -Subject: [PATCH] typo in LDFLAGS_save_xcode variable name - -resulted in effectively overriding LDFLAGS='' on mac ---- - config/ompi_setup_fc.m4 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/config/ompi_setup_fc.m4 b/config/ompi_setup_fc.m4 -index 53c3cd96da..c147bf2b60 100644 ---- a/config/ompi_setup_fc.m4 -+++ b/config/ompi_setup_fc.m4 -@@ -212,11 +212,11 @@ end program - AS_IF([test $xcode_happy -eq 1], - [ # Restore LDFLAFGS + the new flags (i.e., get rid of the - # "-L." we added for this test) -- LDFLAGS="$LDFLAGS_xcode_save $1" -+ LDFLAGS="$LDFLAGS_save_xcode $1" - $2], - [ # If we failed the test, reset LDFLAGS back to its - # original value. -- LDFLAGS=$LDFLAGS_xcode_save -+ LDFLAGS=$LDFLAGS_save_xcode - $3]) - - OPAL_VAR_SCOPE_POP --- -2.45.0 - diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a7bde524..0f74d877 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,9 +17,6 @@ source: fn: openmpi-{{ version }}.tar.bz2 url: https://www.open-mpi.org/software/ompi/v{{ major }}/downloads/openmpi-{{ version }}.tar.bz2 sha256: bd4183fcbc43477c254799b429df1a6e576c042e74a2d2f8b37d537b2ff98157 - patches: - - ldflags-mac.patch # [osx] - - prrte-mpiexec-timeout.patch build: number: {{ build }} @@ -49,12 +46,8 @@ outputs: - {{ compiler('cuda') }} # [cuda_compiler != "None"] - {{ compiler('fortran') }} - {{ stdlib('c') }} - # FIXME: autotools, perl required for ldflags-mac.patch - - perl # [osx] - - autoconf # [osx] - - automake # [osx] - - libtool # [unix] - - make # [unix] + - pkg-config + - make host: #- openpmix #- prrte diff --git a/recipe/prrte-mpiexec-timeout.patch b/recipe/prrte-mpiexec-timeout.patch deleted file mode 100644 index dec59453..00000000 --- a/recipe/prrte-mpiexec-timeout.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5e3e8bf91d47db5134d73004a12dbe16984a461c Mon Sep 17 00:00:00 2001 -From: Min RK -Date: Tue, 1 Oct 2024 11:49:36 +0200 -Subject: [PATCH] 3.0: fix support for MPIEXEC_TIMEOUT - -linter fix for comparison of int to uint resulted in MPIEXEC_TIMEOUT env being ignored - ---- - src/tools/prte/prte.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/3rd-party/prrte/src/tools/prte/prte.c b/3rd-party/prrte/src/tools/prte/prte.c -index 62ff748566..5c1b7473cc 100644 ---- a/3rd-party/prrte/src/tools/prte/prte.c -+++ b/3rd-party/prrte/src/tools/prte/prte.c -@@ -256,7 +256,7 @@ int main(int argc, char *argv[]) - pmix_info_t *iptr, *iptr2, info; - pmix_status_t ret; - bool flag; -- size_t n, m, ninfo, param_len; -+ size_t n, ninfo, param_len; - pmix_app_t *papps; - size_t napps; - mylock_t mylock; -@@ -1085,11 +1085,11 @@ int main(int argc, char *argv[]) - opt = pmix_cmd_line_get_param(&results, PRTE_CLI_TIMEOUT); - if (NULL != opt || NULL != (timeoutenv = getenv("MPIEXEC_TIMEOUT"))) { - if (NULL != timeoutenv) { -- m = strtoul(timeoutenv, NULL, 10); -+ i = strtol(timeoutenv, NULL, 10); - /* both cannot be present, or they must agree */ - if (NULL != opt) { -- n = strtoul(opt->values[0], NULL, 10); -- if (m != n) { -+ n = strtol(opt->values[0], NULL, 10); -+ if (i != (int)n) { - pmix_show_help("help-prun.txt", "prun:timeoutconflict", false, - prte_tool_basename, n, timeoutenv); - PRTE_UPDATE_EXIT_STATUS(1); --- -2.45.0 - From 1104b80295d0b272b40f28ef60f19dbbd817f4da Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 18 Nov 2024 12:18:26 +0100 Subject: [PATCH 209/224] unbundle libfabric --- recipe/build-mpi.sh | 3 ++- recipe/meta.yaml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index a04253e9..67456cc9 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -77,6 +77,7 @@ fi --with-mpi-moduledir='${includedir}' \ --with-wrapper-ldflags="${wrapper_ldflags}" \ --with-sge \ + --with-libfabric=$PREFIX \ --with-hwloc=$PREFIX \ --with-libevent=$PREFIX \ --with-zlib=$PREFIX \ @@ -86,7 +87,7 @@ fi $build_with_cuda \ || (cat config.log; exit 1) -make -j"${CPU_COUNT:-1}" V=1 +make -j"${CPU_COUNT:-1}" make install POST_LINK=$PREFIX/bin/.openmpi-post-link.sh diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0f74d877..aecbe2b5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -52,6 +52,7 @@ outputs: #- openpmix #- prrte - libevent + - libfabric - libhwloc - libnl # [linux] - zlib From 4b88268764a6e760ab3c87d166528a8229e94b5b Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 18 Nov 2024 13:57:23 +0100 Subject: [PATCH 210/224] don't install built docs --- recipe/build-mpi.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 67456cc9..c5bf3fba 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -74,6 +74,7 @@ fi --disable-dependency-tracking \ --disable-wrapper-runpath \ --enable-mpi-fortran \ + --with-docdir=$PWD/_noinst/doc \ --with-mpi-moduledir='${includedir}' \ --with-wrapper-ldflags="${wrapper_ldflags}" \ --with-sge \ From 85a53f1052a4c8f34c97f8d9b8f7476bbf35ae33 Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 18 Nov 2024 15:37:46 +0100 Subject: [PATCH 211/224] don't install manpages, either --- recipe/build-mpi.sh | 3 ++- recipe/meta.yaml | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index c5bf3fba..a3c4cb81 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -74,7 +74,8 @@ fi --disable-dependency-tracking \ --disable-wrapper-runpath \ --enable-mpi-fortran \ - --with-docdir=$PWD/_noinst/doc \ + --docdir=$PWD/_noinst/doc \ + --mandir=$PWD/_noinst/man \ --with-mpi-moduledir='${includedir}' \ --with-wrapper-ldflags="${wrapper_ldflags}" \ --with-sge \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index aecbe2b5..41528168 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -75,6 +75,9 @@ outputs: - patchelf # [linux] files: - tests/helloworld.sh + commands: + - test ! -d $PREFIX/share/doc/openmpi + - test ! -f $PREFIX/share/man/man3/MPI_Init.3 {% else %} commands: - echo "It works!" From bc6d754d731e53d8409cb61a35d2e44610a953f6 Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 18 Nov 2024 11:30:02 +0100 Subject: [PATCH 212/224] use external libpmix, prrte --- recipe/build-mpi.sh | 5 +++-- recipe/meta.yaml | 14 +++++++++----- recipe/run_test.sh | 3 --- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index a3c4cb81..b52802bb 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -78,10 +78,11 @@ fi --mandir=$PWD/_noinst/man \ --with-mpi-moduledir='${includedir}' \ --with-wrapper-ldflags="${wrapper_ldflags}" \ - --with-sge \ - --with-libfabric=$PREFIX \ --with-hwloc=$PREFIX \ --with-libevent=$PREFIX \ + --with-libfabric=$PREFIX \ + --with-pmix=$PREFIX \ + --with-prrte=$PREFIX \ --with-zlib=$PREFIX \ --enable-ipv6 \ $build_with_ucx \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 41528168..517540af 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.6" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 0 %} +{% set build = 1 %} # give conda package a higher build number {% if mpi_type == 'conda' %} @@ -39,6 +39,9 @@ outputs: {% endif %} ignore_run_exports_from: - {{ compiler('cuda') }} # [cuda_compiler != "None"] + # libprrte-devel is only used for version check during configure; + # libprrte is not linked + - libprrte-devel requirements: build: - {{ compiler('c') }} @@ -49,20 +52,21 @@ outputs: - pkg-config - make host: - #- openpmix - #- prrte - libevent - libfabric - libhwloc - libnl # [linux] + - libpmix-devel + - libprrte-devel + - prrte - zlib - ucc # [linux and not ppc64le] - ucx # [linux and not ppc64le] - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] run: - mpi 1.0 openmpi - #- openpmix - #- prrte + # only pin major version of prrte, it isn't linked + - {{ pin_compatible('prrte', max_pin='x', min_pin='x') }} run_constrained: # Open MPI only uses CUDA Driver APIs, set the minimal driver version - __cuda >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 980c7ad8..8c3d4c10 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -42,9 +42,6 @@ if [[ $PKG_NAME == "openmpi" ]]; then command -v ompi_info ompi_info - command -v prte_info - prte_info - command -v mpiexec $MPIEXEC --help $MPIEXEC -n 4 ./helloworld.sh From f1d5e8de7046fb4f267e7bf6662a18857071ccd3 Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 16 Dec 2024 12:58:31 +0100 Subject: [PATCH 213/224] don't unbundle prrte openmpi 6 forks prrte, so no point unbundling it now --- recipe/build-mpi.sh | 6 +++++- recipe/meta.yaml | 12 ++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index b52802bb..e3bc534c 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -82,7 +82,6 @@ fi --with-libevent=$PREFIX \ --with-libfabric=$PREFIX \ --with-pmix=$PREFIX \ - --with-prrte=$PREFIX \ --with-zlib=$PREFIX \ --enable-ipv6 \ $build_with_ucx \ @@ -93,6 +92,11 @@ fi make -j"${CPU_COUNT:-1}" make install +# do not install unused bundled-prrte dev and doc files +rm -rf $PREFIX/include/prte +rm -rf $PREFIX/include/prte*.h +rm -rf $PREFIX/share/prte/rst + POST_LINK=$PREFIX/bin/.openmpi-post-link.sh if [ -n "$build_with_cuda" ]; then echo "setting MCA mca_base_component_show_load_errors to 0..." diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 517540af..bee29db5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -39,9 +39,6 @@ outputs: {% endif %} ignore_run_exports_from: - {{ compiler('cuda') }} # [cuda_compiler != "None"] - # libprrte-devel is only used for version check during configure; - # libprrte is not linked - - libprrte-devel requirements: build: - {{ compiler('c') }} @@ -55,23 +52,22 @@ outputs: - libevent - libfabric - libhwloc - - libnl # [linux] - libpmix-devel - - libprrte-devel - - prrte - zlib - ucc # [linux and not ppc64le] - ucx # [linux and not ppc64le] - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] run: - mpi 1.0 openmpi - # only pin major version of prrte, it isn't linked - - {{ pin_compatible('prrte', max_pin='x', min_pin='x') }} run_constrained: # Open MPI only uses CUDA Driver APIs, set the minimal driver version - __cuda >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] # Ensure a consistent CUDA environment - cuda-version >= {{ cuda_major ~ ".0" }} # [cuda_compiler != "None"] + # conflict with prrte + # openmpi (starting with 6) + # bundles its own fork of prrte + - libprrte ==0.0.0 test: {% if mpi_type == 'conda' %} script: run_test.sh From 3d075f962d9011a314acb925fef763c5d151ea8e Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 16 Dec 2024 12:58:57 +0100 Subject: [PATCH 214/224] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.45.0, and conda-forge-pinning 2024.12.15.16.05.58 --- .azure-pipelines/azure-pipelines-linux.yml | 12 ++++++------ ...ion11fortran_compiler_version11mpi_typeconda.yaml | 3 +-- ...11fortran_compiler_version11mpi_typeexternal.yaml | 3 +-- ...ion11fortran_compiler_version11mpi_typeconda.yaml | 7 +------ ...11fortran_compiler_version11mpi_typeexternal.yaml | 7 +------ ...ion11fortran_compiler_version11mpi_typeconda.yaml | 3 +-- ...11fortran_compiler_version11mpi_typeexternal.yaml | 3 +-- .ci_support/osx_64_.yaml | 2 -- .ci_support/osx_arm64_.yaml | 2 -- .scripts/run_osx_build.sh | 5 +++-- build-locally.py | 7 +++++++ 11 files changed, 22 insertions(+), 32 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index abf7edd5..2a9b754d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,27 +11,27 @@ jobs: ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:cos7 ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:cos7 ? linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda : CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 ? linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal : CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 ? linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda : CONFIG: linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 ? linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal : CONFIG: linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 5f78fb80..3d427b86 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -21,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.8 +- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:cos7 fortran_compiler: - gfortran fortran_compiler_version: @@ -42,7 +42,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index ef6972b0..efce472b 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -21,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.8 +- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:cos7 fortran_compiler: - gfortran fortran_compiler_version: @@ -42,7 +42,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index ad65fc77..24dd7e36 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - conda channel_sources: @@ -25,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.8 +- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 fortran_compiler: - gfortran fortran_compiler_version: @@ -46,7 +42,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 76cb06b8..2ae083d4 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - conda channel_sources: @@ -25,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.8 +- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 fortran_compiler: - gfortran fortran_compiler_version: @@ -46,7 +42,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 294bcfd0..5c4eb369 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -21,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.8 +- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 fortran_compiler: - gfortran fortran_compiler_version: @@ -38,7 +38,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 6c210df7..d9510182 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -21,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.8 +- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 fortran_compiler: - gfortran fortran_compiler_version: @@ -38,7 +38,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 83fa8d0e..22e87526 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -34,8 +34,6 @@ macos_machine: - x86_64-apple-darwin13.4.0 mpi_type: - conda -perl: -- 5.32.1 target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 4f8a481a..8d1ee175 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -34,8 +34,6 @@ macos_machine: - arm64-apple-darwin20.0.0 mpi_type: - conda -perl: -- 5.32.1 target_platform: - osx-arm64 zip_keys: diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 0b364984..0e3c3942 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -6,8 +6,9 @@ source .scripts/logging_utils.sh set -xe -MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} -MINIFORGE_HOME=${MINIFORGE_HOME%/} # remove trailing slash +MINIFORGE_HOME="${MINIFORGE_HOME:-${HOME}/miniforge3}" +MINIFORGE_HOME="${MINIFORGE_HOME%/}" # remove trailing slash +export CONDA_BLD_PATH="${CONDA_BLD_PATH:-${MINIFORGE_HOME}/conda-bld}" ( startgroup "Provisioning base env with micromamba" ) 2> /dev/null MICROMAMBA_VERSION="1.5.10-0" diff --git a/build-locally.py b/build-locally.py index 6788aea6..c4a56c66 100755 --- a/build-locally.py +++ b/build-locally.py @@ -26,6 +26,13 @@ def setup_environment(ns): os.path.dirname(__file__), "miniforge3" ) + # The default cache location might not be writable using docker on macOS. + if ns.config.startswith("linux") and platform.system() == "Darwin": + os.environ["CONDA_FORGE_DOCKER_RUN_ARGS"] = ( + os.environ.get("CONDA_FORGE_DOCKER_RUN_ARGS", "") + + " -e RATTLER_CACHE_DIR=/tmp/rattler_cache" + ) + def run_docker_build(ns): script = ".scripts/run_docker_build.sh" From 5002689093eb5a731dbdf7101a1a8cd1f928ff7d Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 16 Dec 2024 19:54:43 +0100 Subject: [PATCH 215/224] use newly split libfabric-devel --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bee29db5..99235bf1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -50,7 +50,7 @@ outputs: - make host: - libevent - - libfabric + - libfabric-devel - libhwloc - libpmix-devel - zlib From 3f275a9c29b4593e7ce056067ce6bc9201a30f68 Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 17 Dec 2024 12:18:07 +0100 Subject: [PATCH 216/224] avoid duplicate keys caused by faulty bot/lint parsers --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 99235bf1..5266a8eb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,8 +20,7 @@ source: build: number: {{ build }} - skip: true # [win] - skip: true # [linux and cuda_compiler_version != "11.8"] + skip: true # [win or (linux and cuda_compiler_version != "11.8")] outputs: - name: openmpi @@ -75,11 +74,12 @@ outputs: - patchelf # [linux] files: - tests/helloworld.sh + {% endif %} commands: + {% if mpi_type == 'conda' %} - test ! -d $PREFIX/share/doc/openmpi - test ! -f $PREFIX/share/man/man3/MPI_Init.3 {% else %} - commands: - echo "It works!" {% endif %} From ca39ccd987aea29b07c684368f9a1aec1bc28cd8 Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 18 Dec 2024 17:24:10 +0100 Subject: [PATCH 217/224] build with libfabric-devel 1.19 for best abi compatibility --- recipe/conda_build_config.yaml | 2 ++ recipe/meta.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 339d5f09..2ace99a4 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,3 +1,5 @@ mpi_type: - external # [linux] - conda +libfabric: + - "1.19" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5266a8eb..7917d522 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -49,7 +49,7 @@ outputs: - make host: - libevent - - libfabric-devel + - libfabric-devel {{ libfabric }}.* - libhwloc - libpmix-devel - zlib From 45a403efaacd015c293e75d9ff4875cbbef2c01f Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 18 Dec 2024 17:24:57 +0100 Subject: [PATCH 218/224] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.45.0, and conda-forge-pinning 2024.12.18.11.57.07 --- ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 ++ ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 ++ ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 ++ ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 ++ ...mpiler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 ++ ...ler_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 ++ .ci_support/osx_64_.yaml | 2 ++ .ci_support/osx_arm64_.yaml | 2 ++ 8 files changed, 16 insertions(+) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 3d427b86..5ca6d61a 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -28,6 +28,8 @@ fortran_compiler_version: - '11' libevent: - 2.1.12 +libfabric: +- '1.19' libhwloc: - 2.11.2 mpi_type: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index efce472b..ab09b27b 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -28,6 +28,8 @@ fortran_compiler_version: - '11' libevent: - 2.1.12 +libfabric: +- '1.19' libhwloc: - 2.11.2 mpi_type: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 24dd7e36..8a1fad90 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -28,6 +28,8 @@ fortran_compiler_version: - '11' libevent: - 2.1.12 +libfabric: +- '1.19' libhwloc: - 2.11.2 mpi_type: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 2ae083d4..d2f4d205 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -28,6 +28,8 @@ fortran_compiler_version: - '11' libevent: - 2.1.12 +libfabric: +- '1.19' libhwloc: - 2.11.2 mpi_type: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 5c4eb369..3f5dddd9 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -28,6 +28,8 @@ fortran_compiler_version: - '11' libevent: - 2.1.12 +libfabric: +- '1.19' libhwloc: - 2.11.2 mpi_type: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index d9510182..97b1eee4 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -28,6 +28,8 @@ fortran_compiler_version: - '11' libevent: - 2.1.12 +libfabric: +- '1.19' libhwloc: - 2.11.2 mpi_type: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 22e87526..5dc3edff 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -28,6 +28,8 @@ fortran_compiler_version: - '13' libevent: - 2.1.12 +libfabric: +- '1.19' libhwloc: - 2.11.2 macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 8d1ee175..f1f16b12 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -28,6 +28,8 @@ fortran_compiler_version: - '13' libevent: - 2.1.12 +libfabric: +- '1.19' libhwloc: - 2.11.2 macos_machine: From 4a2f167ccb71f4d6e76d0e4eacff1e458a9241be Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 25 Jan 2025 18:43:40 +0000 Subject: [PATCH 219/224] Rebuild for ucx 1.18 --- .ci_support/migrations/ucx118.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/ucx118.yaml diff --git a/.ci_support/migrations/ucx118.yaml b/.ci_support/migrations/ucx118.yaml new file mode 100644 index 00000000..aab58ab6 --- /dev/null +++ b/.ci_support/migrations/ucx118.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for ucx 1.18 + kind: version + migration_number: 1 +migrator_ts: 1737490442.7463033 +ucx: +- '1.18' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7917d522..7943dc2a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set version = "5.0.6" %} {% 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' %} From e1937dfacb29676619479e896429206b47fb0362 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 25 Jan 2025 18:44:37 +0000 Subject: [PATCH 220/224] MNT: Re-rendered with conda-build 25.1.1, conda-smithy 3.45.4, and conda-forge-pinning 2025.01.24.17.08.54 --- ...iler_version11fortran_compiler_version11mpi_typeconda.yaml | 4 +++- ...r_version11fortran_compiler_version11mpi_typeexternal.yaml | 4 +++- ...iler_version11fortran_compiler_version11mpi_typeconda.yaml | 4 +++- ...r_version11fortran_compiler_version11mpi_typeexternal.yaml | 4 +++- ...iler_version11fortran_compiler_version11mpi_typeconda.yaml | 2 ++ ...r_version11fortran_compiler_version11mpi_typeexternal.yaml | 2 ++ .ci_support/osx_64_.yaml | 2 ++ .ci_support/osx_arm64_.yaml | 2 ++ .gitignore | 3 +++ 9 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 5ca6d61a..3b5652c9 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -34,12 +34,14 @@ libhwloc: - 2.11.2 mpi_type: - conda +openmpi: +- '4' target_platform: - linux-64 ucc: - '1' ucx: -- '1.17' +- '1.18' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index ab09b27b..54d798b1 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -34,12 +34,14 @@ libhwloc: - 2.11.2 mpi_type: - external +openmpi: +- '4' target_platform: - linux-64 ucc: - '1' ucx: -- '1.17' +- '1.18' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 8a1fad90..8a052c6e 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -34,12 +34,14 @@ libhwloc: - 2.11.2 mpi_type: - conda +openmpi: +- '4' target_platform: - linux-aarch64 ucc: - '1' ucx: -- '1.17' +- '1.18' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index d2f4d205..fd6bf2a4 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -34,12 +34,14 @@ libhwloc: - 2.11.2 mpi_type: - external +openmpi: +- '4' target_platform: - linux-aarch64 ucc: - '1' ucx: -- '1.17' +- '1.18' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml index 3f5dddd9..045278c0 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml @@ -34,6 +34,8 @@ libhwloc: - 2.11.2 mpi_type: - conda +openmpi: +- '4' target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml index 97b1eee4..f1489813 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml @@ -34,6 +34,8 @@ libhwloc: - 2.11.2 mpi_type: - external +openmpi: +- '4' target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 5dc3edff..dd792712 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -36,6 +36,8 @@ macos_machine: - x86_64-apple-darwin13.4.0 mpi_type: - conda +openmpi: +- '4' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index f1f16b12..73f7b097 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -36,6 +36,8 @@ macos_machine: - arm64-apple-darwin20.0.0 mpi_type: - conda +openmpi: +- '4' target_platform: - osx-arm64 zip_keys: diff --git a/.gitignore b/.gitignore index 179afe55..bb385366 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ /build_artifacts *.pyc + +# Rattler-build's artifacts are in `output` when not specifying anything. +/output From 5ad85d64725b89e46addb96ba28917017063f8d3 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 15 Feb 2025 07:19:17 +0000 Subject: [PATCH 221/224] updated v5.0.7 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7943dc2a..8ccb7853 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ -{% set version = "5.0.6" %} +{% set version = "5.0.7" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 2 %} +{% set build = 0 %} # give conda package a higher build number {% if mpi_type == 'conda' %} @@ -16,7 +16,7 @@ package: source: fn: openmpi-{{ version }}.tar.bz2 url: https://www.open-mpi.org/software/ompi/v{{ major }}/downloads/openmpi-{{ version }}.tar.bz2 - sha256: bd4183fcbc43477c254799b429df1a6e576c042e74a2d2f8b37d537b2ff98157 + sha256: 119f2009936a403334d0df3c0d74d5595a32d99497f9b1d41e90019fee2fc2dd build: number: {{ build }} From 06b58830f13b3de05553464a7e6cfaba59169c16 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 15 Feb 2025 07:20:31 +0000 Subject: [PATCH 222/224] MNT: Re-rendered with conda-build 25.1.2, conda-smithy 3.45.4, and conda-forge-pinning 2025.02.15.07.01.42 --- .ci_support/migrations/ucx118.yaml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .ci_support/migrations/ucx118.yaml diff --git a/.ci_support/migrations/ucx118.yaml b/.ci_support/migrations/ucx118.yaml deleted file mode 100644 index aab58ab6..00000000 --- a/.ci_support/migrations/ucx118.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for ucx 1.18 - kind: version - migration_number: 1 -migrator_ts: 1737490442.7463033 -ucx: -- '1.18' From 0f887c6034e93f91514e600be590129c8931c1eb Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Fri, 7 Mar 2025 13:19:09 +0300 Subject: [PATCH 223/224] openmpi 4.1.7 --- recipe/build-mpi.sh | 1 - recipe/meta.yaml | 5 ++--- recipe/openmpi_activate.sh | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index e3bc534c..4ac45b47 100644 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -81,7 +81,6 @@ fi --with-hwloc=$PREFIX \ --with-libevent=$PREFIX \ --with-libfabric=$PREFIX \ - --with-pmix=$PREFIX \ --with-zlib=$PREFIX \ --enable-ipv6 \ $build_with_ucx \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8ccb7853..a3336898 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "5.0.7" %} +{% set version = "4.1.7" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} {% set build = 0 %} @@ -16,7 +16,7 @@ package: source: fn: openmpi-{{ version }}.tar.bz2 url: https://www.open-mpi.org/software/ompi/v{{ major }}/downloads/openmpi-{{ version }}.tar.bz2 - sha256: 119f2009936a403334d0df3c0d74d5595a32d99497f9b1d41e90019fee2fc2dd + sha256: 54a33cb7ad81ff0976f15a6cc8003c3922f0f3d8ceed14e1813ef3603f22cd34 build: number: {{ build }} @@ -51,7 +51,6 @@ outputs: - libevent - libfabric-devel {{ libfabric }}.* - libhwloc - - libpmix-devel - zlib - ucc # [linux and not ppc64le] - ucx # [linux and not ppc64le] diff --git a/recipe/openmpi_activate.sh b/recipe/openmpi_activate.sh index bebc706e..e747e025 100755 --- a/recipe/openmpi_activate.sh +++ b/recipe/openmpi_activate.sh @@ -45,5 +45,5 @@ if [ "${CONDA_BUILD:-}" = "1" ]; then export OMPI_MCA_pml=ob1 export OMPI_MCA_mpi_yield_when_idle=true export OMPI_MCA_btl_base_warn_component_unused=false - export PRTE_MCA_rmaps_default_mapping_policy=:oversubscribe + export OMPI_MCA_rmaps_base_oversubscribe=true fi From ae9eca916fedd51a510b1f39b20ff9c774faa4cd Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Fri, 7 Mar 2025 13:27:17 +0300 Subject: [PATCH 224/224] MNT: Re-rendered with conda-build 25.1.2, conda-smithy 3.46.1, and conda-forge-pinning 2025.03.07.09.19.34 --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index bb385366..47b5408a 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ # Rattler-build's artifacts are in `output` when not specifying anything. /output +# Pixi's configuration +.pixi
linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda - - variant + + variant
linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal - - variant + + variant
linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda - - variant + + variant
linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal - - variant + + variant
linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda - - variant + + variant
linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal - - variant + + variant
osx_64 - - variant + + variant
osx_arm64 - - variant + + variant