Merge pull request #35 from minrk/run_exports

conda-forge · Nov 1, 2024 · bae2b68 · bae2b68
2 parents 040f507 + 6c77bd8
commit bae2b68
Show file tree

Hide file tree

Showing 17 changed files with 111 additions and 53 deletions.
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.ci_support/linux_64_mpimpich.yaml b/.ci_support/linux_64_mpimpich.yaml
@@ -1,13 +1,13 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -17,7 +17,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 liblapack:

diff --git a/.ci_support/linux_64_mpiopenmpi.yaml b/.ci_support/linux_64_mpiopenmpi.yaml
@@ -1,13 +1,13 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -17,7 +17,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 liblapack:

diff --git a/.ci_support/linux_aarch64_mpimpich.yaml b/.ci_support/linux_aarch64_mpimpich.yaml
@@ -3,7 +3,7 @@ BUILD:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -21,7 +21,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 liblapack:

diff --git a/.ci_support/linux_aarch64_mpiopenmpi.yaml b/.ci_support/linux_aarch64_mpiopenmpi.yaml
@@ -3,7 +3,7 @@ BUILD:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -21,7 +21,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 liblapack:

diff --git a/.ci_support/linux_ppc64le_mpimpich.yaml b/.ci_support/linux_ppc64le_mpimpich.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -17,7 +17,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 liblapack:

diff --git a/.ci_support/linux_ppc64le_mpiopenmpi.yaml b/.ci_support/linux_ppc64le_mpiopenmpi.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -17,7 +17,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 liblapack:

diff --git a/.ci_support/osx_64_mpimpich.yaml b/.ci_support/osx_64_mpimpich.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,7 +17,7 @@ channel_targets:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 liblapack:

diff --git a/.ci_support/osx_64_mpiopenmpi.yaml b/.ci_support/osx_64_mpiopenmpi.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,7 +17,7 @@ channel_targets:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 liblapack:

diff --git a/.ci_support/osx_arm64_mpimpich.yaml b/.ci_support/osx_arm64_mpimpich.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,7 +17,7 @@ channel_targets:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 liblapack:

diff --git a/.ci_support/osx_arm64_mpiopenmpi.yaml b/.ci_support/osx_arm64_mpiopenmpi.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,7 +17,7 @@ channel_targets:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 liblapack:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -13,8 +13,10 @@ fi
 
 # Workaround for https://github.com/conda-forge/scalapack-feedstock/pull/30#issuecomment-1061196317
 export FFLAGS="${FFLAGS} -fallow-argument-mismatch"
-# OMPI seems to need -I $PREFIX/lib to find mpi_f08, at least on mac-arm
-export OMPI_FCFLAGS="${FFLAGS} -I$PREFIX/lib"
+# compiler adds $PREFIX/include via isystem, but this doesn't always have an effect
+# only seems relevant working with openmpi for some reason
+# https://github.com/conda-forge/gfortran_osx-64-feedstock/issues/57
+export OMPI_FCFLAGS="${FFLAGS} -I$PREFIX/include"
 export OMPI_LDFLAGS=${LDFLAGS}
 
 

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -16,8 +16,10 @@ source:
     - fortran_mangling_cross.patch
 
 build:
-  number: 2
+  number: 3
   skip: true  # [win]
+  run_exports:
+    - {{ pin_subpackage("scalapack", max_pin="x.x") }}
 
 requirements:
   build: