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

Less restrictive copyto! signature for triangular matrices #54649

Merged
merged 6 commits into from
Jun 4, 2024

Conversation

jishnub
Copy link
Contributor

@jishnub jishnub commented Jun 1, 2024

On nightly, copyto!(A::T, B::T) where {T<:UpperTriangular} checks for the types to be identical. This is overly restrictive, as we only need to check that they are both UpperTriangular. This PR relaxes this, which provides a significant performance boost for mismatched types.

julia> using LinearAlgebra

julia> A = UpperTriangular(rand(200,200)); B = UpperTriangular(view(rand(200,200),:,:));

julia> @btime copyto!($A, $B);
  44.878 μs (0 allocations: 0 bytes) # nightly v"1.12.0-DEV.641" 
  5.658 μs (0 allocations: 0 bytes) # this PR

This PR also changes the behavior when the source and the destination don't have the same size, in which case, copyto! should carry out a linear copy and not a Cartesian one, as per its docstring. The previous behavior may be obtained by calling

copyto!(A, CartesianIndices(B), B, CartesianIndices(B))

This change would mean that certain operations that used to work would error now, e.g.:

julia> A = UpperTriangular(zeros(3,3)); B = UpperTriangular(rand(2,2));

julia> copyto!(A, B)
ERROR: ArgumentError: cannot set index in the upper triangular part (3, 1) of an UpperTriangular matrix to a nonzero value (0.6898709830945821)

whereas this used to carry out a Cartesian copy previously.

@jishnub jishnub added the linear algebra Linear algebra label Jun 1, 2024
@jishnub jishnub added the backport 1.11 Change should be backported to release-1.11 label Jun 3, 2024
@jishnub
Copy link
Contributor Author

jishnub commented Jun 3, 2024

This should be backported after #54631, as it fixes a bug in the error message that was introduced in that PR.

@jishnub jishnub merged commit b8e714d into master Jun 4, 2024
7 checks passed
@jishnub jishnub deleted the jishnub/copytotriangular branch June 4, 2024 08:54
@KristofferC KristofferC mentioned this pull request Jun 4, 2024
60 tasks
@KristofferC
Copy link
Member

KristofferC commented Jun 7, 2024

This seems to have some conflicts with e.g. #52730. I backported the error message fix at least.

@KristofferC
Copy link
Member

CI errored with that.

 Expression: A1c[i, j] = 1
Expected: ArgumentError
   Thrown: MethodError
   MethodError: no method matching _struct_zero_half_str(::Type{LinearAlgebra.UnitUpperTriangular{ComplexF32, Matrix{ComplexF32}}})
The function `_struct_zero_half_str` exists, but no method is defined for this combination of argument types.

I've reverted the commit here and #54631. Feel free to push fixed up versions.

