fix int for shortcut #3461
Open
fix int for shortcut #3461
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
ilan-gold
reviewed
Feb 11, 2025
src/scanpy/preprocessing/_simple.py
Outdated
| @@ -752,6 +752,9 @@ def regress_out( | |||
| # if the regressors are not categorical and the matrix is not singular | |||
| # use the shortcut numpy_regress_out | |||
| if not variable_is_categorical and np.linalg.det(regressors.T @ regressors) != 0: | |||
| if np.issubdtype(X.dtype, np.integer): | |||
| target_dtype = np.float32 if X.dtype.itemsize <= 4 else np.float64 | |||
| X = X.astype(target_dtype) | |||
There was a problem hiding this comment.
For dense you can also do the ordering here, since you're copying anyway
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3461 +/- ##
==========================================
- Coverage 75.44% 75.43% -0.01%
==========================================
Files 113 113
Lines 13250 13253 +3
==========================================
+ Hits 9997 9998 +1
- Misses 3253 3255 +2
|
ilan-gold
reviewed
Feb 11, 2025
| @@ -754,7 +754,7 @@ def regress_out( | |||
| if not variable_is_categorical and np.linalg.det(regressors.T @ regressors) != 0: | |||
| if np.issubdtype(X.dtype, np.integer): | |||
| target_dtype = np.float32 if X.dtype.itemsize <= 4 else np.float64 | |||
| X = X.astype(target_dtype) | |||
| X = X.astype(target_dtype, order="C") | |||
There was a problem hiding this comment.
But this could also apply to sparse? And we don't want the argument then, no? https://docs.scipy.org/doc/scipy/reference/generated/scipy.sparse.csr_matrix.astype.html nothing here about order
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.
Fixes a bug where the regress_out short cut would error for integer dyte