Skip to content

Commit c510561

Browse files
authored
[NDTensors] Vendor TypeParameterAccessors.jl (#1676)
1 parent 59058d3 commit c510561

File tree

75 files changed

+842
-53
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+842
-53
lines changed

NDTensors/Project.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "NDTensors"
22
uuid = "23ae76d9-e61a-49c4-8f12-3f1a16adf9cf"
33
authors = ["Matthew Fishman <[email protected]>"]
4-
version = "0.4.13"
4+
version = "0.4.14"
55

66
[deps]
77
Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
@@ -28,7 +28,6 @@ Strided = "5e0ebb24-38b0-5f93-81fe-25c709ecae67"
2828
StridedViews = "4db3bf67-4bd7-4b4e-b153-31dc3fb37143"
2929
TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
3030
TupleTools = "9d95972d-f1c8-5527-a6e0-b4b365fa01f6"
31-
TypeParameterAccessors = "7e5a90cf-f82e-492e-a09b-e3e26432c138"
3231
VectorInterface = "409d34a3-91d5-4945-b6ec-7529ddf182d8"
3332

3433
[weakdeps]
@@ -88,7 +87,6 @@ StridedViews = "0.2.2, 0.3, 0.4"
8887
TBLIS = "0.2"
8988
TimerOutputs = "0.5.5"
9089
TupleTools = "1.2.0"
91-
TypeParameterAccessors = "0.3"
9290
VectorInterface = "0.4.2, 0.5"
9391
cuTENSOR = "2"
9492
julia = "1.10"

NDTensors/ext/NDTensorsAMDGPUExt/NDTensorsAMDGPUExt.jl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
module NDTensorsAMDGPUExt
22

3+
module Vendored
4+
include(
5+
joinpath(
6+
"..", "..", "src", "vendored", "TypeParameterAccessors", "ext",
7+
"TypeParameterAccessorsAMDGPUExt.jl"
8+
)
9+
)
10+
end
11+
312
include("append.jl")
413
include("copyto.jl")
514
include("set_types.jl")

NDTensors/ext/NDTensorsAMDGPUExt/adapt.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using NDTensors: NDTensors, EmptyStorage, adapt_storagetype, emptytype
22
using NDTensors.AMDGPUExtensions: AMDGPUExtensions, ROCArrayAdaptor
33
using NDTensors.GPUArraysCoreExtensions: storagemode
4-
using NDTensors.TypeParameterAccessors:
4+
using NDTensors.Vendored.TypeParameterAccessors:
55
default_type_parameters, set_type_parameters, type_parameters
66
using Adapt: Adapt, adapt
77
using AMDGPU: AMDGPU, ROCArray, ROCVector

NDTensors/ext/NDTensorsAMDGPUExt/linearalgebra.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using NDTensors.AMDGPUExtensions: roc
22
using NDTensors.Expose: Expose, Exposed, expose, ql, ql_positive
33
using NDTensors.GPUArraysCoreExtensions: cpu
4-
using NDTensors.TypeParameterAccessors: unwrap_array_type
4+
using NDTensors.Vendored.TypeParameterAccessors: unwrap_array_type
55
using LinearAlgebra: svd
66
using Adapt: adapt
77
using AMDGPU: ROCMatrix
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using AMDGPU: ROCArray
22
using NDTensors.GPUArraysCoreExtensions: storagemode
3-
using NDTensors.TypeParameterAccessors: TypeParameterAccessors, Position
3+
using NDTensors.Vendored.TypeParameterAccessors: TypeParameterAccessors, Position
44

55
TypeParameterAccessors.position(::Type{<:ROCArray}, ::typeof(storagemode)) = Position(3)

NDTensors/ext/NDTensorsCUDAExt/NDTensorsCUDAExt.jl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
module NDTensorsCUDAExt
2+
3+
module Vendored
4+
include(
5+
joinpath(
6+
"..", "..", "src", "vendored", "TypeParameterAccessors", "ext",
7+
"TypeParameterAccessorsCUDAExt.jl"
8+
)
9+
)
10+
end
11+
212
include("append.jl")
313
include("default_kwargs.jl")
414
include("copyto.jl")
@@ -9,4 +19,5 @@ include("indexing.jl")
919
include("linearalgebra.jl")
1020
include("mul.jl")
1121
include("permutedims.jl")
22+
1223
end

NDTensors/ext/NDTensorsCUDAExt/adapt.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ using Functors: fmap
44
using NDTensors: NDTensors, EmptyStorage, adapt_storagetype, emptytype
55
using NDTensors.CUDAExtensions: CUDAExtensions, CuArrayAdaptor
66
using NDTensors.GPUArraysCoreExtensions: storagemode
7-
using NDTensors.TypeParameterAccessors:
7+
using NDTensors.Vendored.TypeParameterAccessors:
88
default_type_parameters, set_type_parameters, type_parameters
99

1010
function CUDAExtensions.cu(xs; storagemode = default_type_parameters(CuArray, storagemode))

NDTensors/ext/NDTensorsCUDAExt/linearalgebra.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ using LinearAlgebra: Adjoint, svd
44
using NDTensors: NDTensors
55
using NDTensors.Expose: Expose, expose, ql, ql_positive
66
using NDTensors.GPUArraysCoreExtensions: cpu
7-
using NDTensors.TypeParameterAccessors: unwrap_array_type
7+
using NDTensors.Vendored.TypeParameterAccessors: unwrap_array_type
88
function NDTensors.svd_catch_error(A::CuMatrix; alg::String = "jacobi_algorithm")
99
if alg == "jacobi_algorithm"
1010
alg = CUDA.CUSOLVER.JacobiAlgorithm()

NDTensors/ext/NDTensorsCUDAExt/set_types.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using CUDA: CuArray
22
using NDTensors.GPUArraysCoreExtensions: storagemode
3-
using NDTensors.TypeParameterAccessors: TypeParameterAccessors, Position
3+
using NDTensors.Vendored.TypeParameterAccessors: TypeParameterAccessors, Position
44

55
function TypeParameterAccessors.position(::Type{<:CuArray}, ::typeof(storagemode))
66
return Position(3)

NDTensors/ext/NDTensorsGPUArraysCoreExt/contract.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ using Adapt: adapt
22
using GPUArraysCore: AbstractGPUArray
33
using NDTensors: NDTensors, DenseTensor, DiagTensor, contract!, dense, inds, Tensor
44
using NDTensors.Expose: Exposed, expose, unexpose
5-
using NDTensors.TypeParameterAccessors: parenttype, set_ndims
5+
using NDTensors.Vendored.TypeParameterAccessors: parenttype, set_ndims
66

77
function NDTensors.contract!(
88
output_tensor::Exposed{<:AbstractGPUArray, <:DenseTensor},

0 commit comments

Comments
 (0)