Skip to content

Commit

Permalink
Revert "use LazyModules (#49)"
Browse files Browse the repository at this point in the history 
This reverts commit 03ad18c.

LazyModules seems to have some issue related to precompilation -- it's
better to revert this change so that downstream packages don't get
affected.
  • Loading branch information
@johnnychen94
johnnychen94 committed May 16, 2022
1 parent 4a23cd6 commit 5d69161
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 38 deletions.
4 changes: 1 addition & 3 deletions Project.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ version = "0.6.3"
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
IndirectArrays = "9b13fd28-a010-5f03-acff-a1bbcff69959"
JpegTurbo = "b835a17e-a41a-41e7-81f0-2f016b05efe0"
LazyModules = "8cdb02fc-e678-4876-92c5-9defec4f444e"
Netpbm = "f09324ee-3d7c-5217-9330-fc30815ba969"
OpenEXR = "52e1d378-f018-4a11-a4be-720524705ac7"
PNGFiles = "f57f5aa1-a3ce-4bc8-8ab9-96f992907883"
Expand All @@ -18,10 +17,9 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

[compat]
FileIO = "1.2"
ImageCore = "0.8.1, 0.9"
IndirectArrays = "0.5, 1"
ImageCore = "0.8.1, 0.9"
JpegTurbo = "0.1"
LazyModules = "0.2"
Netpbm = "1.0"
OpenEXR = "0.3"
PNGFiles = "0.3"
Expand Down
76 changes: 41 additions & 35 deletions src/ImageIO.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@ using FileIO: File, DataFormat, Stream, stream, Formatted

import IndirectArrays: IndirectArray

using LazyModules # @lazy macro is used to delay the package loading to its first usage

@lazy import Sixel
@lazy import Netpbm
@lazy import PNGFiles
@lazy import TiffImages
@lazy import OpenEXR
@lazy import QOI
@lazy import JpegTurbo
const idSixel = Base.PkgId(UUID("45858cf5-a6b0-47a3-bbea-62219f50df47"), "Sixel")
const idNetpbm = Base.PkgId(UUID("f09324ee-3d7c-5217-9330-fc30815ba969"), "Netpbm")
const idPNGFiles = Base.PkgId(UUID("f57f5aa1-a3ce-4bc8-8ab9-96f992907883"), "PNGFiles")
const idTiffImages = Base.PkgId(UUID("731e570b-9d59-4bfa-96dc-6df516fadf69"), "TiffImages")
const idOpenEXR = Base.PkgId(UUID("52e1d378-f018-4a11-a4be-720524705ac7"), "OpenEXR")
const idQOI = Base.PkgId(UUID("4b34888f-f399-49d4-9bb3-47ed5cae4e65"), "QOI")
const idJpegTurbo = Base.PkgId(UUID("b835a17e-a41a-41e7-81f0-2f016b05efe0"), "JpegTurbo")

# Enforce a type conversion to be backend independent (issue #25)
# Note: If the backend does not provide efficient `convert` implementation,
Expand Down Expand Up @@ -50,27 +48,35 @@ end

## PNGs

const load_locker = Threads.ReentrantLock()
function checked_import(pkgid)
Base.root_module_exists(pkgid) && return Base.root_module(pkgid)
# If not available, lock and load the library in a sequential order
lock(load_locker) do
Base.require(pkgid)
end
end

function load(f::File{DataFormat{:PNG}}; kwargs...)
data = PNGFiles.load(f.filename; kwargs...)
data = Base.invokelatest(checked_import(idPNGFiles).load, f.filename; kwargs...)
return enforce_canonical_type(f, data)
end
function load(s::Stream{DataFormat{:PNG}}; kwargs...)
data = PNGFiles.load(stream(s); kwargs...)
data = Base.invokelatest(checked_import(idPNGFiles).load, stream(s); kwargs...)
return enforce_canonical_type(s, data)
end

function save(f::File{DataFormat{:PNG}}, image::S; kwargs...) where {T, S<:Union{AbstractMatrix, AbstractArray{T,3}}}
PNGFiles.save(f.filename, image; kwargs...)
return Base.invokelatest(checked_import(idPNGFiles).save, f.filename, image; kwargs...)
end

function save(s::Stream{DataFormat{:PNG}}, image::S; permute_horizontal=false, mapi=identity, kwargs...) where {T, S<:Union{AbstractMatrix, AbstractArray{T,3}}}
imgout = map(mapi, image)
if permute_horizontal
perm = ndims(imgout) == 2 ? (2, 1) : ndims(imgout) == 3 ? (2, 1, 3) : error("$(ndims(imgout)) dims array is not supported")
PNGFiles.save(stream(s), PermutedDimsArray(imgout, perm); kwargs...)
return Base.invokelatest(checked_import(idPNGFiles).save, stream(s), PermutedDimsArray(imgout, perm); kwargs...)
else
PNGFiles.save(stream(s), imgout; kwargs...)
return Base.invokelatest(checked_import(idPNGFiles).save, stream(s), imgout; kwargs...)
end
end

Expand All @@ -79,103 +85,103 @@ end
for NETPBMFORMAT in (:PBMBinary, :PGMBinary, :PPMBinary, :PBMText, :PGMText, :PPMText)
@eval begin
function load(f::File{DataFormat{$(Expr(:quote,NETPBMFORMAT))}})
data = Netpbm.load(f)
data = Base.invokelatest(checked_import(idNetpbm).load, f)
return enforce_canonical_type(f, data)
end

function load(s::Stream{DataFormat{$(Expr(:quote,NETPBMFORMAT))}})
data = Netpbm.load(s)
data = Base.invokelatest(checked_import(idNetpbm).load, s)
return enforce_canonical_type(s, data)
end

function save(f::File{DataFormat{$(Expr(:quote,NETPBMFORMAT))}}, image::S; kwargs...) where {S<:AbstractMatrix}
return Netpbm.save(f, image; kwargs...)
return Base.invokelatest(checked_import(idNetpbm).save, f, image; kwargs...)
end

function save(s::Stream{DataFormat{$(Expr(:quote,NETPBMFORMAT))}}, image::S; kwargs...) where {S<:AbstractMatrix}
return Netpbm.save(s, image; kwargs...)
return Base.invokelatest(checked_import(idNetpbm).save, s, image; kwargs...)
end
end
end

## TIFFs

function load(f::File{DataFormat{:TIFF}}; kwargs...)
data = TiffImages.load(f.filename; kwargs...)
data = Base.invokelatest(checked_import(idTiffImages).load, f.filename; kwargs...)
return enforce_canonical_type(f, data)
end
function load(s::Stream{DataFormat{:TIFF}}; kwargs...)
data = TiffImages.load(stream(s); kwargs...)
data = Base.invokelatest(checked_import(idTiffImages).load, stream(s); kwargs...)
return enforce_canonical_type(s, data)
end

function save(f::File{DataFormat{:TIFF}}, image::S) where {T, S<:Union{AbstractMatrix, AbstractArray{T,3}}}
TiffImages.save(f.filename, image)
Base.invokelatest(checked_import(idTiffImages).save, f.filename, image)
end

function save(s::Stream{DataFormat{:TIFF}}, image::S; permute_horizontal=false, mapi=identity) where {T, S<:Union{AbstractMatrix, AbstractArray{T,3}}}
imgout = map(mapi, image)
if permute_horizontal
perm = ndims(imgout) == 2 ? (2, 1) : ndims(imgout) == 3 ? (2, 1, 3) : error("$(ndims(imgout)) dims array is not supported")
TiffImages.save(stream(s), PermutedDimsArray(imgout, perm))
Base.invokelatest(checked_import(idTiffImages).save, stream(s), PermutedDimsArray(imgout, perm))
else
TiffImages.save(stream(s), imgout)
Base.invokelatest(checked_import(idTiffImages).save, stream(s), imgout)
end
end

## OpenEXR

function load(f::File{DataFormat{:EXR}}; kwargs...)
data = OpenEXR.load(f; kwargs...)
data = Base.invokelatest(checked_import(idOpenEXR).load, f; kwargs...)
return enforce_canonical_type(f, data)
end

function save(f::File{DataFormat{:EXR}}, args...; kwargs...)
OpenEXR.save(f, args...; kwargs...)
Base.invokelatest(checked_import(idOpenEXR).save, f, args...; kwargs...)
end

## QOI

function load(f::File{DataFormat{:QOI}}; kwargs...)
data = QOI.qoi_decode(f.filename; kwargs...)
data = Base.invokelatest(checked_import(idQOI).qoi_decode, f.filename; kwargs...)
return enforce_canonical_type(f, data)
end

function save(f::File{DataFormat{:QOI}}, args...; kwargs...)
QOI.qoi_encode(f.filename, args...; kwargs...)
Base.invokelatest(checked_import(idQOI).qoi_encode, f.filename, args...; kwargs...)
end

## Sixel
# Sixel.jl itself provides `fileio_load`/`fileio_save` so we simply delegate everything to it
function load(f::File{DataFormat{:SIXEL}}; kwargs...)
data = Sixel.fileio_load(f, kwargs...)
data = Base.invokelatest(checked_import(idSixel).fileio_load, f, kwargs...)
return enforce_canonical_type(f, data)
end
function load(s::Stream{DataFormat{:SIXEL}}; kwargs...)
data = Sixel.fileio_load(s, kwargs...)
data = Base.invokelatest(checked_import(idSixel).fileio_load, s, kwargs...)
return enforce_canonical_type(s, data)
end
function save(f::File{DataFormat{:SIXEL}}, image::AbstractArray; kwargs...)
Sixel.fileio_save(f, image; kwargs...)
Base.invokelatest(checked_import(idSixel).fileio_save, f, image; kwargs...)
end
function save(s::Stream{DataFormat{:SIXEL}}, image::AbstractArray; kwargs...)
Sixel.fileio_save(s, image; kwargs...)
Base.invokelatest(checked_import(idSixel).fileio_save, s, image; kwargs...)
end

## JPEG
function load(f::File{DataFormat{:JPEG}}; kwargs...)
data = JpegTurbo.fileio_load(f, kwargs...)
data = Base.invokelatest(checked_import(idJpegTurbo).fileio_load, f, kwargs...)
return enforce_canonical_type(f, data)
end
function load(s::Stream{DataFormat{:JPEG}}; kwargs...)
data = JpegTurbo.fileio_load(s, kwargs...)
data = Base.invokelatest(checked_import(idJpegTurbo).fileio_load, s, kwargs...)
return enforce_canonical_type(s, data)
end
function save(f::File{DataFormat{:JPEG}}, image::AbstractArray; kwargs...)
JpegTurbo.fileio_save(f, image; kwargs...)
Base.invokelatest(checked_import(idJpegTurbo).fileio_save, f, image; kwargs...)
end
function save(s::Stream{DataFormat{:JPEG}}, image::AbstractArray; kwargs...)
JpegTurbo.fileio_save(s, image; kwargs...)
Base.invokelatest(checked_import(idJpegTurbo).fileio_save, s, image; kwargs...)
end

## Function names labelled for FileIO. Makes FileIO lookup quicker
Expand Down

0 comments on commit 5d69161

Please sign in to comment.