Skip to content
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.

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

Revert "add unsetindex support to more copyto methods (#51760)" #54332

Merged
merged 4 commits into from
May 13, 2024

Conversation

KristofferC
Copy link
Member

@KristofferC KristofferC commented May 2, 2024

This reverts commit f0a28e9.

This introduced in general a try catch inside the inner loop for copyto! and it also has performance regression in other cases #53430.

Since this was added without any tests and "is not-quite-public API" it seems easiest to just revert it.
This was added for Memory-to-Array and vice versa but dedicated methods could be added for that if it is desirable

Fixes #53430, #52070

@KristofferC KristofferC added the backport 1.11 Change should be backported to release-1.11 label May 2, 2024
@vtjnash
Copy link
Member

vtjnash commented May 2, 2024

I think you must have this for Memory-to-Array and Array-to-Memory to work correctly. Therefore, shouldn't this only revert on the release backports branch target?

@KristofferC
Copy link
Member Author

KristofferC commented May 2, 2024

Therefore, shouldn't this only revert on the release backports branch target?

The regressions are there on master as well. The original PR added no tests and seemed to be more of an off-hand thing. If this PR starts failing some tests it should be possible to add it back restricted to Memory + Array.

@vtjnash
Copy link
Member

vtjnash commented May 2, 2024

It looks like this revert will re-open #45125

@KristofferC
Copy link
Member Author

Also fixes #52070

@KristofferC
Copy link
Member Author

It looks like this revert will re-open #45125

That's not a problem because it is already open 🤣

@KristofferC
Copy link
Member Author

Also, the triage opinion there seems to have been (quoting Jeff):

I believe this was added for a use case in the compiler. I would prefer the compiler to use some different approach if possible, and roll this back, since it is unnerving for it to be inconsistent like this.

Which seems to indicate that there should be less of this, not more.

@vtjnash
Copy link
Member

vtjnash commented May 2, 2024

Well, it is at least less inconsistent currently on master

@jishnub
Copy link
Contributor

jishnub commented May 2, 2024

#53383 may need to be reverted as well along with this, as it added tests for the copyto! branches

@KristofferC KristofferC mentioned this pull request May 6, 2024
59 tasks
@KristofferC
Copy link
Member Author

I reverted that as well. I don't think that it is at all established that the #undef "support" should be extended everywhere. The position (at least how I have understood it) is that once something gets defined it should not revert to undefined (#54332 (comment)).

@vtjnash
Copy link
Member

vtjnash commented May 7, 2024

That is a bit of a misconception, as that position only applies to struct fields and not arbitrary computations (such as getindex). We rely heavily on it being possible for other operations (on Arrays) to become undef, and nothing does or could restrict that without being a major breaking change

@KristofferC
Copy link
Member Author

Yes, as said in #45125 (comment) it might be better for the compiler to use some other method for this than copyto!.

@vtjnash
Copy link
Member

vtjnash commented May 7, 2024

I suppose, but I hate the idea of having 2 functions, where the only difference is that one is broken and the other works, where we revert the working one to the old broken one, then introduce a copy of that function that works correctly

@tecosaur tecosaur added the revert This reverts a previously merged PR. label May 9, 2024
@KristofferC
Copy link
Member Author

@jishnub, this required more reverts than ideal since some of your PRs built on this and it is hard for me to do things more fine grained than full revert of commits. Maybe you have a better idea of how to do this...

@jishnub
Copy link
Contributor

jishnub commented May 13, 2024

I don't have a better idea either. I think this is fine, as the unrelated features in those PRs shouldn't be hard to re-land.

@KristofferC
Copy link
Member Author

Alright, thanks. I'm happy that relanding those features wouldn't be too bad.

@KristofferC KristofferC merged commit 931f6de into master May 13, 2024
5 of 7 checks passed
@KristofferC KristofferC deleted the kc/revert_setindex branch May 13, 2024 18:27
jishnub added a commit that referenced this pull request May 17, 2024
…54460)

