Skip to content

Commit

Permalink
Merge pull request openmc-dev#1823 from paulromano/gha-ubuntu-20-04
Browse files Browse the repository at this point in the history
Run CI tests on ubuntu 20.04
  • Loading branch information
pshriwise committed Apr 28, 2021
2 parents e1beda6 + e1c4743 commit a76c5a7
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env:

jobs:
main:
runs-on: ubuntu-16.04
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: [3.8]
Expand Down Expand Up @@ -95,12 +95,16 @@ jobs:
shell: bash
run: |
sudo apt -y update
sudo apt install -y libopenmpi-dev \
sudo apt install -y libmpich-dev \
libnetcdf-dev \
libpnetcdf-dev \
libhdf5-serial-dev \
libhdf5-openmpi-dev \
libhdf5-mpich-dev \
libeigen3-dev
sudo update-alternatives --set mpi /usr/bin/mpicc.mpich
sudo update-alternatives --set mpirun /usr/bin/mpirun.mpich
sudo update-alternatives --set mpi-x86_64-linux-gnu /usr/include/x86_64-linux-gnu/mpich
-
name: install
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion openmc/data/function.py
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ def functions(self, functions):


class Regions1D(EqualityMixin):
"""Piecewise composition of multiple functions.
r"""Piecewise composition of multiple functions.
This class allows you to create a callable object which is composed
of multiple other callable objects, each applying to a specific interval
Expand Down
2 changes: 1 addition & 1 deletion openmc/data/multipole.py
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,7 @@ def from_hdf5(cls, group_or_filename):

out.windows = group['windows'][()]

out.broaden_poly = group['broaden_poly'][...].astype(np.bool)
out.broaden_poly = group['broaden_poly'][...].astype(bool)
if out.broaden_poly.shape[0] != out.windows.shape[0]:
raise ValueError(err.format('broaden_poly', 'windows'))

Expand Down
2 changes: 1 addition & 1 deletion openmc/mgxs_library.py
Original file line number Diff line number Diff line change
Expand Up @@ -2060,7 +2060,7 @@ def to_hdf5(self, file):
Np = self.num_polar
Na = self.num_azimuthal

g_out_bounds = np.zeros((Np, Na, G, 2), dtype=np.int)
g_out_bounds = np.zeros((Np, Na, G, 2), dtype=int)
for p in range(Np):
for a in range(Na):
for g_in in range(G):
Expand Down
2 changes: 1 addition & 1 deletion openmc/stats/multivariate.py
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ def from_xml_element(cls, elem):
return cls(r, theta, phi, origin=origin)

class CylindricalIndependent(Spatial):
"""Spatial distribution represented in cylindrical coordinates.
r"""Spatial distribution represented in cylindrical coordinates.
This distribution allows one to specify coordinates whose :math:`r`,
:math:`\phi`, and :math:`z` components are sampled independently from
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/gha-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [[ $MPI == 'y' ]]; then

export CC=mpicc
export HDF5_MPI=ON
export HDF5_DIR=/usr/lib/x86_64-linux-gnu/hdf5/openmpi
export HDF5_DIR=/usr/lib/x86_64-linux-gnu/hdf5/mpich
pip install --no-binary=h5py h5py
fi

Expand Down

0 comments on commit a76c5a7

Please sign in to comment.