Skip to content

Numpy 2.4 Fix #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
drowenhorst-nrl merged 5 commits into from
Mar 7, 2026
Merged

Numpy 2.4 Fix #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d27b489
Fix for numpy 2.4
Mar 6, 2026
aacb2cb
Prep for update.
Mar 6, 2026
fa3a53e
Ray issues?
Mar 6, 2026
593bc70
Dave issues
Mar 6, 2026
ac819a0
Get oldest working
Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ jobs:
python-version: ['3.10', '3.11', '3.12']
include:
- os: ubuntu-latest
python-version: 3.9
DEPENDENCIES: matplotlib==3.3 numba==0.55.1 ray[default]==2.9
python-version: 3.10
DEPENDENCIES: matplotlib==3.8 numba==0.56.4 pyopencl==2023.1.2
LABEL: -oldest
steps:
- uses: actions/checkout@v6
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,20 @@ All notable changes to PyEBSDIndex will be documented in this file. The format i
on `Keep a Changelog <https://keepachangelog.com/en/1.1.0>`_.


0.3.9.2 (2026-03-06)
==================
Added
-----

Changed
-------
- Python 3.10 is new minimum required python version.

Fixed
-----
- Fixed PSO optimization for numpy 2.4 error.


0.3.9 (2026-01-26)
==================

Expand Down
2 changes: 1 addition & 1 deletion pyebsdindex/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
]
__description__ = "Python based tool for Radon based EBSD indexing"
__name__ = "pyebsdindex"
__version__ = "0.3.9.1"
__version__ = "0.3.9.2"


# Try to import only once - also will perform check that at least one GPU is found.
Expand Down
5 changes: 2 additions & 3 deletions pyebsdindex/pcopt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ def _optfunction(PC_i, indexer=None, banddat=None):
#average_fit /= npoints

result[q] = average_fit
#print(timer()-tic)
return result
return result.squeeze()


def optimize(pats, indexer, PC0=None, batch=False):
Expand Down Expand Up @@ -480,7 +479,7 @@ def updateswarmbest(self, fun2opt, pool, **kwargs):

#tic = timer()
for part_i in range(self.n_particles):
temp = self.pos[part_i, :]
temp = self.pos[part_i, :].squeeze()
val[part_i] = fun2opt(temp, **kwargs)
#print(timer()-tic)

Expand Down
3 changes: 1 addition & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"pyopencl",
],
"parallel": [
"ray[default] >= 2.9",
"ray[default] < 2.53",
# "pydantic < 2",
]
}
Expand Down Expand Up @@ -57,7 +57,6 @@
long_description_content_type="text/markdown",
classifiers=[
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
Expand Down