This was reverted in #54332. This
needs #54459 for the tests to
pass. Opening this now to not forget about it.
KristofferC added a commit that referenced this pull request May 28, 2024
Backported PRs:
- [x] #53665 <!-- use afoldl instead of tail recursion for tuples -->
- [x] #53976 <!-- LinearAlgebra: LazyString in interpolated error
messages -->
- [x] #54005 <!-- make `view(::Memory, ::Colon)` produce a Vector -->
- [x] #54010 <!-- Overload `Base.literal_pow` for `AbstractQ` -->
- [x] #54069 <!-- Allow PrecompileTools to see MI's inferred by foreign
abstract interpreters -->
- [x] #53750 <!-- inference correctness: fields and globals can revert
to undef -->
- [x] #53984 <!-- Profile: fix heap snapshot is valid char check -->
- [x] #54102 <!-- Explicitly compute stride in unaliascopy for SubArray
-->
- [x] #54070 <!-- Fix integer overflow in `skip(s::IOBuffer,
typemax(Int64))` -->
- [x] #54013 <!-- Support case-changes to Annotated{String,Char}s -->
- [x] #53941 <!-- Fix writing of AnnotatedChars to AnnotatedIOBuffer -->
- [x] #54137 <!-- Fix typo in docs for `partialsortperm` -->
- [x] #54129 <!-- use correct size when creating output data from an
IOBuffer -->
- [x] #54153 <!-- Fixup IdSet docstring -->
- [x] #54143 <!-- Fix `make install` from tarballs -->
- [x] #54151 <!-- LinearAlgebra: Correct zero element in
`_generic_matvecmul!` for block adj/trans -->
- [x] #54213 <!-- Add `public` statement to `Base.GC` -->
- [x] #54222 <!-- Utilize correct tbaa when emitting stores of unions.
-->
- [x] #54233 <!-- set MAX_OS_WRITE on unix -->
- [x] #54255 <!-- fix `_checked_mul_dims` in the presence of 0s and
overflow. -->
- [x] #54259 <!-- Fix typo in `readuntil` -->
- [x] #54251 <!-- fix typo in gc_mark_memory8 when chunking a large
array -->
- [x] #54276 <!-- Fix solve for complex `Hermitian` with non-vanishing
imaginary part on diagonal -->
- [x] #54248 <!-- ensure package callbacks are invoked when no valid
precompile file exists for an "auto loaded" stdlib -->
- [x] #54308 <!-- Implement eval-able AnnotatedString 2-arg show -->
- [x] #54302 <!-- Specialised substring equality for annotated strs -->
- [x] #54243 <!-- prevent `package_callbacks` to run multiple time for a
single package -->
- [x] #54350 <!-- add a precompile signature to Artifacts code that is
used by JLLs -->
- [x] #54331 <!-- correctly track freed bytes in
jl_genericmemory_to_string -->
- [x] #53509 <!-- revert moving "creating packages" from Pkg.jl -->
- [x] #54335 <!-- When accessing the data pointer for an array, first
decay it to a Derived Pointer -->
- [x] #54239 <!-- Make sure `fieldcount` constant-folds for `Tuple{...}`
-->
- [x] #54288
- [x] #54067
- [x] #53715 <!-- Add read/write specialisation for IOContext{AnnIO} -->
- [x] #54289 <!-- Rework annotation ordering/optimisations -->
- [x] #53815 <!-- create phantom task for GC threads -->
- [x] #54130 <!-- inference: handle `LimitedAccuracy` in
`handle_global_assignment!` -->
- [x] #54428 <!-- Move ConsoleLogging.jl into Base -->
- [x] #54332 <!-- Revert "add unsetindex support to more copyto methods
(#51760)" -->
- [x] #53826 <!-- Make all command-line options documented in all
related files -->
- [x] #54465 <!-- typeintersect: conservative typevar subtitution during
`finish_unionall` -->
- [x] #54514 <!-- typeintersect: followup cleanup for the nothrow path
of type instantiation -->
- [x] #54499 <!-- make `@doc x` work without REPL loaded -->
- [x] #54210 <!-- attach finalizer in `mmap` to the correct object -->
- [x] #54359 <!-- Pkg REPL: cache `pkg_mode` lookup -->

Non-merged PRs with backport label:
- [ ] #54471 <!-- Actually setup jit targets when compiling
packageimages instead of targeting only one -->
- [ ] #54457 <!-- Make `String(::Memory)` copy -->
- [ ] #54323 <!-- inference: fix too conservative effects for recursive
cycles -->
- [ ] #54322 <!-- effects: add new `@consistent_overlay` macro -->
- [ ] #54191 <!-- make `AbstractPipe` public -->
- [ ] #53957 <!-- tweak how filtering is done for what packages should
be precompiled -->
- [ ] #53882 <!-- Warn about cycles in extension precompilation -->
- [ ] #53707 <!-- Make ScopedValue public -->
- [ ] #53452 <!-- RFC: allow Tuple{Union{}}, returning Union{} -->
- [ ] #53402 <!-- Add `jl_getaffinity` and `jl_setaffinity` -->
- [ ] #53286 <!-- Raise an error when using `include_dependency` with
non-existent file or directory -->
- [ ] #52694 <!-- Reinstate similar for AbstractQ for backward
compatibility -->
- [ ] #51479 <!-- prevent code loading from lookin in the versioned
environment when building Julia -->
@KristofferC KristofferC mentioned this pull request May 29, 2024
60 tasks
@KristofferC KristofferC removed the backport 1.11 Change should be backported to release-1.11 label Jun 7, 2024
lazarusA pushed a commit to lazarusA/julia that referenced this pull request Jul 12, 2024
…#53909" (JuliaLang#54460)

This was reverted in JuliaLang#54332. This
needs JuliaLang#54459 for the tests to
pass. Opening this now to not forget about it.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
revert This reverts a previously merged PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

copyto! does not vectorize for views with UnitRange indices
4 participants