Skip to content

Reduce compilation of Base methods (NFC) #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 31, 2022
Merged

Reduce compilation of Base methods (NFC) #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions src/toplevel_generators.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,14 @@ function generate_wrapper_load(src_name, pkg_uuid, __source__)
# Helper function to parse triplets for us
$(platform_parse_compat())
function make_wrapper_dict(dir, x)
return Dict(
parse_wrapper_platform(basename(f)[1:end-3]) =>
joinpath(dir, "wrappers", f) for f in x
)
# (1) make the Dict type inferrable
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this point, using Dict{Platform,String}( <generator> ) would be sufficient, right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, specifying the exact Dict type would fix that.

# (2) avoid creation of Generators so that we don't have to compile
# package-specific Generator-closures
d = Dict{Platform,String}()
for f in x
d[parse_wrapper_platform(basename(f)[1:end-3])] = joinpath(dir, "wrappers", f)
end
return d
end

# If it's a Dict, that means this is an AnyPlatform artifact, act accordingly:
Expand All @@ -145,7 +149,10 @@ function generate_wrapper_load(src_name, pkg_uuid, __source__)
else
# Otherwise, it's a Vector, and we must select the best platform
# First, find all wrappers on-disk, parse their platforms, and match:
wrapper_files = filter(x -> endswith(x, ".jl"), readdir(joinpath($(pkg_dir), "wrappers")))
wrapper_files = String[]
for x in readdir(joinpath($(pkg_dir), "wrappers"))
endswith(x, ".jl") && push!(wrapper_files, x) # avoid creation of Generators...
end
wrappers = make_wrapper_dict($(pkg_dir), wrapper_files)
for e in artifacts
platform = unpack_platform(e, $(jll_name), artifacts_toml)
Expand Down