diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index f00f84c..881fbda 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,22 +8,22 @@ jobs: vmImage: ubuntu-16.04 strategy: matrix: - linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typecondatarget_platformlinux-64: - CONFIG: linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typecondatarget_platformlinux-64 + linux_64_fortran_compiler_version7mpi_typeconda: + CONFIG: linux_64_fortran_compiler_version7mpi_typeconda UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typeexternaltarget_platformlinux-64: - CONFIG: linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typeexternaltarget_platformlinux-64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_fortran_compiler_version7mpi_typeexternal: + CONFIG: linux_64_fortran_compiler_version7mpi_typeexternal UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typecondatarget_platformlinux-64: - CONFIG: linux_64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typecondatarget_platformlinux-64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_fortran_compiler_version9mpi_typeconda: + CONFIG: linux_64_fortran_compiler_version9mpi_typeconda UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typeexternaltarget_platformlinux-64: - CONFIG: linux_64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typeexternaltarget_platformlinux-64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_fortran_compiler_version9mpi_typeexternal: + CONFIG: linux_64_fortran_compiler_version9mpi_typeexternal UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index bcdb0ec..43819b4 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,17 +8,23 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7mpi_typecondatarget_platformosx-64: - CONFIG: osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7mpi_typecondatarget_platformosx-64 + osx_64_fortran_compiler_version7mpi_typeconda: + CONFIG: osx_64_fortran_compiler_version7mpi_typeconda UPLOAD_PACKAGES: 'True' - osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7mpi_typeexternaltarget_platformosx-64: - CONFIG: osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7mpi_typeexternaltarget_platformosx-64 + osx_64_fortran_compiler_version7mpi_typeexternal: + CONFIG: osx_64_fortran_compiler_version7mpi_typeexternal UPLOAD_PACKAGES: 'True' - osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version9mpi_typecondatarget_platformosx-64: - CONFIG: osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version9mpi_typecondatarget_platformosx-64 + osx_64_fortran_compiler_version9mpi_typeconda: + CONFIG: osx_64_fortran_compiler_version9mpi_typeconda UPLOAD_PACKAGES: 'True' - osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version9mpi_typeexternaltarget_platformosx-64: - CONFIG: osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version9mpi_typeexternaltarget_platformosx-64 + osx_64_fortran_compiler_version9mpi_typeexternal: + CONFIG: osx_64_fortran_compiler_version9mpi_typeexternal + UPLOAD_PACKAGES: 'True' + osx_arm64_mpi_typeconda: + CONFIG: osx_arm64_mpi_typeconda + UPLOAD_PACKAGES: 'True' + osx_arm64_mpi_typeexternal: + CONFIG: osx_arm64_mpi_typeexternal UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typecondatarget_platformlinux-64.yaml b/.ci_support/linux_64_fortran_compiler_version7mpi_typeconda.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typecondatarget_platformlinux-64.yaml rename to .ci_support/linux_64_fortran_compiler_version7mpi_typeconda.yaml index 92dd13a..27e435a 100644 --- a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typecondatarget_platformlinux-64.yaml +++ b/.ci_support/linux_64_fortran_compiler_version7mpi_typeconda.yaml @@ -2,6 +2,8 @@ c_compiler: - gcc c_compiler_version: - '7' +cdt_name: +- cos6 channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '7' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typeexternaltarget_platformlinux-64.yaml b/.ci_support/linux_64_fortran_compiler_version7mpi_typeexternal.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typeexternaltarget_platformlinux-64.yaml rename to .ci_support/linux_64_fortran_compiler_version7mpi_typeexternal.yaml index a02ae23..f490179 100644 --- a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typeexternaltarget_platformlinux-64.yaml +++ b/.ci_support/linux_64_fortran_compiler_version7mpi_typeexternal.yaml @@ -2,6 +2,8 @@ c_compiler: - gcc c_compiler_version: - '7' +cdt_name: +- cos6 channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '7' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typecondatarget_platformlinux-64.yaml b/.ci_support/linux_64_fortran_compiler_version9mpi_typeconda.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typecondatarget_platformlinux-64.yaml rename to .ci_support/linux_64_fortran_compiler_version9mpi_typeconda.yaml index 3c2025f..44366dc 100644 --- a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typecondatarget_platformlinux-64.yaml +++ b/.ci_support/linux_64_fortran_compiler_version9mpi_typeconda.yaml @@ -2,6 +2,8 @@ c_compiler: - gcc c_compiler_version: - '9' +cdt_name: +- cos6 channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typeexternaltarget_platformlinux-64.yaml b/.ci_support/linux_64_fortran_compiler_version9mpi_typeexternal.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typeexternaltarget_platformlinux-64.yaml rename to .ci_support/linux_64_fortran_compiler_version9mpi_typeexternal.yaml index 784e87d..37585d9 100644 --- a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typeexternaltarget_platformlinux-64.yaml +++ b/.ci_support/linux_64_fortran_compiler_version9mpi_typeexternal.yaml @@ -2,6 +2,8 @@ c_compiler: - gcc c_compiler_version: - '9' +cdt_name: +- cos6 channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typecondatarget_platformlinux-aarch64.yaml b/.ci_support/linux_aarch64_fortran_compiler_version7mpi_typeconda.yaml similarity index 91% rename from .ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typecondatarget_platformlinux-aarch64.yaml rename to .ci_support/linux_aarch64_fortran_compiler_version7mpi_typeconda.yaml index 99a9955..e465706 100644 --- a/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typecondatarget_platformlinux-aarch64.yaml +++ b/.ci_support/linux_aarch64_fortran_compiler_version7mpi_typeconda.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '7' docker_image: -- condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-aarch64 fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typeexternaltarget_platformlinux-aarch64.yaml b/.ci_support/linux_aarch64_fortran_compiler_version7mpi_typeexternal.yaml similarity index 91% rename from .ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typeexternaltarget_platformlinux-aarch64.yaml rename to .ci_support/linux_aarch64_fortran_compiler_version7mpi_typeexternal.yaml index f4daff9..b86c981 100644 --- a/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typeexternaltarget_platformlinux-aarch64.yaml +++ b/.ci_support/linux_aarch64_fortran_compiler_version7mpi_typeexternal.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '7' docker_image: -- condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-aarch64 fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_aarch64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typecondatarget_platformlinux-aarch64.yaml b/.ci_support/linux_aarch64_fortran_compiler_version9mpi_typeconda.yaml similarity index 91% rename from .ci_support/linux_aarch64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typecondatarget_platformlinux-aarch64.yaml rename to .ci_support/linux_aarch64_fortran_compiler_version9mpi_typeconda.yaml index 2c1048e..5f60648 100644 --- a/.ci_support/linux_aarch64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typecondatarget_platformlinux-aarch64.yaml +++ b/.ci_support/linux_aarch64_fortran_compiler_version9mpi_typeconda.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-aarch64 fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_aarch64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typeexternaltarget_platformlinux-aarch64.yaml b/.ci_support/linux_aarch64_fortran_compiler_version9mpi_typeexternal.yaml similarity index 91% rename from .ci_support/linux_aarch64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typeexternaltarget_platformlinux-aarch64.yaml rename to .ci_support/linux_aarch64_fortran_compiler_version9mpi_typeexternal.yaml index cc338c8..ed3b2be 100644 --- a/.ci_support/linux_aarch64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typeexternaltarget_platformlinux-aarch64.yaml +++ b/.ci_support/linux_aarch64_fortran_compiler_version9mpi_typeexternal.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-aarch64 fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8mpi_typecondatarget_platformlinux-ppc64le.yaml b/.ci_support/linux_ppc64le_fortran_compiler_version8mpi_typeconda.yaml similarity index 86% rename from .ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8mpi_typecondatarget_platformlinux-ppc64le.yaml rename to .ci_support/linux_ppc64le_fortran_compiler_version8mpi_typeconda.yaml index 0b2c385..af8a8eb 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8mpi_typecondatarget_platformlinux-ppc64le.yaml +++ b/.ci_support/linux_ppc64le_fortran_compiler_version8mpi_typeconda.yaml @@ -2,6 +2,8 @@ c_compiler: - gcc c_compiler_version: - '8' +cdt_name: +- cos7 channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '8' docker_image: -- condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-ppc64le fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8mpi_typeexternaltarget_platformlinux-ppc64le.yaml b/.ci_support/linux_ppc64le_fortran_compiler_version8mpi_typeexternal.yaml similarity index 86% rename from .ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8mpi_typeexternaltarget_platformlinux-ppc64le.yaml rename to .ci_support/linux_ppc64le_fortran_compiler_version8mpi_typeexternal.yaml index 307dcca..6683a6f 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8mpi_typeexternaltarget_platformlinux-ppc64le.yaml +++ b/.ci_support/linux_ppc64le_fortran_compiler_version8mpi_typeexternal.yaml @@ -2,6 +2,8 @@ c_compiler: - gcc c_compiler_version: - '8' +cdt_name: +- cos7 channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '8' docker_image: -- condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-ppc64le fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_ppc64le_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typecondatarget_platformlinux-ppc64le.yaml b/.ci_support/linux_ppc64le_fortran_compiler_version9mpi_typeconda.yaml similarity index 86% rename from .ci_support/linux_ppc64le_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typecondatarget_platformlinux-ppc64le.yaml rename to .ci_support/linux_ppc64le_fortran_compiler_version9mpi_typeconda.yaml index dfea16a..6490b11 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typecondatarget_platformlinux-ppc64le.yaml +++ b/.ci_support/linux_ppc64le_fortran_compiler_version9mpi_typeconda.yaml @@ -2,6 +2,8 @@ c_compiler: - gcc c_compiler_version: - '9' +cdt_name: +- cos7 channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-ppc64le fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/linux_ppc64le_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typeexternaltarget_platformlinux-ppc64le.yaml b/.ci_support/linux_ppc64le_fortran_compiler_version9mpi_typeexternal.yaml similarity index 86% rename from .ci_support/linux_ppc64le_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typeexternaltarget_platformlinux-ppc64le.yaml rename to .ci_support/linux_ppc64le_fortran_compiler_version9mpi_typeexternal.yaml index e61e491..10fea9a 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typeexternaltarget_platformlinux-ppc64le.yaml +++ b/.ci_support/linux_ppc64le_fortran_compiler_version9mpi_typeexternal.yaml @@ -2,6 +2,8 @@ c_compiler: - gcc c_compiler_version: - '9' +cdt_name: +- cos7 channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-ppc64le fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7mpi_typecondatarget_platformosx-64.yaml b/.ci_support/osx_64_fortran_compiler_version7mpi_typeconda.yaml similarity index 96% rename from .ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7mpi_typecondatarget_platformosx-64.yaml rename to .ci_support/osx_64_fortran_compiler_version7mpi_typeconda.yaml index 5505b64..88c82bf 100644 --- a/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7mpi_typecondatarget_platformosx-64.yaml +++ b/.ci_support/osx_64_fortran_compiler_version7mpi_typeconda.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '10' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '11' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7mpi_typeexternaltarget_platformosx-64.yaml b/.ci_support/osx_64_fortran_compiler_version7mpi_typeexternal.yaml similarity index 96% rename from .ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7mpi_typeexternaltarget_platformosx-64.yaml rename to .ci_support/osx_64_fortran_compiler_version7mpi_typeexternal.yaml index 8db3d0d..6696b42 100644 --- a/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7mpi_typeexternaltarget_platformosx-64.yaml +++ b/.ci_support/osx_64_fortran_compiler_version7mpi_typeexternal.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '10' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '11' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version9mpi_typecondatarget_platformosx-64.yaml b/.ci_support/osx_64_fortran_compiler_version9mpi_typeconda.yaml similarity index 96% rename from .ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version9mpi_typecondatarget_platformosx-64.yaml rename to .ci_support/osx_64_fortran_compiler_version9mpi_typeconda.yaml index b6d1ca0..407539b 100644 --- a/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version9mpi_typecondatarget_platformosx-64.yaml +++ b/.ci_support/osx_64_fortran_compiler_version9mpi_typeconda.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '10' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '11' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version9mpi_typeexternaltarget_platformosx-64.yaml b/.ci_support/osx_64_fortran_compiler_version9mpi_typeexternal.yaml similarity index 96% rename from .ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version9mpi_typeexternaltarget_platformosx-64.yaml rename to .ci_support/osx_64_fortran_compiler_version9mpi_typeexternal.yaml index 0f0e055..68339cc 100644 --- a/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version9mpi_typeexternaltarget_platformosx-64.yaml +++ b/.ci_support/osx_64_fortran_compiler_version9mpi_typeexternal.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '10' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '11' fortran_compiler: - gfortran fortran_compiler_version: diff --git a/.ci_support/osx_arm64_mpi_typeconda.yaml b/.ci_support/osx_arm64_mpi_typeconda.yaml new file mode 100644 index 0000000..975a62c --- /dev/null +++ b/.ci_support/osx_arm64_mpi_typeconda.yaml @@ -0,0 +1,28 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge/label/rust_dev,conda-forge,https://conda-web.anaconda.org/conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '11' +macos_machine: +- arm64-apple-darwin20.0.0 +mpi_type: +- conda +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version diff --git a/.ci_support/osx_arm64_mpi_typeexternal.yaml b/.ci_support/osx_arm64_mpi_typeexternal.yaml new file mode 100644 index 0000000..26d36b5 --- /dev/null +++ b/.ci_support/osx_arm64_mpi_typeexternal.yaml @@ -0,0 +1,28 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge/label/rust_dev,conda-forge,https://conda-web.anaconda.org/conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '11' +macos_machine: +- arm64-apple-darwin20.0.0 +mpi_type: +- external +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version diff --git a/.drone.yml b/.drone.yml index 427b072..ad1fd77 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ --- kind: pipeline -name: linux_aarch64_c_compiler_version7cx_h3bc3f8165e +name: linux_aarch64_fortran_compiler_vers_h50b1089b24 platform: os: linux @@ -8,9 +8,9 @@ platform: steps: - name: Install and build - image: condaforge/linux-anvil-aarch64 + image: quay.io/condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typecondatarget_platformlinux-aarch64 + CONFIG: linux_aarch64_fortran_compiler_version7mpi_typeconda UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: @@ -31,7 +31,7 @@ steps: --- kind: pipeline -name: linux_aarch64_c_compiler_version7cx_h41a4611554 +name: linux_aarch64_fortran_compiler_vers_h1d63bc3d4a platform: os: linux @@ -39,9 +39,9 @@ platform: steps: - name: Install and build - image: condaforge/linux-anvil-aarch64 + image: quay.io/condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typeexternaltarget_platformlinux-aarch64 + CONFIG: linux_aarch64_fortran_compiler_version7mpi_typeexternal UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: @@ -62,7 +62,7 @@ steps: --- kind: pipeline -name: linux_aarch64_c_compiler_version9cx_h539ba524cf +name: linux_aarch64_fortran_compiler_vers_hd0bafcb3c5 platform: os: linux @@ -70,9 +70,9 @@ platform: steps: - name: Install and build - image: condaforge/linux-anvil-aarch64 + image: quay.io/condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typecondatarget_platformlinux-aarch64 + CONFIG: linux_aarch64_fortran_compiler_version9mpi_typeconda UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: @@ -93,7 +93,7 @@ steps: --- kind: pipeline -name: linux_aarch64_c_compiler_version9cx_h277264f12e +name: linux_aarch64_fortran_compiler_vers_hd10fd039c3 platform: os: linux @@ -101,9 +101,9 @@ platform: steps: - name: Install and build - image: condaforge/linux-anvil-aarch64 + image: quay.io/condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typeexternaltarget_platformlinux-aarch64 + CONFIG: linux_aarch64_fortran_compiler_version9mpi_typeexternal UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index aa9727b..8a4b0d3 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -29,6 +29,10 @@ source run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index c299b79..3675dac 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -48,6 +48,10 @@ set -e echo -e "\n\nMaking the build clobber file and running the build." make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" +fi + conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.travis.yml b/.travis.yml index d406c89..61d0d32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,19 +7,19 @@ language: generic matrix: include: - - env: CONFIG=linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8mpi_typecondatarget_platformlinux-ppc64le UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_fortran_compiler_version8mpi_typeconda UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le - - env: CONFIG=linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8mpi_typeexternaltarget_platformlinux-ppc64le UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_fortran_compiler_version8mpi_typeexternal UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le - - env: CONFIG=linux_ppc64le_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typecondatarget_platformlinux-ppc64le UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_fortran_compiler_version9mpi_typeconda UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le - - env: CONFIG=linux_ppc64le_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typeexternaltarget_platformlinux-ppc64le UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_fortran_compiler_version9mpi_typeexternal UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le diff --git a/README.md b/README.md index 4641da4..e86870b 100644 --- a/README.md +++ b/README.md @@ -49,115 +49,129 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + diff --git a/conda-forge.yml b/conda-forge.yml index 26e5edf..cea5359 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,2 +1,4 @@ -provider: {linux_aarch64: default, linux_ppc64le: default} +build_platform: {osx_arm64: osx_64} conda_forge_output_validation: true +provider: {linux_aarch64: default, linux_ppc64le: default} +test_on_native_only: true
VariantStatus
linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typecondatarget_platformlinux-64linux_64_fortran_compiler_version7mpi_typeconda - variant + variant
linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typeexternaltarget_platformlinux-64linux_64_fortran_compiler_version7mpi_typeexternal - variant + variant
linux_64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typecondatarget_platformlinux-64linux_64_fortran_compiler_version9mpi_typeconda - variant + variant
linux_64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typeexternaltarget_platformlinux-64linux_64_fortran_compiler_version9mpi_typeexternal - variant + variant
linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typecondatarget_platformlinux-aarch64linux_aarch64_fortran_compiler_version7mpi_typeconda - variant + variant
linux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpi_typeexternaltarget_platformlinux-aarch64linux_aarch64_fortran_compiler_version7mpi_typeexternal - variant + variant
linux_aarch64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typecondatarget_platformlinux-aarch64linux_aarch64_fortran_compiler_version9mpi_typeconda - variant + variant
linux_aarch64_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typeexternaltarget_platformlinux-aarch64linux_aarch64_fortran_compiler_version9mpi_typeexternal - variant + variant
linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8mpi_typecondatarget_platformlinux-ppc64lelinux_ppc64le_fortran_compiler_version8mpi_typeconda - variant + variant
linux_ppc64le_c_compiler_version8cxx_compiler_version8fortran_compiler_version8mpi_typeexternaltarget_platformlinux-ppc64lelinux_ppc64le_fortran_compiler_version8mpi_typeexternal - variant + variant
linux_ppc64le_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typecondatarget_platformlinux-ppc64lelinux_ppc64le_fortran_compiler_version9mpi_typeconda - variant + variant
linux_ppc64le_c_compiler_version9cxx_compiler_version9fortran_compiler_version9mpi_typeexternaltarget_platformlinux-ppc64lelinux_ppc64le_fortran_compiler_version9mpi_typeexternal - variant + variant
osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7mpi_typecondatarget_platformosx-64osx_64_fortran_compiler_version7mpi_typeconda - variant + variant
osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version7mpi_typeexternaltarget_platformosx-64osx_64_fortran_compiler_version7mpi_typeexternal - variant + variant
osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version9mpi_typecondatarget_platformosx-64osx_64_fortran_compiler_version9mpi_typeconda - variant + variant
osx_64_c_compiler_version10cxx_compiler_version10fortran_compiler_version9mpi_typeexternaltarget_platformosx-64osx_64_fortran_compiler_version9mpi_typeexternal - variant + variant + +
osx_arm64_mpi_typeconda + + variant + +
osx_arm64_mpi_typeexternal + + variant