Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/nanobind' into nanobind-order
Browse files Browse the repository at this point in the history
  • Loading branch information
janbridley committed Oct 28, 2024
2 parents d5e0abf + 25440d5 commit 211632e
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
push:
branches:
- "main"
- "nanobind"
- "next"
tags:
- "*"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
push:
branches:
- "main"
- "nanobind"
- "next"

workflow_dispatch:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/style_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
push:
branches:
- "main"
- "nanobind"

workflow_dispatch:

Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/update-conda-lockfiles.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Update conda lockfiles

on:
schedule:
- cron: '0 12 1 * *'

workflow_dispatch:

jobs:
update:
uses: glotzerlab/workflows/.github/workflows/update-conda-lockfiles.yaml@ea2e25d07af862a1c696a932c2bd6b242d142049 # 0.2.0
secrets: inherit
with:
branch: main
path: .github/workflows/env-files
4 changes: 1 addition & 3 deletions doc/source/reference/credits.rst
Original file line number Diff line number Diff line change
Expand Up @@ -405,11 +405,9 @@ Philipp Schönhöfer
* Contributed code, design, documentation, and testing for ``freud.locality.FilterRAD`` class.

Suraj Kannur

* Ported ``Interface`` to pure python with Corwin Kerr.

Trevor Teague
Kate Jensen
Jen Bradley

Source code
-----------
Expand Down
4 changes: 2 additions & 2 deletions freud/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def generate_system(self, num_replicas=1, scale=1, sigma_noise=0, seed=None):
if isinstance(n_repeats, int):
N = n_repeats ** dimension
else:
N = np.product(n_repeats)
N = np.prod(n_repeats)
indices = np.repeat(np.arange(len(uc.basis_positions)), N)
Below is an example of expanding basis position properties (in this
Expand All @@ -92,7 +92,7 @@ def generate_system(self, num_replicas=1, scale=1, sigma_noise=0, seed=None):
>>> uc = freud.data.UnitCell.bcc()
>>> n_repeats = (10, 5, 4)
>>> system = uc.generate_system(n_repeats)
>>> N = np.product(n_repeats)
>>> N = np.prod(n_repeats)
>>> indices = np.repeat(np.arange(len(uc.basis_positions)), N)
>>> # An array of types for all points
>>> types = np.array([0, 1])[indices]
Expand Down
2 changes: 1 addition & 1 deletion freud/diffraction.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,7 @@ cdef class DiffractionPattern(_Compute):
vmax = 0.7 * self.N_points

norm = matplotlib.colors.LogNorm(vmin=vmin, vmax=vmax)
cmap = matplotlib.cm.get_cmap(cmap)
cmap = matplotlib.colormaps[cmap]
image = cmap(norm(np.clip(self.diffraction, vmin, vmax)))
return (image * 255).astype(np.uint8)

Expand Down

0 comments on commit 211632e

Please sign in to comment.