@jishnub jishnub removed the backport 1.11 Change should be backported to release-1.11 label Jun 14, 2024
KristofferC added a commit that referenced this pull request Jun 25, 2024
Backported PRs:
- [x] #54361 <!-- [LBT] Upgrade to v5.9.0 -->
- [x] #54474 <!-- Unalias source from dest in copytrito -->
- [x] #54548 <!-- Fixes for bitcast bugs with LLVM 17 / opaque pointers
-->
- [x] #54191 <!-- make `AbstractPipe` public -->
- [x] #53402 <!-- Add `jl_getaffinity` and `jl_setaffinity` -->
- [x] #53356 <!-- Rename at-scriptdir project argument to at-script and
search upwards for Project.toml -->
- [x] #54545 <!-- typeintersect: fix incorrect innervar handling under
circular env -->
- [x] #54586 <!-- Set storage class of julia globals to dllimport on
windows to avoid auto-import weirdness. Forward port of #54572 -->
- [x] #54587 <!-- Accomodate for rectangular matrices in `copytrito!`
-->
- [x] #54617 <!-- CLI: Use `GetModuleHandleExW` to locate libjulia.dll
-->
- [x] #54605 <!-- Allow libquadmath to also fail as it is not available
on all systems -->
- [x] #54634 <!-- Fix trampoline assembly for build on clang 18 on apple
silicon -->
- [x] #54635 <!-- Aggressive constprop in trevc! to stabilize triangular
eigvec -->
- [x] #54645 <!-- ensure we set the right value to gc_first_tid -->
- [x] #54554 <!-- make elsize public -->
- [x] #54648 <!-- Construct LazyString in error paths for tridiag -->
- [x] #54658 <!-- fix missing uuid check on extension when finding the
location of an extension -->
- [x] #54594 <!-- Switch to Pkg mode prompt immediately and load Pkg in
the background -->
- [x] #54669 <!-- Improve error message in inplace transpose -->
- [x] #54671 <!-- Add boundscheck in bindingkey_eq to avoid OOB access
due to data race -->
- [x] #54672 <!-- make: Fix `sed` command for LLVM libraries with no
symbol versioning -->
- [x] #54624 <!-- more precise aliasing checks for SubArray -->
- [x] #54679 <!-- 🤖 [master] Bump the Distributed stdlib from 6a07d98 to
6c7cdb5 -->
- [x] #54604 <!-- Fix tbaa annotation on union selector bytes inside of
structs -->
- [x] #54690 <!-- Fix assertion/crash when optimizing function with dead
basic block -->
- [x] #54704 <!-- LazyString in reinterpretarray error messages -->
- [x] #54718 <!-- fix prepend StackOverflow issue -->
- [x] #54674 <!-- Reimplement dummy pkg prompt as standard prompt -->
- [x] #54737 <!-- LazyString in interpolated error messages involving
types -->
- [x] #54642 <!-- Document GenericMemory and AtomicMemory -->
- [x] #54713 <!-- make: use `readelf` for LLVM symbol version detection
-->
- [x] #54760 <!-- REPL: improve prompt! async function handler -->
- [x] #54606 <!-- fix double-counting and non-deterministic results in
`summarysize` -->
- [x] #54759 <!-- REPL: Fully populate the dummy Pkg prompt -->
- [x] #54702 <!-- lowering: Recognize argument destructuring inside
macro hygiene -->
- [x] #54678 <!-- Don't let setglobal! implicitly create bindings -->
- [x] #54730 <!-- Fix uuidkey of exts in fast path of `require_stdlib`
-->
- [x] #54765 <!-- Handle no-postdominator case in finalizer pass -->
- [x] #54591 <!-- Don't expose guard pages to malloc_stack API consumers
-->
- [x] #54755 <!-- [TOML] remove Dates hack, replace with explicit usage
-->
- [x] #54721 <!-- add try/catch around scheduler to reset sleep state
-->
- [x] #54631 <!-- Avoid concatenating LazyString in setindex! for
triangular matrices -->
- [x] #54322 <!-- effects: add new `@consistent_overlay` macro -->
- [x] #54785
- [x] #54865
- [x] #54815
- [x] #54795
- [x] #54779
- [x] #54837 

Contains multiple commits, manual intervention needed:
- [ ] #52694 <!-- Reinstate similar for AbstractQ for backward
compatibility -->
- [ ] #54649 <!-- Less restrictive copyto! signature for triangular
matrices -->

Non-merged PRs with backport label:
- [ ] #54779 <!-- make recommendation clearer on manifest version
mismatch -->
- [ ] #54739 <!-- finish implementation of upgradable stdlibs -->
- [ ] #54738 <!-- serialization: fix relocatability bug -->
- [ ] #54574 <!-- Make ScopedValues public -->
- [ ] #54457 <!-- Make `String(::Memory)` copy -->
- [ ] #53957 <!-- tweak how filtering is done for what packages should
be precompiled -->
- [ ] #53452 <!-- RFC: allow Tuple{Union{}}, returning Union{} -->
- [ ] #53286 <!-- Raise an error when using `include_dependency` with
non-existent file or directory -->
- [ ] #51479 <!-- prevent code loading from lookin in the versioned
environment when building Julia -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
linear algebra Linear algebra
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants