Skip to content
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.

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

[release-0.5] backport #19196 #20583

Merged
merged 2 commits into from
Feb 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions base/reducedim.jl
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function reduced_dims(::Tuple{}, d::Int)
end
reduced_dims(::Tuple{}, region) = ()
function reduced_dims(dims::Dims, region)
map(last, reduced_dims(map(n->OneTo(n), dims), region))
map(last, reduced_indices(map(OneTo, dims), region))
end

function reduced_dims0(::Tuple{}, d::Int)
Expand All @@ -81,7 +81,7 @@ function reduced_dims0(::Tuple{}, d::Int)
end
reduced_dims0(::Tuple{}, region) = ()
function reduced_dims0(dims::Dims, region)
map(last, reduced_dims0(map(n->OneTo(n), dims), region))
map(last, reduced_indices0(map(OneTo, dims), region))
end


Expand Down
2 changes: 1 addition & 1 deletion doc/manual/getting-started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,6 @@ help new users get started with Julia:
- `Tutorial for Homer Reid's numerical analysis class <http://homerreid.dyndns.org/teaching/18.330/JuliaProgramming.shtml>`_
- `An introductory presentation <https://raw.githubusercontent.com/ViralBShah/julia-presentations/master/Fifth-Elephant-2013/Fifth-Elephant-2013.pdf>`_
- `Videos from the Julia tutorial at MIT <http://julialang.org/blog/2013/03/julia-tutorial-MIT>`_
- `Forio Julia Tutorials <http://forio.com/labs/julia-studio/tutorials/>`_
- `Forio Julia Tutorials <http://forio.com/about/labs/julia-studio/tutorials/>`_
- `YouTube videos from the JuliaCons <https://www.youtube.com/user/JuliaLanguage/playlists>`_

2 changes: 1 addition & 1 deletion doc/manual/packages.rst
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ We recommend that you create a `free account <https://github.com/join>`_ on GitH

where ``USERNAME`` is your actual GitHub user name.
Once you do this, the package manager knows your GitHub user name and can configure things accordingly.
You should also `upload <https://github.com/login?return_to=https%3A%2F%2Fgithub.com%2Fsettings%2Fssh>`_ your public SSH key to GitHub and set up an `SSH agent <http://linux.die.net/man/1/ssh-agent>`_ on your development machine so that you can push changes with minimal hassle.
You should also `upload <https://github.com/login?return_to=https%3A%2F%2Fgithub.com%2Fsettings%2Fssh>`_ your public SSH key to GitHub and set up an `SSH agent <https://linux.die.net/man/1/ssh-agent>`_ on your development machine so that you can push changes with minimal hassle.
In the future, we will make this system extensible and support other common git hosting options like `BitBucket <https://bitbucket.org>`_ and allow developers to choose their favorite.
Since the package development functions has been moved to the `PkgDev <https://github.com/JuliaLang/PkgDev.jl>`_ package, you need to run ``Pkg.add("PkgDev"); import PkgDev`` to access the functions starting with ``PkgDev.`` in the document below.

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 @@ -1103,6 +1103,6 @@ It is very important that the called function does not call back into Julia.

.. rubric:: Footnotes

.. [#mpi2rma] In this context, MPI refers to the MPI-1 standard. Beginning with MPI-2, the MPI standards committee introduced a new set of communication mechanisms, collectively referred to as Remote Memory Access (RMA). The motivation for adding RMA to the MPI standard was to facilitate one-sided communication patterns. For additional information on the latest MPI standard, see http://www.mpi-forum.org/docs.
.. [#mpi2rma] In this context, MPI refers to the MPI-1 standard. Beginning with MPI-2, the MPI standards committee introduced a new set of communication mechanisms, collectively referred to as Remote Memory Access (RMA). The motivation for adding RMA to the MPI standard was to facilitate one-sided communication patterns. For additional information on the latest MPI standard, see http://mpi-forum.org/docs.

.. _DArray: https://github.com/JuliaParallel/DistributedArrays.jl