Merge pull request #10 from minrk/variants

add mpi variants
conda-forge · Mar 4, 2018 · 5c4366c · 5c4366c
2 parents 23aec7f + 23aef0b
commit 5c4366c
Show file tree

Hide file tree

Showing 7 changed files with 110 additions and 21 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,10 +1,11 @@
 version: 2
 
 jobs:
-  build__CONDA_PY_27:
+  build__MPI_VARIANT_mpich__CONDA_PY_27:
     working_directory: ~/test
     machine: true
     environment:
+      - MPI_VARIANT: "mpich"
       - CONDA_PY: "27"
     steps:
       - checkout
@@ -18,14 +19,62 @@ jobs:
       - run:
           name: Print conda-build environment variables
           command: |
+            echo "MPI_VARIANT=${MPI_VARIANT}"
             echo "CONDA_PY=${CONDA_PY}"
       - run:
           # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
           command: ./ci_support/run_docker_build.sh
-  build__CONDA_PY_35:
+  build__MPI_VARIANT_openmpi__CONDA_PY_27:
     working_directory: ~/test
     machine: true
     environment:
+      - MPI_VARIANT: "openmpi"
+      - CONDA_PY: "27"
+    steps:
+      - checkout
+      - run:
+          name: Fast finish outdated PRs and merge PRs
+          command: |
+            ./ci_support/fast_finish_ci_pr_build.sh
+            ./ci_support/checkout_merge_commit.sh
+      - run:
+          command: docker pull condaforge/linux-anvil
+      - run:
+          name: Print conda-build environment variables
+          command: |
+            echo "MPI_VARIANT=${MPI_VARIANT}"
+            echo "CONDA_PY=${CONDA_PY}"
+      - run:
+          # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
+          command: ./ci_support/run_docker_build.sh
+  build__MPI_VARIANT_mpich__CONDA_PY_35:
+    working_directory: ~/test
+    machine: true
+    environment:
+      - MPI_VARIANT: "mpich"
+      - CONDA_PY: "35"
+    steps:
+      - checkout
+      - run:
+          name: Fast finish outdated PRs and merge PRs
+          command: |
+            ./ci_support/fast_finish_ci_pr_build.sh
+            ./ci_support/checkout_merge_commit.sh
+      - run:
+          command: docker pull condaforge/linux-anvil
+      - run:
+          name: Print conda-build environment variables
+          command: |
+            echo "MPI_VARIANT=${MPI_VARIANT}"
+            echo "CONDA_PY=${CONDA_PY}"
+      - run:
+          # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
+          command: ./ci_support/run_docker_build.sh
+  build__MPI_VARIANT_openmpi__CONDA_PY_35:
+    working_directory: ~/test
+    machine: true
+    environment:
+      - MPI_VARIANT: "openmpi"
       - CONDA_PY: "35"
     steps:
       - checkout
@@ -39,14 +88,39 @@ jobs:
       - run:
           name: Print conda-build environment variables
           command: |
+            echo "MPI_VARIANT=${MPI_VARIANT}"
+            echo "CONDA_PY=${CONDA_PY}"
+      - run:
+          # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
+          command: ./ci_support/run_docker_build.sh
+  build__MPI_VARIANT_mpich__CONDA_PY_36:
+    working_directory: ~/test
+    machine: true
+    environment:
+      - MPI_VARIANT: "mpich"
+      - CONDA_PY: "36"
+    steps:
+      - checkout
+      - run:
+          name: Fast finish outdated PRs and merge PRs
+          command: |
+            ./ci_support/fast_finish_ci_pr_build.sh
+            ./ci_support/checkout_merge_commit.sh
+      - run:
+          command: docker pull condaforge/linux-anvil
+      - run:
+          name: Print conda-build environment variables
+          command: |
+            echo "MPI_VARIANT=${MPI_VARIANT}"
             echo "CONDA_PY=${CONDA_PY}"
       - run:
           # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
           command: ./ci_support/run_docker_build.sh
-  build__CONDA_PY_36:
+  build__MPI_VARIANT_openmpi__CONDA_PY_36:
     working_directory: ~/test
     machine: true
     environment:
+      - MPI_VARIANT: "openmpi"
       - CONDA_PY: "36"
     steps:
       - checkout
@@ -60,6 +134,7 @@ jobs:
       - run:
           name: Print conda-build environment variables
           command: |
+            echo "MPI_VARIANT=${MPI_VARIANT}"
             echo "CONDA_PY=${CONDA_PY}"
       - run:
           # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
@@ -69,6 +144,9 @@ workflows:
   version: 2
   build_and_test:
     jobs:
-      - build__CONDA_PY_27
-      - build__CONDA_PY_35
-      - build__CONDA_PY_36
+      - build__MPI_VARIANT_mpich__CONDA_PY_27
+      - build__MPI_VARIANT_openmpi__CONDA_PY_27
+      - build__MPI_VARIANT_mpich__CONDA_PY_35
+      - build__MPI_VARIANT_openmpi__CONDA_PY_35
+      - build__MPI_VARIANT_mpich__CONDA_PY_36
+      - build__MPI_VARIANT_openmpi__CONDA_PY_36
diff --git a/.travis.yml b/.travis.yml
@@ -9,9 +9,12 @@ osx_image: xcode6.4
 env:
   matrix:
 
-    - CONDA_PY=27
-    - CONDA_PY=35
-    - CONDA_PY=36
+    - MPI_VARIANT=mpich  CONDA_PY=27
+    - MPI_VARIANT=openmpi  CONDA_PY=27
+    - MPI_VARIANT=mpich  CONDA_PY=35
+    - MPI_VARIANT=openmpi  CONDA_PY=35
+    - MPI_VARIANT=mpich  CONDA_PY=36
+    - MPI_VARIANT=openmpi  CONDA_PY=36
   global:
     # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.
     - secure: "ZHBOqxSM6PnI0tg+5SKjXMTz/HsMsgKlS5DPiett2GgaWEyps+sjuRv7J7DxqUa53r4CKfH96rLZtbSogFa7mUAkv6ZKd7mvMAbiovSJarVBi4qb7fHCuDW2KDYPc2muUKY3FxRohdesX/S0WAWiKtwqJq5khoEYMhuJxEimz2c2mish7il30QECPSot3bt4JMUktL3lm3jdSniGdQc0IMwXj2lMTMXv470NuI1JriVvHxQmrlUzVS0r+NhigHWWdkEXyXsA91I+hUyzUvcoBDwlypWmw88sGPp0Zr+WgwG5fy/9HG8lLkOsVT2NRl6DRY1z3/dpSaolcLkRx2oeRqFSEnWRXQ1IsLp0dJOzEr/OZbY57pD2i7wbAsdZSl5+/MvP0YH5vXuk5BtSUVfF/EBXPY/4DubLiStGAT0uSV22WUT6lVS60DFAKyinc+IAGPzWFvR6vK4X8icTBpeJh3eAonEBBoFiLDaoIM+90zY5NJdOAASZ/PNyXk0/0k+uMA8Ghh3eIlIsYlf61zKL5H+AZGaOupZZNaNQikHo7EliRQjNWE84pJNEN0cem9htF6dqzJkf/uCDiL5sjog6pxpzy6GpxAbVnOmNfKO8chGhMsHM65IXqpE36Y6/8PQaBqdno3omRKPlt01vrZxWJ5m5+SPlCK4LoWa5flsxouo="

diff --git a/README.md b/README.md
@@ -1,13 +1,13 @@
 About mpi4py
 ============
 
-Home: http://pythonhosted.org/mpi4py/
+Home: http://mpi4py.scipy.org/
 
 Package license: BSD 2-clause
 
 Feedstock license: BSD 3-Clause
 
-Summary: Provides bindings of the MPI standard for Python
+Summary: Python bindings for MPI
 
 MPI for Python provides bindings of the Message Passing Interface (MPI)
 standard for the Python programming language, allowing any Python program

diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh
@@ -40,6 +40,7 @@ cat << EOF | docker run -i \
                         -v "${RECIPE_ROOT}":/recipe_root \
                         -v "${FEEDSTOCK_ROOT}":/feedstock_root \
                         -e HOST_USER_ID="${HOST_USER_ID}" \
+                        -e MPI_VARIANT="${MPI_VARIANT}" \
                         -e CONDA_PY="${CONDA_PY}" \
                         -a stdin -a stdout -a stderr \
                         condaforge/linux-anvil \

diff --git a/conda-forge.yml b/conda-forge.yml
@@ -1,3 +1,6 @@
+matrix:
+  - [[MPI_VARIANT, 'openmpi']]
+  - [[MPI_VARIANT, 'mpich']]
 travis:
   secure:
     BINSTAR_TOKEN: ZHBOqxSM6PnI0tg+5SKjXMTz/HsMsgKlS5DPiett2GgaWEyps+sjuRv7J7DxqUa53r4CKfH96rLZtbSogFa7mUAkv6ZKd7mvMAbiovSJarVBi4qb7fHCuDW2KDYPc2muUKY3FxRohdesX/S0WAWiKtwqJq5khoEYMhuJxEimz2c2mish7il30QECPSot3bt4JMUktL3lm3jdSniGdQc0IMwXj2lMTMXv470NuI1JriVvHxQmrlUzVS0r+NhigHWWdkEXyXsA91I+hUyzUvcoBDwlypWmw88sGPp0Zr+WgwG5fy/9HG8lLkOsVT2NRl6DRY1z3/dpSaolcLkRx2oeRqFSEnWRXQ1IsLp0dJOzEr/OZbY57pD2i7wbAsdZSl5+/MvP0YH5vXuk5BtSUVfF/EBXPY/4DubLiStGAT0uSV22WUT6lVS60DFAKyinc+IAGPzWFvR6vK4X8icTBpeJh3eAonEBBoFiLDaoIM+90zY5NJdOAASZ/PNyXk0/0k+uMA8Ghh3eIlIsYlf61zKL5H+AZGaOupZZNaNQikHo7EliRQjNWE84pJNEN0cem9htF6dqzJkf/uCDiL5sjog6pxpzy6GpxAbVnOmNfKO8chGhMsHM65IXqpE36Y6/8PQaBqdno3omRKPlt01vrZxWJ5m5+SPlCK4LoWa5flsxouo=

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,7 +1,8 @@
-{% set build = 0 %}
+{% set build = 1 %}
 {% set version = '3.0.0' %}
 {% set sha256 = 'b457b02d85bdd9a4775a097fac5234a20397b43e073f14d9e29b6cd78c68efd7' %}
-{% set mpi = 'mpich 3.2.*' %}
+{% set mpi = os.environ.get('MPI_VARIANT', 'mpich') %}
+{% set mpi_version = {'mpich': '3.2.*', 'openmpi': '3.0.*'}[mpi] %}
 
 package:
   name: mpi4py
@@ -14,25 +15,22 @@ source:
 
 build:
   number: {{ build }}
+  string: {{ mpi }}_{{ build }}
   script: pip install --no-deps .
   # TODO: build with msmpi when it works
   skip: true  # [win]
 
 requirements:
   build:
+    - toolchain
     - python
     - pip
-    - {{ mpi }}  # [unix]
+    - {{ mpi }} {{ mpi_version }}  # [unix]
   run:
     - python
-    - {{ mpi }}  # [unix]
-# features:
-#   - {{ mpi.partition(' ')[0] }}  # [unix]
+    - {{ mpi }} {{ mpi_version }}  # [unix]
 
-test:
-  imports:
-    - mpi4py
-    - mpi4py.MPI
+test: {}
 
 about:
   home: http://mpi4py.scipy.org/

diff --git a/recipe/run_test.sh b/recipe/run_test.sh
@@ -0,0 +1,6 @@
+export OMPI_MCA_plm=isolated
+export OMPI_MCA_btl_vader_single_copy_mechanism=none
+export OMPI_MCA_rmaps_base_oversubscribe=yes
+
+python -c 'import mpi4py'
+python -c 'import mpi4py.MPI'