Merge pull request #16972 from JuliaLang/sb/sub2view

rename sub/slice -> view

Author: JeffBezanson

base/abstractarray.jl

@@ -1416,7 +1416,7 @@ function mapslices(f, A::AbstractArray, dims::AbstractVector)
         idx[d] = Colon()
     end
 
-    r1 = f(slice(A, idx...))
+    r1 = f(view(A, idx...))
 
     # determine result size and allocate
     Rsize = copy(dimsA)
@@ -1448,7 +1448,7 @@ function mapslices(f, A::AbstractArray, dims::AbstractVector)
             for i in 1:nidx
                 idx[otherdims[i]] = ridx[otherdims[i]] = I.I[i]
             end
-            R[ridx...] = f(slice(A, idx...))
+            R[ridx...] = f(view(A, idx...))
         end
     end
 

base/deprecated.jl

@@ -756,6 +756,9 @@ function first(::Colon)
     1
 end
 
+@deprecate slice view
+@deprecate sub view
+
 # During the 0.5 development cycle, do not add any deprecations below this line
 # To be deprecated in 0.6
 

base/docs/helpdb/Base.jl

@@ -5383,14 +5383,14 @@ is raised as an exception in the woken tasks.
 notify
 
 """
-    sub(A, inds...)
+    view(A, inds...)
 
 Like [`getindex`](:func:`getindex`), but returns a view into the parent array `A` with the
 given indices instead of making a copy.  Calling [`getindex`](:func:`getindex`) or
 [`setindex!`](:func:`setindex!`) on the returned [`SubArray`](:obj:`SubArray`) computes the
 indices to the parent array on the fly without checking bounds.
 """
-sub
+view
 
 """
     expanduser(path::AbstractString) -> AbstractString
@@ -7408,14 +7408,6 @@ julia> "Hello " * "world"
 """
 Base.:(*)(s::AbstractString, t::AbstractString)
 
-"""
-    slice(A, inds...)
-
-Returns a view of array `A` with the given indices like [`sub`](:func:`sub`), but drops all
-dimensions indexed with scalars.
-"""
-slice
-
 """
     time()
 

base/exports.jl

@@ -587,7 +587,6 @@ export
     shuffle,
     shuffle!,
     size,
-    slice,
     slicedim,
     sort!,
     sort,
@@ -601,7 +600,6 @@ export
     step,
     stride,
     strides,
-    sub,
     sub2ind,
     sum!,
     sum,
@@ -612,6 +610,7 @@ export
     sum_kbn,
     vcat,
     vec,
+    view,
     zeros,
 
 # linear algebra

base/iterator.jl

@@ -547,7 +547,7 @@ done(itr::PartitionIterator, state) = done(itr.c, state)
 function next{T<:Vector}(itr::PartitionIterator{T}, state)
     l = state
     r = min(state + itr.n-1, length(itr.c))
-    return sub(itr.c, l:r), r + 1
+    return view(itr.c, l:r), r + 1
 end
 
 function next(itr::PartitionIterator, state)

base/linalg/arnoldi.jl

@@ -303,8 +303,8 @@ end
 
 function A_mul_B!{T,S}(u::StridedVector{T}, s::SVDOperator{T,S}, v::StridedVector{T})
     a, b = s.m, length(v)
-    A_mul_B!(sub(u,1:a), s.X, sub(v,a+1:b)) # left singular vector
-    Ac_mul_B!(sub(u,a+1:b), s.X, sub(v,1:a)) # right singular vector
+    A_mul_B!(view(u,1:a), s.X, view(v,a+1:b)) # left singular vector
+    Ac_mul_B!(view(u,a+1:b), s.X, view(v,1:a)) # right singular vector
     u
 end
 size(s::SVDOperator)  = s.m + s.n, s.m + s.n

base/linalg/arpack.jl

@@ -53,8 +53,8 @@ function aupd_wrapper(T, matvecA!::Function, matvecB::Function, solveSI::Functio
             throw(ARPACKException(info[1]))
         end
 
-        x = sub(workd, ipntr[1]+zernm1)
-        y = sub(workd, ipntr[2]+zernm1)
+        x = view(workd, ipntr[1]+zernm1)
+        y = view(workd, ipntr[2]+zernm1)
         if mode == 1  # corresponds to dsdrv1, dndrv1 or zndrv1
             if ido[1] == 1
                 matvecA!(y, x)
@@ -89,7 +89,7 @@ function aupd_wrapper(T, matvecA!::Function, matvecB::Function, solveSI::Functio
             if ido[1] == -1
                 y[:] = solveSI(matvecB(x))
             elseif  ido[1] == 1
-                y[:] = solveSI(sub(workd,ipntr[3]+zernm1))
+                y[:] = solveSI(view(workd,ipntr[3]+zernm1))
             elseif ido[1] == 2
                 y[:] = matvecB(x)
             elseif ido[1] == 99

base/linalg/cholesky.jl

@@ -379,11 +379,11 @@ function A_ldiv_B!{T<:BlasFloat}(C::CholeskyPivoted{T}, B::StridedMatrix{T})
     chkfullrank(C)
     n = size(C, 1)
     for i=1:size(B, 2)
-        permute!(sub(B, 1:n, i), C.piv)
+        permute!(view(B, 1:n, i), C.piv)
     end
     LAPACK.potrs!(C.uplo, C.factors, B)
     for i=1:size(B, 2)
-        ipermute!(sub(B, 1:n, i), C.piv)
+        ipermute!(view(B, 1:n, i), C.piv)
     end
     B
 end

base/linalg/eigen.jl

@@ -35,7 +35,7 @@ function eigfact!{T<:BlasReal}(A::StridedMatrix{T}; permute::Bool=true, scale::B
     j = 1
     while j <= n
         if WI[j] == 0
-            evec[:,j] = slice(VR, :, j)
+            evec[:,j] = view(VR, :, j)
         else
             for i = 1:n
                 evec[i,j]   = VR[i,j] + im*VR[i,j+1]
@@ -131,7 +131,7 @@ function eigfact!{T<:BlasReal}(A::StridedMatrix{T}, B::StridedMatrix{T})
     j = 1
     while j <= n
         if alphai[j] == 0
-            vecs[:,j] = slice(vr, :, j)
+            vecs[:,j] = view(vr, :, j)
         else
             for i = 1:n
                 vecs[i,j  ] = vr[i,j] + im*vr[i,j+1]

base/linalg/lapack.jl

@@ -1437,7 +1437,7 @@ for (gglse, elty) in ((:dgglse_, :Float64),
                     work = Array{$elty}(lwork)
                 end
             end
-            X, dot(sub(c, n - p + 1:m), sub(c, n - p + 1:m))
+            X, dot(view(c, n - p + 1:m), view(c, n - p + 1:m))
         end
     end
 end