Skip to content

Commit

Permalink
Remove deprecated AsyncStream from docs and contrib
Browse files Browse the repository at this point in the history
rephrase redundant "setup up"

fix mismatched backticks

fix typo

run genstdlib

fix sphinx warning

grammar fix

add a missing the

rephrase "as many workers as cores"

double backticks for rst

remove a few unnecessary parens when calling at-test

comment grammar tweaks
  • Loading branch information
tkelman committed Aug 3, 2016
1 parent 2638c64 commit acc0005
Show file tree
Hide file tree
Showing 17 changed files with 26 additions and 29 deletions.
2 changes: 1 addition & 1 deletion base/clusterserialize.jl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function deserialize(s::ClusterSerializer, ::Type{TypeName})
if !full_body_sent
tn = get(known_object_data, number, nothing)::TypeName
if !haskey(object_numbers, tn)
# setup reverse mapping for serialize
# set up reverse mapping for serialize
object_numbers[tn] = number
end
deserialize_cycle(s, tn)
Expand Down
2 changes: 1 addition & 1 deletion base/managers.jl
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Keyword arguments:
+ `topology=:master_slave` : Only the driver process, i.e. `pid` 1 connects to the
workers. The workers do not connect to each other.
+ `topology=:custom` : The `launch` method of the cluster manager specifes the
+ `topology=:custom` : The `launch` method of the cluster manager specifies the
connection topology via fields `ident` and `connect_idents` in
`WorkerConfig`. A worker with a cluster manager identity `ident`
will connect to all workers specified in `connect_idents`.
Expand Down
4 changes: 2 additions & 2 deletions base/math.jl
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ end
Inf64
elseif x <= -1023
# if -1073 < x <= -1023 then Result will be a subnormal number
# Hex literal with padding must be use to work on 32bit machine
reinterpret(Float64, 0x0000_0000_0000_0001 << ((x + 1074)) % UInt)
# Hex literal with padding must be used to work on 32bit machine
reinterpret(Float64, 0x0000_0000_0000_0001 << ((x + 1074)) % UInt)
else
# We will cast everything to Int64 to avoid errors in case of Int128
# If x is a Int128, and is outside the range of Int64, then it is not -1023<x<=1023
Expand Down
2 changes: 1 addition & 1 deletion base/multi.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1635,7 +1635,7 @@ const worker_lock = ReentrantLock()
Launches worker processes via the specified cluster manager.
For example Beowulf clusters are supported via a custom cluster manager implemented in
package `ClusterManagers.jl`.
the package `ClusterManagers.jl`.
The number of seconds a newly launched worker waits for connection establishment from the
master can be specified via variable `JULIA_WORKER_TIMEOUT` in the worker process's
Expand Down
2 changes: 1 addition & 1 deletion base/serialize.jl
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ function deserialize_typename(s::AbstractSerializer, number)
known_object_data[number] = tn
end
if !haskey(object_numbers, tn)
# setup up reverse mapping for serialize
# set up reverse mapping for serialize
object_numbers[tn] = number
end
deserialize_cycle(s, tn)
Expand Down
2 changes: 1 addition & 1 deletion contrib/Julia_Notepad++.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<Keywords name="Folders in comment, middle"></Keywords>
<Keywords name="Folders in comment, close"></Keywords>
<Keywords name="Keywords1">true false C_NULL Inf NaN Inf32 NaN32 nothing</Keywords>
<Keywords name="Keywords2">AbstractArray AbstractMatrix AbstractRemoteRef AbstractSparseMatrix AbstractString AbstractVector Any ArgumentError Array Associative AsyncStream BigFloat BigInt BitArray BitMatrix BitVector Bool BunchKaufman Cchar Cdouble Cfloat Char CharString CholeskyDense CholeskyPivotedDense Cint Cintmax_t Clong Clonglong Colon Complex Complex128 Complex64 ComplexPair Cptrdiff_t Cshort Csize_t Cuchar Cuint Cuintmax_t Culong Culonglong Cushort DArray Dict Dims DisconnectException EOFError EachLine EnvHash ErrorException Exception Expr Factorization Filter Float Float32 Float64 Function GSVDDense IO IOBuffer IOStream ImaginaryUnit InsertionSort Int Int128 Int16 Int32 Int64 Int8 IntSet Integer KeyError LDLTTridiagonal LUDense LUTridiagonal LoadError LocalProcess Matrix MergeSort MethodError NTuple Number ObjectIdDict ObjectIdDict OrdinalRange ParseError PipeBuffer ProcessGroup Ptr QRDense QRPivotedDense QuickSort Range Range1 RangeIndex Ranges Rational Real Regex RegexMatch RegexMatchIterator RepString RevString Reverse SVDDense Set Signed SparseMatrixCSC SpawnNullStream Stat StridedArray StridedMatrix StridedVecOrMat StridedVector String SubArray SubDArray SubOrDArray SubString SymTridiagonal Symbol SystemError Task TCPSocket TimSort Tridiagonal Tuple Type TypeError UInt UInt128 UInt16 UInt32 UInt64 UInt8 UVError Union Unsigned VecOrMat Vector VersionNumber Void WeakKeyDict WeakRef Zip</Keywords>
<Keywords name="Keywords2">AbstractArray AbstractMatrix AbstractRemoteRef AbstractSparseMatrix AbstractString AbstractVector Any ArgumentError Array Associative BigFloat BigInt BitArray BitMatrix BitVector Bool BunchKaufman Cchar Cdouble Cfloat Char CharString CholeskyDense CholeskyPivotedDense Cint Cintmax_t Clong Clonglong Colon Complex Complex128 Complex64 ComplexPair Cptrdiff_t Cshort Csize_t Cuchar Cuint Cuintmax_t Culong Culonglong Cushort DArray Dict Dims DisconnectException EOFError EachLine EnvHash ErrorException Exception Expr Factorization Filter Float Float32 Float64 Function GSVDDense IO IOBuffer IOStream ImaginaryUnit InsertionSort Int Int128 Int16 Int32 Int64 Int8 IntSet Integer KeyError LDLTTridiagonal LUDense LUTridiagonal LoadError LocalProcess Matrix MergeSort MethodError NTuple Number ObjectIdDict ObjectIdDict OrdinalRange ParseError PipeBuffer ProcessGroup Ptr QRDense QRPivotedDense QuickSort Range Range1 RangeIndex Ranges Rational Real Regex RegexMatch RegexMatchIterator RepString RevString Reverse SVDDense Set Signed SparseMatrixCSC SpawnNullStream Stat StridedArray StridedMatrix StridedVecOrMat StridedVector String SubArray SubDArray SubOrDArray SubString SymTridiagonal Symbol SystemError Task TCPSocket TimSort Tridiagonal Tuple Type TypeError UInt UInt128 UInt16 UInt32 UInt64 UInt8 UVError Union Unsigned VecOrMat Vector VersionNumber Void WeakKeyDict WeakRef Zip</Keywords>
<Keywords name="Keywords3">abstract begin baremodule bitstype break catch ccall const continue do else elseif end export finally for function global if immutable import importall let local macro module quote return try type typealias using while</Keywords>
<Keywords name="Keywords4">close enumerate error info open print println read write warn</Keywords>
<Keywords name="Keywords5">print println</Keywords>
Expand Down
1 change: 0 additions & 1 deletion contrib/julia.lang
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,6 @@
<keyword>(Error|Interrupt|Disconnect)?Exception</keyword>
<keyword>Algorithm</keyword>
<keyword>Associative</keyword>
<keyword>AsyncStream</keyword>
<keyword>Box</keyword>
<keyword>BunchKaufman</keyword>
<keyword>CPUinfo</keyword>
Expand Down
1 change: 0 additions & 1 deletion contrib/julia.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
<item> Any </item>
<item> Array </item>
<item> Associative </item>
<item> AsyncStream </item>
<item> Bidiagonal </item>
<item> BitArray </item>
<item> BigFloat </item>
Expand Down
4 changes: 2 additions & 2 deletions doc/devdocs/init.rst
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ Base.eval

