Switch to MLUtils v0.2

Author: darsnack

Project.toml

@@ -40,7 +40,7 @@ ImageCore = "0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8"
 JLD2 = "0.4.21"
 JSON3 = "1"
 MAT = "0.7, 0.8, 0.9, 0.10"
-MLUtils = "0.1.4"
+MLUtils = "0.2.0"
 Pickle = "0.2, 0.3"
 Requires = "1"
 Tables = "1.6"

src/containers/cacheddataset.jl

@@ -31,9 +31,9 @@ function CachedDataset(source, cachesize::Int = numobs(source))
     CachedDataset(source, collect(cacheidx), make_cache(source, cacheidx))
 end
 
-function MLUtils.getobs(dataset::CachedDataset, i::Integer)
+function Base.getindex(dataset::CachedDataset, i::Integer)
     _i = findfirst(==(i), dataset.cacheidx)
 
     return isnothing(_i) ? getobs(dataset.source, i) : getobs(dataset.cache, _i)
 end
-MLUtils.numobs(dataset::CachedDataset) = numobs(dataset.source)
+Base.length(dataset::CachedDataset) = numobs(dataset.source)

src/containers/filedataset.jl

@@ -52,6 +52,6 @@ FileDataset(loadfn,
 FileDataset(dir::Union{AbstractPath, AbstractString}, pattern::AbstractString = "*", depth = 4) =
     FileDataset(loadfile, dir, pattern, depth)
 
-MLUtils.getobs(dataset::FileDataset, i::Integer) = loadfile(dataset.paths[i])
-MLUtils.getobs(dataset::FileDataset, is::AbstractVector) = map(Base.Fix1(getobs, dataset), is)
-MLUtils.numobs(dataset::FileDataset) = length(dataset.paths)
+Base.getindex(dataset::FileDataset, i::Integer) = loadfile(dataset.paths[i])
+Base.getindex(dataset::FileDataset, is::AbstractVector) = map(Base.Fix1(getobs, dataset), is)
+Base.length(dataset::FileDataset) = length(dataset.paths)

src/containers/hdf5dataset.jl

@@ -47,11 +47,11 @@ function _getobs_hdf5(dataset::HDF5.Dataset, shape, i)
 
     return dataset[I..., i]
 end
-MLUtils.getobs(dataset::HDF5Dataset{HDF5.Dataset}, i) =
+Base.getindex(dataset::HDF5Dataset{HDF5.Dataset}, i) =
     _getobs_hdf5(dataset.paths, only(dataset.shapes), i)
-MLUtils.getobs(dataset::HDF5Dataset{<:Vector}, i) =
+Base.getindex(dataset::HDF5Dataset{<:Vector}, i) =
     Tuple(map((p, s) -> _getobs_hdf5(p, s, i), dataset.paths, dataset.shapes))
-MLUtils.numobs(dataset::HDF5Dataset) = last(first(filter(!isempty, dataset.shapes)))
+Base.length(dataset::HDF5Dataset) = last(first(filter(!isempty, dataset.shapes)))
 
 """
     close(dataset::HDF5Dataset)

src/containers/jld2dataset.jl

@@ -28,9 +28,9 @@ JLD2Dataset(file::JLD2.JLDFile, path::String) = JLD2Dataset(file, (path,))
 JLD2Dataset(file::Union{AbstractString, AbstractPath}, paths) =
     JLD2Dataset(jldopen(file, "r"), paths)
 
-MLUtils.getobs(dataset::JLD2Dataset{<:JLD2.JLDFile, <:NTuple{1}}, i) = getobs(only(dataset.paths), i)
-MLUtils.getobs(dataset::JLD2Dataset, i) = map(Base.Fix2(getobs, i), dataset.paths)
-MLUtils.numobs(dataset::JLD2Dataset) = numobs(dataset.paths[1])
+Base.getindex(dataset::JLD2Dataset{<:JLD2.JLDFile, <:NTuple{1}}, i) = getobs(only(dataset.paths), i)
+Base.getindex(dataset::JLD2Dataset, i) = map(Base.Fix2(getobs, i), dataset.paths)
+Base.length(dataset::JLD2Dataset) = numobs(dataset.paths[1])
 
 """
     close(dataset::JLD2Dataset)

src/containers/tabledataset.jl

@@ -30,7 +30,7 @@ function _getobs_column(x, i)
 
     return NamedTuple{colnames}(rowvals)
 end
-function MLUtils.getobs(dataset::TableDataset, i)
+function Base.getindex(dataset::TableDataset, i)
     if Tables.rowaccess(dataset.table)
         return _getobs_row(Tables.rows(dataset.table), i)
     elseif Tables.columnaccess(dataset.table)
@@ -39,7 +39,7 @@ function MLUtils.getobs(dataset::TableDataset, i)
         error("The Tables.jl implementation used should have either rowaccess or columnaccess.")
     end
 end
-function MLUtils.numobs(dataset::TableDataset)
+function Base.length(dataset::TableDataset)
     if Tables.columnaccess(dataset.table)
         return length(Tables.getcolumn(dataset.table, 1))
     elseif Tables.rowaccess(dataset.table)
@@ -51,9 +51,9 @@ function MLUtils.numobs(dataset::TableDataset)
 end
 
 # fast access for DataFrame
-MLUtils.getobs(dataset::TableDataset{<:DataFrame}, i) = dataset.table[i, :]
-MLUtils.numobs(dataset::TableDataset{<:DataFrame}) = nrow(dataset.table)
+Base.getindex(dataset::TableDataset{<:DataFrame}, i) = dataset.table[i, :]
+Base.length(dataset::TableDataset{<:DataFrame}) = nrow(dataset.table)
 
 # fast access for CSV.File
-MLUtils.getobs(dataset::TableDataset{<:CSV.File}, i) = dataset.table[i]
-MLUtils.numobs(dataset::TableDataset{<:CSV.File}) = length(dataset.table)
+Base.getindex(dataset::TableDataset{<:CSV.File}, i) = dataset.table[i]
+Base.length(dataset::TableDataset{<:CSV.File}) = length(dataset.table)