diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1df974a..987bd90 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: include: - os: windows-latest version: '1' - arch: x86 + arch: x64 - os: macos-latest version: '1' arch: aarch64 diff --git a/src/abstractdataset/prettytables.jl b/src/abstractdataset/prettytables.jl index efdc0d8..aca4001 100644 --- a/src/abstractdataset/prettytables.jl +++ b/src/abstractdataset/prettytables.jl @@ -22,9 +22,13 @@ function _pretty_tables_highlighter_func(data, i::Integer, j::Integer) end end end - -const _PRETTY_TABLES_HIGHLIGHTER = Highlighter(_pretty_tables_highlighter_func, +if isdefined(PrettyTables, :Highlighter) + const _PRETTY_TABLES_HIGHLIGHTER = Highlighter(_pretty_tables_highlighter_func, + Crayon(foreground = :dark_gray)) +else + const _PRETTY_TABLES_HIGHLIGHTER = TextHighlighter(_pretty_tables_highlighter_func, Crayon(foreground = :dark_gray)) +end # Default DataFrames formatter for text backend. # diff --git a/src/other/utils.jl b/src/other/utils.jl index fe48de4..16214d8 100644 --- a/src/other/utils.jl +++ b/src/other/utils.jl @@ -955,6 +955,5 @@ Base.eltype(v::Cat2Vec{F1, F2, CT, T, S, A, B}) where {F1, F2, CT, T, S, A, B} = function tid(nt) - Threads.threadid() % nt + 1 end \ No newline at end of file diff --git a/src/precompile/precompile.jl b/src/precompile/precompile.jl index 51f62c7..5ddcd45 100644 --- a/src/precompile/precompile.jl +++ b/src/precompile/precompile.jl @@ -526,14 +526,9 @@ function _precompile() Base.precompile(Tuple{Core.kwftype(typeof(sortperm)),NamedTuple{(:alg,), Tuple{QuickSortAlg}},typeof(sortperm),Dataset,Int64}) Base.precompile(Tuple{Core.kwftype(typeof(leftjoin)),NamedTuple{(:on, :threads), Tuple{Vector{Symbol}, Bool}},typeof(leftjoin),Dataset,Dataset}) - Base.precompile(Tuple{Core.kwftype(typeof(innerjoin)),NamedTuple{(:on, :makeunique, :stable, :threads), Tuple{Vector{Pair{Symbol, Tuple{Symbol, Nothing}}}, Bool, Bool, Bool}},typeof(innerjoin),Dataset,SubDataset{Dataset, SubIndex{Index, Base.OneTo{Int64}, Vector{Int64}}, Base.OneTo{Int64}}}) Base.precompile(Tuple{Core.kwftype(typeof(innerjoin)),NamedTuple{(:on, :threads), Tuple{Vector{Symbol}, Bool}},typeof(innerjoin),Dataset,Dataset}) Base.precompile(Tuple{Core.kwftype(typeof(innerjoin)),NamedTuple{(:on, :stable, :threads), Tuple{Vector{Pair{Symbol, Any}}, Bool, Bool}},typeof(innerjoin),Dataset,Dataset}) - Base.precompile(Tuple{Core.kwftype(typeof(innerjoin)),NamedTuple{(:on, :stable, :threads), Tuple{Vector{Pair{Symbol, Any}}, Bool, Bool}},typeof(innerjoin),SubDataset{Dataset, SubIndex{Index, Base.OneTo{Int64}, Vector{Int64}}, Base.OneTo{Int64}},Dataset}) Base.precompile(Tuple{Core.kwftype(typeof(closejoin)),NamedTuple{(:on,), Tuple{Symbol}},typeof(closejoin),Dataset,Dataset}) - Base.precompile(Tuple{Core.kwftype(typeof(closejoin)),NamedTuple{(:on,), Tuple{Vector{Symbol}}},typeof(closejoin),SubDataset{Dataset, SubIndex{Index, Base.OneTo{Int64}, Vector{Int64}}, Base.OneTo{Int64}},SubDataset{Dataset, SubIndex{Index, Base.OneTo{Int64}, Vector{Int64}}, Base.OneTo{Int64}}}) - Base.precompile(Tuple{Core.kwftype(typeof(closejoin)),NamedTuple{(:on,), Tuple{Vector{Symbol}}},typeof(closejoin),Dataset,SubDataset{Dataset, SubIndex{Index, Vector{Int64}, Vector{Int64}}, UnitRange{Int64}}}) - Base.precompile(Tuple{Core.kwftype(typeof(_join_inner)),NamedTuple{(:onleft, :onright, :onright_range, :makeunique, :mapformats, :stable, :alg, :check, :accelerate, :droprangecols, :strict_inequality, :method, :threads, :multiple_match, :multiple_match_name, :obs_id, :obs_id_name), Tuple{Vector{Int64}, Vector{Int64}, Tuple{Nothing, Symbol}, Bool, Vector{Bool}, Bool, HeapSortAlg, Bool, Bool, Bool, Vector{Bool}, Symbol, Bool, Bool, Symbol, Vector{Bool}, Symbol}},typeof(_join_inner),SubDataset{Dataset, SubIndex{Index, Base.OneTo{Int64}, Vector{Int64}}, Base.OneTo{Int64}},Dataset,Val{Int32}}) Base.precompile(Tuple{Core.kwftype(typeof(sort)),NamedTuple{(:stable, :alg), Tuple{Bool, QuickSortAlg}},typeof(sort),Dataset,Vector{Int64}}) Base.precompile(Tuple{Core.kwftype(typeof(Type)),NamedTuple{(:x1, :x2, :x3, :x4, :x5, :x6, :x7, :x8, :x9, :x10), Tuple{Vector{Int64}, Vector{Int64}, Vector{Float64}, Vector{Date}, String, PooledVector{Characters{5}, UInt32, Vector{UInt32}}, Vector{Int32}, Vector{Float32}, PooledVector{Characters{3}, UInt32, Vector{UInt32}}, PooledVector{Characters{12}, UInt32, Vector{UInt32}}}},Type{Dataset}})