`jl_toplevel_eval_in() <https://github.com/JuliaLang/julia/blob/master/src/builtins.c>`_ calls `jl_toplevel_eval_flex() <https://github.com/JuliaLang/julia/blob/master/src/toplevel.c>`_ which calls `eval() in interpreter.c <https://github.com/JuliaLang/julia/blob/master/src/interpreter.c>`_.

The stack dump below shows how the interpreter works its way through various methods of :func:`Base.println` and :func:`Base.print` before arriving at `write{T}(s::AsyncStream, a::Array{T}) <https://github.com/JuliaLang/julia/blob/master/base/stream.jl>`_ which does :code:`ccall(jl_uv_write())`.
The stack dump below shows how the interpreter works its way through various methods of :func:`Base.println` and :func:`Base.print` before arriving at `write{T}(s::IO, a::Array{T}) <https://github.com/JuliaLang/julia/blob/master/base/stream.jl>`_ which does :code:`ccall(jl_uv_write())`.

`jl_uv_write() <https://github.com/JuliaLang/julia/blob/master/src/jl_uv.c>`_
calls :c:func:`uv_write` to write "Hello World!" to :c:macro:`JL_STDOUT`. See :ref:`dev-libuv`.::
Expand All @@ -195,7 +195,7 @@ calls :c:func:`uv_write` to write "Hello World!" to :c:macro:`JL_STDOUT`. See :r
Stack frame Source code Notes
============================ ================= ===============================================
jl_uv_write() jl_uv.c called though :func:`Base.ccall`
julia_write_282942 stream.jl function write!{T}(s::AsyncStream, a::Array{T})
julia_write_282942 stream.jl function write!{T}(s::IO, a::Array{T})
julia_print_284639 ascii.jl print(io::IO, s::String) = (write(io, s);nothing)
jlcall_print_284639
jl_apply() julia.h
Expand Down
2 changes: 1 addition & 1 deletion doc/devdocs/stdio.rst
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ stream, e.g.:
The :func:`Base.read` and :func:`Base.write` methods for these
streams use :func:`ccall` to call ``libuv`` wrappers in :code:`src/jl_uv.c`, e.g.::

