Skip to content

Commit

Permalink
capitalize Sys.CPU_NAME
Browse files Browse the repository at this point in the history
This was the only value exported from Sys with a lowercase name –
all other lowercase exports are functions and values are uppercase.
  • Loading branch information
StefanKarpinski committed Dec 16, 2017
1 parent 1a542ea commit 9d3198e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
3 changes: 3 additions & 0 deletions base/deprecated.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2164,6 +2164,9 @@ end
@deprecate parse(str::AbstractString, pos::Int, ; kwargs...) Meta.parse(str, pos; kwargs...)
@deprecate_binding ParseError Meta.ParseError

# issue #20899
# TODO: delete cpu_name deprecation in base/sysinfo.jl

@eval LinAlg begin
@deprecate chol!(x::Number, uplo) chol(x) false
end
Expand Down
2 changes: 1 addition & 1 deletion base/interactiveutil.jl
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ function versioninfo(io::IO=STDOUT; verbose::Bool=false, packages::Bool=false)
end
println(io, " LAPACK: ",liblapack_name)
println(io, " LIBM: ",libm_name)
println(io, " LLVM: libLLVM-",libllvm_version," (", Sys.JIT, ", ", Sys.cpu_name, ")")
println(io, " LLVM: libLLVM-",libllvm_version," (", Sys.JIT, ", ", Sys.CPU_NAME, ")")

println(io, "Environment:")
for (k,v) in ENV
Expand Down
5 changes: 3 additions & 2 deletions base/sysinfo.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ Provide methods for retrieving information about hardware and the operating syst
""" -> Sys

export CPU_CORES,
CPU_NAME,
WORD_SIZE,
ARCH,
MACHINE,
KERNEL,
JIT,
cpu_info,
cpu_name,
cpu_summary,
uptime,
loadavg,
Expand Down Expand Up @@ -71,8 +71,9 @@ function __init__()
haskey(ENV,"JULIA_CPU_CORES") ? parse(Int,ENV["JULIA_CPU_CORES"]) :
Int(ccall(:jl_cpu_cores, Int32, ()))
global SC_CLK_TCK = ccall(:jl_SC_CLK_TCK, Clong, ())
global cpu_name = ccall(:jl_get_cpu_name, Ref{String}, ())
global CPU_NAME = ccall(:jl_get_cpu_name, Ref{String}, ())
global JIT = ccall(:jl_get_JIT, Ref{String}, ())
@eval @Base.deprecate_binding cpu_name CPU_NAME
end

mutable struct UV_cpu_info_t
Expand Down

0 comments on commit 9d3198e

Please sign in to comment.