From 912fd34fc76e356b47f918c1b0d16253499b1482 Mon Sep 17 00:00:00 2001 From: Hugo Slepicka Date: Fri, 29 Jan 2021 09:51:19 -0800 Subject: [PATCH 1/5] FIX: Try to unpin mpich after new version available. --- recipe/meta.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b45f42d..06318f3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -49,12 +49,10 @@ requirements: - {{ compiler('fortran') }} # [not win] - {{ compiler('m2w64_fortran') }} # [win] - cmake - - mpich ==3.3.2 # [mpi == 'mpich'] - - openmpi # [mpi == 'openmpi'] + - {{ mpi }} # [mpi != 'nompi'] host: run: - - mpich ==3.3.2 # [mpi == 'mpich'] - - openmpi # [mpi == 'openmpi'] + - {{ mpi }} # [mpi != 'nompi'] test: commands: From 895f0c6577ac7d709238e06db4ed2295db615d19 Mon Sep 17 00:00:00 2001 From: Hugo Slepicka Date: Fri, 29 Jan 2021 09:51:50 -0800 Subject: [PATCH 2/5] FIX: 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 06318f3..0da55b9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set name = "genesis2" %} {% set version = "2.5" %} -{% set build = 0 %} +{% set build = 1 %} # ensure mpi is defined (needed for conda-smithy recipe-lint) {% set mpi = mpi or 'nompi' %} From a4716431d5483b3cb1b4f8c16ff5852399107568 Mon Sep 17 00:00:00 2001 From: Hugo Slepicka Date: Fri, 29 Jan 2021 10:10:42 -0800 Subject: [PATCH 3/5] FIX: Try to add mpich-mpifort. --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0da55b9..9014b32 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -48,6 +48,7 @@ requirements: - {{ compiler('m2w64_c') }} # [win] - {{ compiler('fortran') }} # [not win] - {{ compiler('m2w64_fortran') }} # [win] + - mpich-mpifort # [osx] - cmake - {{ mpi }} # [mpi != 'nompi'] host: From b8b35c227a321ff944e8d6e061bbb58d6eb6e55c Mon Sep 17 00:00:00 2001 From: Hugo Slepicka Date: Fri, 29 Jan 2021 10:19:12 -0800 Subject: [PATCH 4/5] DBG: Try with cmake 3.18 series. --- recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9014b32..1ac64f0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -48,8 +48,7 @@ requirements: - {{ compiler('m2w64_c') }} # [win] - {{ compiler('fortran') }} # [not win] - {{ compiler('m2w64_fortran') }} # [win] - - mpich-mpifort # [osx] - - cmake + - cmake ==3.18 - {{ mpi }} # [mpi != 'nompi'] host: run: From 88023e1fd4385e44800d419490c518ecdb1dc839 Mon Sep 17 00:00:00 2001 From: Hugo Slepicka Date: Tue, 2 Feb 2021 10:56:35 -0800 Subject: [PATCH 5/5] FIX: Unpin cmake. --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1ac64f0..0da55b9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -48,7 +48,7 @@ requirements: - {{ compiler('m2w64_c') }} # [win] - {{ compiler('fortran') }} # [not win] - {{ compiler('m2w64_fortran') }} # [win] - - cmake ==3.18 + - cmake - {{ mpi }} # [mpi != 'nompi'] host: run: