Merge pull request #82 from inducer/github-conda-ci-with-mpi4py

Github Conda CI: Run with mpi4py
inducer · Nov 18, 2020 · 2c33c8d · 2c33c8d
2 parents 535dbce + 6d815e5
commit 2c33c8d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,12 +30,15 @@ jobs:
         -   name: "Main Script"
             run: |
                 sudo apt update
-                sudo apt install octave
+                sudo apt install octave openmpi-bin libopenmpi-dev
 
                 CONDA_ENVIRONMENT=.test-conda-env-py3.yml
                 export MPLBACKEND=Agg
-                curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
-                . ./build-and-test-py-project-within-miniconda.sh
+                curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh
+                . ./ci-support.sh
+                build_py_project_in_conda_env
+                with_echo python -m pip install mpi4py
+                test_py_project
 
     firedrake:
         name: Pytest Firedrake

diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml
@@ -7,6 +7,7 @@ dependencies:
 - python=3
 - git
 - numpy
+- libhwloc=1
 - pocl
 - mako
 - pyopencl

diff --git a/meshmode/discretization/connection/projection.py b/meshmode/discretization/connection/projection.py
@@ -165,16 +165,16 @@ def kproj():
         def keval():
             return make_loopy_program([
                 "{[iel]: 0 <= iel < nelements}",
-                "{[idof]: 0 <= idof < n_to_nodes}"
+                "{[idof]: 0 <= idof < n_to_nodes}",
+                "{[ibasis]: 0 <= ibasis < n_to_nodes}"
                 ],
                 """
                     result[iel, idof] = result[iel, idof] + \
-                            coefficients[iel, ibasis] * basis[idof]
+                        sum(ibasis, vdm[idof, ibasis] * coefficients[iel, ibasis])
                 """,
                 [
                     lp.GlobalArg("coefficients", None,
                         shape=("nelements", "n_to_nodes")),
-                    lp.ValueArg("ibasis", np.int32),
                     "..."
                     ],
                 name="conn_evaluate_knl")
@@ -210,16 +210,13 @@ def keval():
         # evaluate at unit_nodes to get the vector on to_discr
         result = self.to_discr.zeros(actx, dtype=ary.entry_dtype)
         for igrp, grp in enumerate(self.to_discr.groups):
-            for ibasis, basis_fn in enumerate(grp.basis()):
-                basis = actx.from_numpy(
-                        basis_fn(grp.unit_nodes).flatten())
-
-                actx.call_loopy(
-                        keval(),
-                        ibasis=ibasis,
-                        result=result[grp.index],
-                        basis=basis,
-                        coefficients=c[grp.index])
+            from modepy import vandermonde
+            vdm = actx.from_numpy(vandermonde(grp.basis(), grp.unit_nodes))
+            actx.call_loopy(
+                    keval(),
+                    result=result[grp.index],
+                    vdm=vdm,
+                    coefficients=c[grp.index])
 
         return result