From 3b0b598bb86f8f4c79f2748576353bed18924a60 Mon Sep 17 00:00:00 2001 From: Samuel Omlin Date: Mon, 25 Sep 2023 16:28:19 +0200 Subject: [PATCH] fix named tuples --- src/ParallelKernel/Data.jl | 42 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/ParallelKernel/Data.jl b/src/ParallelKernel/Data.jl index b8e1d161..819a4682 100644 --- a/src/ParallelKernel/Data.jl +++ b/src/ParallelKernel/Data.jl @@ -223,13 +223,13 @@ function Data_shared(numbertype::DataType) CellArrayTuple{N_tuple, T_elem, N, B} = NTuple{N_tuple, CellArray{T_elem, N, B}} DeviceCellArrayTuple{N_tuple, T_elem, N, B} = NTuple{N_tuple, DeviceCellArray{T_elem, N, B}} - NamedNumberTuple{N_tuple, T, names} = NamedTuple{names, NumberTuple{N_tuple, T}} - NamedArrayTuple{N_tuple, T, N, names} = NamedTuple{names, ArrayTuple{N_tuple, T, N}} - NamedDeviceArrayTuple{N_tuple, T, N, names} = NamedTuple{names, DeviceArrayTuple{N_tuple, T, N}} - NamedCellTuple{N_tuple, T, S, names} = NamedTuple{names, CellTuple{N_tuple, T, S}} - NamedDeviceCellTuple{N_tuple, T, S, names} = NamedTuple{names, DeviceCellTuple{N_tuple, T, S}} - NamedCellArrayTuple{N_tuple, T_elem, N, B, names} = NamedTuple{names, CellArrayTuple{N_tuple, T_elem, N, B}} - NamedDeviceCellArrayTuple{N_tuple, T_elem, N, B, names} = NamedTuple{names, DeviceCellArrayTuple{N_tuple, T_elem, N, B}} + NamedNumberTuple{N_tuple, T, names} = NamedTuple{names, <:NumberTuple{N_tuple, T}} + NamedArrayTuple{N_tuple, T, N, names} = NamedTuple{names, <:ArrayTuple{N_tuple, T, N}} + NamedDeviceArrayTuple{N_tuple, T, N, names} = NamedTuple{names, <:DeviceArrayTuple{N_tuple, T, N}} + NamedCellTuple{N_tuple, T, S, names} = NamedTuple{names, <:CellTuple{N_tuple, T, S}} + NamedDeviceCellTuple{N_tuple, T, S, names} = NamedTuple{names, <:DeviceCellTuple{N_tuple, T, S}} + NamedCellArrayTuple{N_tuple, T_elem, N, B, names} = NamedTuple{names, <:CellArrayTuple{N_tuple, T_elem, N, B}} + NamedDeviceCellArrayTuple{N_tuple, T_elem, N, B, names} = NamedTuple{names, <:DeviceCellArrayTuple{N_tuple, T_elem, N, B}} NumberCollection{N_tuple, T} = Union{NumberTuple{N_tuple, T}, NamedNumberTuple{N_tuple, T}} ArrayCollection{N_tuple, T, N} = Union{ArrayTuple{N_tuple, T, N}, NamedArrayTuple{N_tuple, T, N}} @@ -261,20 +261,20 @@ function Data_shared(numbertype::DataType) TCellArrayTuple{N_tuple, T_elem, N, B} = NTuple{N_tuple, TCellArray{T_elem, N, B}} DeviceTCellArrayTuple{N_tuple, T_elem, N, B} = NTuple{N_tuple, DeviceTCellArray{T_elem, N, B}} - NamedNumberTuple{N_tuple, names} = NamedTuple{names, NumberTuple{N_tuple}} - NamedArrayTuple{N_tuple, N, names} = NamedTuple{names, ArrayTuple{N_tuple, N}} - NamedDeviceArrayTuple{N_tuple, N, names} = NamedTuple{names, DeviceArrayTuple{N_tuple, N}} - NamedCellTuple{N_tuple, S, names} = NamedTuple{names, CellTuple{N_tuple, S}} - NamedDeviceCellTuple{N_tuple, S, names} = NamedTuple{names, DeviceCellTuple{N_tuple, S}} - NamedCellArrayTuple{N_tuple, N, B, names} = NamedTuple{names, CellArrayTuple{N_tuple, N, B}} - NamedDeviceCellArrayTuple{N_tuple, N, B, names} = NamedTuple{names, DeviceCellArrayTuple{N_tuple, N, B}} - NamedTNumberTuple{N_tuple, T, names} = NamedTuple{names, TNumberTuple{N_tuple, T}} - NamedTArrayTuple{N_tuple, T, N, names} = NamedTuple{names, TArrayTuple{N_tuple, T, N}} - NamedDeviceTArrayTuple{N_tuple, T, N, names} = NamedTuple{names, DeviceTArrayTuple{N_tuple, T, N}} - NamedTCellTuple{N_tuple, T, S, names} = NamedTuple{names, TCellTuple{N_tuple, T, S}} - NamedDeviceTCellTuple{N_tuple, T, S, names} = NamedTuple{names, DeviceTCellTuple{N_tuple, T, S}} - NamedTCellArrayTuple{N_tuple, T_elem, N, B, names} = NamedTuple{names, TCellArrayTuple{N_tuple, T_elem, N, B}} - NamedDeviceTCellArrayTuple{N_tuple, T_elem, N, B, names} = NamedTuple{names, DeviceTCellArrayTuple{N_tuple, T_elem, N, B}} + NamedNumberTuple{N_tuple, names} = NamedTuple{names, <:NumberTuple{N_tuple}} + NamedArrayTuple{N_tuple, N, names} = NamedTuple{names, <:ArrayTuple{N_tuple, N}} + NamedDeviceArrayTuple{N_tuple, N, names} = NamedTuple{names, <:DeviceArrayTuple{N_tuple, N}} + NamedCellTuple{N_tuple, S, names} = NamedTuple{names, <:CellTuple{N_tuple, S}} + NamedDeviceCellTuple{N_tuple, S, names} = NamedTuple{names, <:DeviceCellTuple{N_tuple, S}} + NamedCellArrayTuple{N_tuple, N, B, names} = NamedTuple{names, <:CellArrayTuple{N_tuple, N, B}} + NamedDeviceCellArrayTuple{N_tuple, N, B, names} = NamedTuple{names, <:DeviceCellArrayTuple{N_tuple, N, B}} + NamedTNumberTuple{N_tuple, T, names} = NamedTuple{names, <:TNumberTuple{N_tuple, T}} + NamedTArrayTuple{N_tuple, T, N, names} = NamedTuple{names, <:TArrayTuple{N_tuple, T, N}} + NamedDeviceTArrayTuple{N_tuple, T, N, names} = NamedTuple{names, <:DeviceTArrayTuple{N_tuple, T, N}} + NamedTCellTuple{N_tuple, T, S, names} = NamedTuple{names, <:TCellTuple{N_tuple, T, S}} + NamedDeviceTCellTuple{N_tuple, T, S, names} = NamedTuple{names, <:DeviceTCellTuple{N_tuple, T, S}} + NamedTCellArrayTuple{N_tuple, T_elem, N, B, names} = NamedTuple{names, <:TCellArrayTuple{N_tuple, T_elem, N, B}} + NamedDeviceTCellArrayTuple{N_tuple, T_elem, N, B, names} = NamedTuple{names, <:DeviceTCellArrayTuple{N_tuple, T_elem, N, B}} NumberCollection{N_tuple} = Union{NumberTuple{N_tuple}, NamedNumberTuple{N_tuple}} ArrayCollection{N_tuple, N} = Union{ArrayTuple{N_tuple, N}, NamedArrayTuple{N_tuple, N}}