stream.jl: function write(s::AsyncStream, p::Ptr, nb::Integer)
stream.jl: function write(s::IO, p::Ptr, nb::Integer)
-> ccall(:jl_uv_write, ...)
jl_uv.c: -> int jl_uv_write(uv_stream_t *stream, ...)
-> uv_write(uvw, stream, buf, ...)
Expand Down
2 changes: 1 addition & 1 deletion doc/manual/parallel-computing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@ Custom cluster managers would typically specify only ``io`` or ``host`` / ``port
additional workers.

- ``count`` with an integer value ``n`` will launch a total of ``n`` workers.
- ``count`` with a value of ``:auto`` will launch as many workers as cores on that machine.
- ``count`` with a value of ``:auto`` will launch as many workers as the number of cores on that machine.
- ``exename`` is the name of the ``julia`` executable including the full path.
- ``exeflags`` should be set to the required command line arguments for new workers.

Expand Down
2 changes: 1 addition & 1 deletion doc/stdlib/parallel.rst
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ General Parallel Computing Support
Launches worker processes via the specified cluster manager.

For example Beowulf clusters are supported via a custom cluster manager implemented in package ``ClusterManagers.jl``\ .
For example Beowulf clusters are supported via a custom cluster manager implemented in the package ``ClusterManagers.jl``\ .

The number of seconds a newly launched worker waits for connection establishment from the master can be specified via variable ``JULIA_WORKER_TIMEOUT`` in the worker process's environment. Relevant only when using TCP/IP as transport.

Expand Down
2 changes: 1 addition & 1 deletion src/signal-handling.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static int jl_check_force_sigint(void)
// Force sigint requires pressing `Ctrl-C` repeatedly.
// Ignore sigint for a short time after that to avoid rethrowing sigint too
// quickly again. (Code that has this issue is inherently racy but this is
// a interactive feature anyway.)
// an interactive feature anyway.)
static int jl_ignore_sigint(void)
{
return jl_disable_sigint_time && jl_disable_sigint_time > uv_hrtime();
Expand Down
2 changes: 1 addition & 1 deletion src/signals-mach.c
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ static void jl_try_deliver_sigint(void)
kern_return_t ret = thread_suspend(thread);
HANDLE_MACH_ERROR("thread_suspend", ret);

// This abort `sleep` and other syscall.
// This aborts `sleep` and other syscall.
ret = thread_abort(thread);
HANDLE_MACH_ERROR("thread_abort", ret);

Expand Down
18 changes: 9 additions & 9 deletions test/math.jl
Original file line number Diff line number Diff line change
Expand Up @@ -192,18 +192,18 @@ end
@test exp2(Float16(2.)) exp2(2.)
@test log(e) == 1

# check exp2(::Integer) matches exp2(::Float)"
# check exp2(::Integer) matches exp2(::Float)
for ii in -2048:2048
expected = exp2(float(ii))
@test(exp2(Int16(ii)) == expected)
@test(exp2(Int32(ii)) == expected)
@test(exp2(Int64(ii)) == expected)
@test(exp2(Int128(ii)) == expected)
@test exp2(Int16(ii)) == expected
@test exp2(Int32(ii)) == expected
@test exp2(Int64(ii)) == expected
@test exp2(Int128(ii)) == expected
if ii >= 0
@test(exp2(UInt16(ii)) == expected)
@test(exp2(UInt32(ii)) == expected)
@test(exp2(UInt64(ii)) == expected)
@test(exp2(UInt128(ii)) == expected)
@test exp2(UInt16(ii)) == expected
@test exp2(UInt32(ii)) == expected
@test exp2(UInt64(ii)) == expected
@test exp2(UInt128(ii)) == expected
end
end

Expand Down
4 changes: 2 additions & 2 deletions test/random.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ srand(0); rand(); x = rand(384)
@test -10 <= rand(-10:-5) <= -5
@test -10 <= rand(-10:5) <= 5
@test minimum([rand(Int32(1):Int32(7^7)) for i = 1:100000]) > 0
@test(typeof(rand(false:true)) === Bool)
@test(typeof(rand(Char)) === Char)
@test typeof(rand(false:true)) === Bool
@test typeof(rand(Char)) === Char
@test length(randn(4, 5)) == 20
@test length(bitrand(4, 5)) == 20

Expand Down
3 changes: 1 addition & 2 deletions test/spawn.jl
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,7 @@ yield()
put!(r,11)
yield()

# Test marking of AsyncStream

# Test marking of IO
r = Channel(1)
@async begin
port, server = listenany(2327)
Expand Down

0 comments on commit acc0005

Please sign in to comment.