Merge pull request #260 from timryanb/adding-M1-conda-build

Fixing conda deployment

Author: timryanb

conda/build.sh

@@ -5,7 +5,7 @@ export F2F_DIR=${SRC_DIR}
 # platform specific environment variables
 if [[ $(uname) == Darwin ]]; then
   export SO_EXT="dylib"
-  export SO_LINK_FLAGS="-fPIC -dynamiclib"
+  export SO_LINK_FLAGS="-fPIC -dynamiclib -headerpad_max_install_names"
   export LIB_SLF="${SO_LINK_FLAGS} -install_name @rpath/libtransfer_schemes.dylib"
   export LAPACK_LIBS="-framework accelerate"
 elif [[ "$target_platform" == linux-* ]]; then

conda/conda_build_config.yaml

@@ -10,4 +10,11 @@ python:
   - 3.8
   - 3.9
   - 3.10
-  - 3.11
+  - 3.11
+
+target_platform:
+  - osx-64 # [osx]
+  #- osx-arm64 # [osx]
+  - linux-64 # [linux64]
+  #- linux-aarch64 # [linux64]
+  #- linux-ppc64le # [linux64]

conda/meta.yaml

@@ -27,57 +27,40 @@ source:
 
 build:
   number: {{ build }}
-  skip: true  # [py<=36]
+  skip: true  # [py<=37]
   string: py{{ CONDA_PY }}_{{ scalar }}_h{{ PKG_HASH }}_{{ build }}
   track_features:
     - funtofem_complex  # [scalar == "complex"]
 
 requirements:
   build:
-    - python {{ python }}
-    - numpy   1.18   # [py==38]
-    - numpy   1.19   # [py==39]
-    - numpy   1.22   # [py==310]
-    - numpy   1.23   # [py==311]
-    - {{ mpi }}
-    - openmpi-mpicxx  # [mpi == "openmpi"]
-    - mpich-mpicxx  # [mpi == "mpich"]
-    - {{ compiler('cxx') }}
-    - libopenblas
-    - lapack
+    - {{compiler('cxx')}}
     - make
-    - mpi4py
-    - cython >=0.29,<3.0
-    - setuptools
-    - tacs >=3.4.0
+    - python {{ python }}                    # [build_platform != target_platform]
+    - cross-python_{{ target_platform }}     # [build_platform != target_platform]
+    - numpy   1.23   # [build_platform != target_platform]
+    - {{ mpi }} # [build_platform != target_platform]
+    - mpi4py # [build_platform != target_platform]
+    - cython >=0.29,<3.0 # [build_platform != target_platform]
+    - setuptools # [build_platform != target_platform]
+    - tacs >=3.4.0 # [build_platform != target_platform]
 
   host:
     - python {{ python }}
     - pip
-    - numpy   1.18   # [py==38]
-    - numpy   1.19   # [py==39]
-    - numpy   1.22   # [py==310]
-    - numpy   1.23   # [py==311]
+    - numpy   1.23
     - {{ mpi }}
-    - openmpi-mpicxx  # [mpi == "openmpi"]
-    - mpich-mpicxx  # [mpi == "mpich"]
     - libopenblas
     - lapack
     - mpi4py
     - cython >=0.29,<3.0
-    - setuptools
     - tacs >=3.4.0
 
   run:
     - python
-    - numpy >=1.18.5,<2.0.a0   # [py==38]
-    - numpy >=1.19.5,<2.0.a0   # [py==39]
-    - numpy >=1.22.0,<2.0.a0   # [py==310]
-    - numpy >=1.23.0,<2.0.a0   # [py==311]
+    - {{ pin_compatible("numpy") }}
     - scipy
     - {{ mpi }}
-    - openmpi-mpicxx  # [mpi == "openmpi"]
-    - mpich-mpicxx  # [mpi == "mpich"]
     - libopenblas
     - lapack
     - mpi4py

setup.py

@@ -92,7 +92,7 @@ def get_mpi_flags():
 
 setup(
     name="funtofem",
-    version="0.3.3",
+    version="0.3.6",
     description="Aerothermoelastic coupling framework and transfer schemes",
     author="Graeme J. Kennedy",
     author_email="graeme.kennedy@ae.gatech.edu",