sortperm with dims #2308

xaellison · 2024-03-31T17:37:49Z

Adds sortperm with dims kwarg (and bitonicsort with dims) to solve #2061

maleadt · 2024-04-01T06:49:10Z

src/sorting.jl

+    return extraneous_block(vals[1], dims)
+end
+
+# methods are defined for Val{1} because using view has 2x speed penalty for 1D arrays


We could probably speed up view by returning a CuDeviceArray when possible, just like we do with CuArray

Are you suggesting a change here or is this an idea for a separate change in the repo?

A separate change.

maleadt · 2024-04-01T06:49:52Z

Nice! So we only use quicksort now for partialsort!?

xaellison · 2024-04-01T14:47:34Z

Nice! So we only use quicksort now for partialsort!?

That's right. However, some preliminary benchmarking suggests bitonic sort is faster than partialsort for comparable input. Maybe we want to use bitonic for everything? This would also let us add methods for partialsortperm (even though they would just be doing a full sortperm)

maleadt · 2024-04-02T14:22:53Z

Maybe we want to use bitonic for everything?

I'd be in favor, also because I haven't implemented the new version of dynamic parallelism yet.

src/sorting.jl

maleadt

LGTM, thanks!

src/sorting.jl

maleadt · 2024-04-16T09:54:25Z

Some of the kernel launches added here exceed device resources, e.g., during this CI run: https://buildkite.com/julialang/cuda-dot-jl/builds/4942#018ee5fc-7926-4b0a-a855-11039bda2b72

base/sorting: Error During Test at /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/test/base/sorting.jl:313
  Test threw exception
  Expression: check_sort!(Int32, (2, 2, 50000); dims = 3, rev = true)
  CUDA error: too many resources requested for launch (code 701, ERROR_LAUNCH_OUT_OF_RESOURCES)
  Stacktrace:
    [1] throw_api_error(res::CUDA.cudaError_enum)
      @ CUDA /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/lib/cudadrv/libcuda.jl:30
    [2] check
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/lib/cudadrv/libcuda.jl:37 [inlined]
    [3] cuLaunchKernel
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/lib/utils/call.jl:30 [inlined]
    [4] #930
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/lib/cudadrv/execution.jl:66 [inlined]
    [5] macro expansion
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/lib/cudadrv/execution.jl:33 [inlined]
    [6] macro expansion
      @ ./none:0 [inlined]
    [7] pack_arguments(::CUDA.var"#930#931"{Bool, Int64, CuStream, CuFunction, CuDim3, CuDim3}, ::CUDA.KernelState, ::CuDeviceArray{Int32, 3, 1}, ::Int32, ::Int32, ::Int32, ::Int32)
      @ CUDA ./none:0
    [8] launch(::CuFunction, ::CUDA.KernelState, ::CuDeviceArray{Int32, 3, 1}, ::Int32, ::Int32, ::Int32, ::Int32; blocks::Tuple{Int64, Int64, Int64}, threads::Tuple{Int64, Int64}, cooperative::Bool, shmem::Int64, stream::CuStream)
      @ CUDA /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/lib/cudadrv/execution.jl:59
    [9] launch
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/lib/cudadrv/execution.jl:52 [inlined]
   [10] #936
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/lib/cudadrv/execution.jl:175 [inlined]
   [11] macro expansion
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/lib/cudadrv/execution.jl:135 [inlined]
   [12] macro expansion
      @ ./none:0 [inlined]
   [13] convert_arguments
      @ ./none:0 [inlined]
   [14] #cudacall#935
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/lib/cudadrv/execution.jl:177 [inlined]
   [15] cudacall
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/lib/cudadrv/execution.jl:173 [inlined]
   [16] macro expansion
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/src/compiler/execution.jl:266 [inlined]
   [17] macro expansion
      @ ./none:0 [inlined]
   [18] call(::CUDA.HostKernel{typeof(CUDA.BitonicSortImpl.comparator_small_kernel), Tuple{CuDeviceArray{Int32, 3, 1}, Int32, Int32, Int32, Int32, typeof(identity), typeof(isless), Val{true}, Val{3}}}, ::CuDeviceArray{Int32, 3, 1}, ::Int32, ::Int32, ::Int32, ::Int32, ::typeof(identity), ::typeof(isless), ::Val{true}, ::Val{3}; call_kwargs::@Kwargs{threads::Tuple{Int64, Int64}, blocks::Tuple{Int64, Int64, Int64}, shmem::Int64})
      @ CUDA ./none:0
   [19] call
      @ ./none:0 [inlined]
   [20] (::CUDA.HostKernel{typeof(CUDA.BitonicSortImpl.comparator_small_kernel), Tuple{CuDeviceArray{Int32, 3, 1}, Int32, Int32, Int32, Int32, typeof(identity), typeof(isless), Val{true}, Val{3}}})(::CuArray{Int32, 3, CUDA.Mem.DeviceBuffer}, ::Int32, ::Int32, ::Int32, ::Int32, ::Function, ::Function, ::Val{true}, ::Val{3}; threads::Tuple{Int64, Int64}, blocks::Tuple{Int64, Int64, Int64}, kwargs::@Kwargs{shmem::Int64})
      @ CUDA /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/src/compiler/execution.jl:389
   [21] bitonic_sort!(c::CuArray{Int32, 3, CUDA.Mem.DeviceBuffer}; by::Function, lt::Function, rev::Bool, dims::Int64)
      @ CUDA.BitonicSortImpl /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/src/sorting.jl:948
   [22] bitonic_sort!
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/src/sorting.jl:902 [inlined]
   [23] #sort!#1224
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/src/sorting.jl:988 [inlined]
   [24] sort!
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/src/sorting.jl:987 [inlined]
   [25] #sort!#1225
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/src/sorting.jl:992 [inlined]
   [26] check_sort!(T::Type, N::Tuple{Int64, Int64, Int64}, f::Function; kwargs::@Kwargs{dims::Int64, rev::Bool})
      @ Main /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/test/base/sorting.jl:198
   [27] check_sort!
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/test/base/sorting.jl:196 [inlined]
   [28] macro expansion
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/test/base/sorting.jl:313 [inlined]
   [29] macro expansion
      @ ~/.cache/julia-buildkite-plugin/julia_installs/bin/linux/x64/1.10/julia-1.10-latest-linux-x86_64/share/julia/stdlib/v1.10/Test/src/Test.jl:669 [inlined]
   [30] macro expansion
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/test/base/sorting.jl:313 [inlined]
   [31] macro expansion
      @ ~/.cache/julia-buildkite-plugin/julia_installs/bin/linux/x64/1.10/julia-1.10-latest-linux-x86_64/share/julia/stdlib/v1.10/Test/src/Test.jl:1577 [inlined]
   [32] macro expansion
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/test/base/sorting.jl:283 [inlined]
   [33] macro expansion
      @ ~/.cache/julia-buildkite-plugin/julia_installs/bin/linux/x64/1.10/julia-1.10-latest-linux-x86_64/share/julia/stdlib/v1.10/Test/src/Test.jl:1577 [inlined]
   [34] top-level scope
      @ /var/lib/buildkite-agent/builds/gpuci-16/julialang/cuda-dot-jl/test/base/sorting.jl:281

