Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ steps:
build.message !~ /\[only/ &&
build.message !~ /\[skip tests\]/ &&
build.message !~ /\[skip julia\]/
timeout_in_minutes: 60
timeout_in_minutes: 90
matrix:
setup:
julia:
Expand Down Expand Up @@ -123,16 +123,12 @@ steps:
println("--- :julia: Instantiating project")
withenv("JULIA_PKG_PRECOMPILE_AUTO" => 0) do
Pkg.activate(joinpath("lib", lowercase("{{matrix.package}}")))
try
Pkg.instantiate()
catch
# if we fail to instantiate, assume that we need newer dependencies
deps = [PackageSpec(path=".")]
if "{{matrix.package}}" == "cuTensorNet"
push!(deps, PackageSpec(path="lib/cutensor"))
end
Pkg.develop(deps)

deps = [PackageSpec(path=".")]
if "{{matrix.package}}" == "cuTensorNet"
push!(deps, PackageSpec(path="lib/cutensor"))
end
Pkg.develop(deps)

Pkg.add("CUDA_Runtime_jll")
write(joinpath("lib", lowercase("{{matrix.package}}"), "LocalPreferences.toml"),
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "CUDA"
uuid = "052768ef-5323-5732-b1bb-66c8b64840ba"
version = "5.8.4"
version = "5.8.5"

[deps]
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
Expand Down
7 changes: 7 additions & 0 deletions lib/cusolver/linalg.jl
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,13 @@ function Base.:\(F::Union{LinearAlgebra.LAPACKFactorizations{<:Any,<:CuArray},
return LinearAlgebra._cut_B(BB, 1:n)
end

# make copyto! for Hermitian and Symmetric dispatch to the Base implementation
# instead of being overridden by GPUArrays' dense copy (because of AnyGPUArray)
Base.copyto!(dst::Symmetric{<:Any,<:CuMatrix}, src::Symmetric{<:Any,<:CuMatrix}) =
@invoke copyto!(dst::Symmetric, src::Symmetric)
Base.copyto!(dst::Hermitian{<:Any,<:CuMatrix}, src::Hermitian{<:Any,<:CuMatrix}) =
@invoke copyto!(dst::Hermitian, src::Hermitian)

# eigenvalues

function LinearAlgebra.eigen(A::Symmetric{T,<:CuMatrix}) where {T<:BlasReal}
Expand Down
4 changes: 2 additions & 2 deletions lib/cutensornet/src/types.jl
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,12 @@ mutable struct CuTensorNetwork{T}
desc::CuTensorNetworkDescriptor
input_modes::Vector{Vector{Int32}}
input_extents::Vector{Vector{Int32}}
input_strides::Vector{<:Union{Ptr{Nothing}, Vector{Int32}}}
input_strides::Vector{<:Union{Ptr{Nothing}, Vector{Int64}}}
input_qualifiers::Vector{cutensornetTensorQualifiers_t}
input_arrs::Vector{CuArray{T}}
output_modes::Vector{Int32}
output_extents::Vector{Int32}
output_strides::Union{Ptr{Nothing}, Vector{Int32}}
output_strides::Union{Ptr{Nothing}, Vector{Int64}}
output_arr::CuArray{T}
end
function CuTensorNetwork(T::DataType, input_modes, input_extents, input_strides, input_qualifiers, output_modes, output_extents, output_strides)
Expand Down
2 changes: 1 addition & 1 deletion src/mapreduce.jl
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ function GPUArrays.mapreducedim!(f::F, op::OP, R::AnyCuArray{T},
partial_shmem = partial_reduce_shmem
partial_blocks = partial_reduce_blocks*other_blocks

partial = similar(R, (size(R)..., partial_blocks))
partial = similar(R, (size(R)..., partial_reduce_blocks))
if init === nothing
# without an explicit initializer we need to copy from the output container
partial .= R
Expand Down