fix: Update numpy deprecation of product and test dependency issues #38
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cssherman
changed the title
|
@rrsettgast - it looks like this fixed the deprecation issue on the CI machine |
cssherman
commented
Sep 3, 2024
Comment on lines
+36
to
+37
| ta = np.ascontiguousarray( np.squeeze( ta ) ) | ||
| tb = np.ascontiguousarray( np.squeeze( tb ) ) |
There was a problem hiding this comment.
I think that the issue we ran into was due to these time vectors changing shape from (N,) to (N, 1) was the issue that triggered the interpolation issue.
cssherman
commented
Sep 4, 2024
| xc = np.reshape( xa, ( N[ 0 ], S ) ) | ||
| xd = np.zeros( ( len( tb ), S ) ) | ||
| for ii in range( S ): | ||
| xd[ :, ii ] = interp1d( ta, xc[ :, ii ] )( tb ) | ||
| xd[ :, ii ] = interp1d( ta, xc[ :, ii ], bounds_error=False, fill_value='extrapolate' )( tb ) |
There was a problem hiding this comment.
It's often not great, but I'm allowing the interpolator to extrapolate the comparison here (there will always be an error in this case due to changes in the time vector though... this is purely to check how much the curves changed if they were on the same time basis)
cssherman
commented
Sep 4, 2024
|
|
||
| if ( len( N ) == 1 ): | ||
| return interp1d( ta, xa )( tb ) | ||
| else: | ||
| # Reshape the input array so that we can work on the non-time axes | ||
| S = np.product( N[ 1: ] ) | ||
| S = np.prod( N[ 1: ] ) |
There was a problem hiding this comment.
This fixes the numpy.product deprecation
cssherman
changed the title
CusiniM
approved these changes
Sep 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Temporary testing branch: GEOS-DEV/GEOS#3328