Skip to content

Fix incompatibilities with NumPy 2.0#1107

Merged
bcoconni merged 2 commits intoJSBSim-Team:masterfrom
bcoconni:NumPy2
Jun 29, 2024
Merged

Fix incompatibilities with NumPy 2.0#1107
bcoconni merged 2 commits intoJSBSim-Team:masterfrom
bcoconni:NumPy2

Conversation

@bcoconni
Copy link
Member

@bcoconni bcoconni commented Jun 29, 2024

Following the release of Numpy 2.0, the function numpy.mat has been deprecated. It is recommended by the Numpy 2.0 migration guide to replace numpy.mat by numpy.asmatrix. However:

  • We want to support Numpy 1.xx and it is unclear in the documentation when the function np.asmatrix has been introduced. In particular, it might not be supported for older versions of Numpy.
  • We have been using np.matrix for the last 6 years (see below) and NumPy 1.xx never complained.

jsbsim/tests/TestGndReactions.py

Lines 90 to 95 in e33e184

Tb2l = np.matrix([[ math.cos(theta), 0.0, math.sin(theta)],
[ 0.0, 1.0, 0.0],
[-math.sin(theta), 0.0, math.cos(theta)]])
Ts2b = np.matrix([[-1.0, 0.0, 0.0],
[ 0.0, 1.0, 0.0],
[ 0.0, 0.0, -1.0]])

jsbsim/tests/TestFunctions.py

Lines 272 to 280 in e33e184

Ma = np.matrix([[ math.cos(a), 0.0, math.sin(a)],
[ 0.0, 1.0, 0.0],
[ -math.sin(a), 0.0, math.cos(a)]])
Mb = np.matrix([[ math.cos(b), math.sin(b), 0.0],
[ -math.sin(b), math.cos(b), 0.0],
[ 0.0, 0.0, 1.0]])
Mc = np.matrix([[ 1.0, 0.0, 0.0],
[ 0.0, math.cos(c), -math.sin(c)],
[ 0.0, math.sin(c), math.cos(c)]])

As our CI workflow installs NumPy 2.0 by default on the MacOSX ARM64 platform, the current PR replaces all occurrences of numpy.mat by numpy.matrix to support Numpy 1.xx and 2.0.

@codecov
Copy link

codecov bot commented Jun 29, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 24.94%. Comparing base (e33e184) to head (d00a703).

Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #1107   +/-   ##
=======================================
  Coverage   24.94%   24.94%           
=======================================
  Files         170      170           
  Lines       18235    18235           
=======================================
  Hits         4548     4548           
  Misses      13687    13687

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bcoconni bcoconni merged commit c867cc7 into JSBSim-Team:master Jun 29, 2024
@bcoconni bcoconni deleted the NumPy2 branch June 29, 2024 18:10
bcoconni added a commit to bcoconni/jsbsim that referenced this pull request Jun 30, 2024
@bcoconni
Fix incompatibilities with NumPy 2.0 (JSBSim-Team#1107)
828c5b3
@bcoconni bcoconni mentioned this pull request Jun 30, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@bcoconni