xaellison marked this pull request as ready for review April 1, 2024 03:04

maleadt reviewed Apr 1, 2024

View reviewed changes

Alex Ellison and others added 6 commits April 6, 2024 14:58

sortperm with dims

47f00bc

delete view_along_dims methods

f52dc42

restore with fixed signatures

380d2ce

dont test sortperm dims below j1.9

781425b

free speed

6e95a13

partialsort by either alg

10f430e

xaellison force-pushed the ae/sortperm_dims branch from 54a5ff9 to 10f430e Compare April 6, 2024 18:58

Alex Ellison added 2 commits April 6, 2024 16:35

dispatch fix: locally passes 1.8 and 1.10

3de239a

reduce resources needed for heisenbug test case

555b5db

xaellison requested a review from maleadt April 8, 2024 12:08

maleadt reviewed Apr 8, 2024

View reviewed changes

src/sorting.jl Outdated Show resolved Hide resolved

maleadt approved these changes Apr 8, 2024

View reviewed changes

src/sorting.jl Outdated Show resolved Hide resolved

Clean-ups and formatting.

6f5fdd0

maleadt added enhancement New feature or request cuda array Stuff about CuArray. labels Apr 9, 2024

maleadt linked an issue Apr 9, 2024 that may be closed by this pull request

sortperm fails with dims keyword #2061

Closed

maleadt merged commit b3e1bdf into JuliaGPU:master Apr 9, 2024
1 check was pending

maleadt mentioned this pull request Apr 16, 2024

Bitonic sort exceeds launch resources #2331

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

sortperm with dims #2308

sortperm with dims #2308

xaellison commented Mar 31, 2024 •

edited

Loading

maleadt Apr 1, 2024

xaellison Apr 1, 2024

maleadt Apr 2, 2024

maleadt commented Apr 1, 2024

xaellison commented Apr 1, 2024

maleadt commented Apr 2, 2024

maleadt left a comment

maleadt commented Apr 16, 2024

sortperm with dims #2308

sortperm with dims #2308

Conversation

xaellison commented Mar 31, 2024 • edited Loading

maleadt Apr 1, 2024

Choose a reason for hiding this comment

xaellison Apr 1, 2024

Choose a reason for hiding this comment

maleadt Apr 2, 2024

Choose a reason for hiding this comment

maleadt commented Apr 1, 2024

xaellison commented Apr 1, 2024

maleadt commented Apr 2, 2024

maleadt left a comment

Choose a reason for hiding this comment

maleadt commented Apr 16, 2024

xaellison commented Mar 31, 2024 •

edited

Loading