xtensor-stack · JohanMabille · Apr 10, 2025 · Apr 9, 2025
diff --git a/docs/source/adaptor.rst b/docs/source/adaptor.rst
@@ -20,8 +20,8 @@ The following example shows how to bring an ``std::vector`` into the expression
 
     #include <cstddef>
     #include <vector>
-    #include <xtensor/xarray.hpp>
-    #include <xtensor/xadapt.hpp>
+    #include <xtensor/containers/xarray.hpp>
+    #include <xtensor/containers/xadapt.hpp>
 
     std::vector<double> v = {1., 2., 3., 4., 5., 6. };
     std::vector<std::size_t> shape = { 2, 3 };
@@ -50,7 +50,7 @@ ownership of the array:
 .. code::
 
     #include <cstddef>
-    #include <xtensor/xadapt.hpp>
+    #include <xtensor/containers/xadapt.hpp>
 
     void compute(double* data, std::size_t size)
     {
@@ -82,8 +82,8 @@ the ownership of the array, meaning it will be deleted when the adaptor is destr
 .. code::
 
     #include <cstddef>
-    #include <xtensor/xarray.hpp>
-    #include <xtensor/xadapt.hpp>
+    #include <xtensor/containers/xarray.hpp>
+    #include <xtensor/containers/xadapt.hpp>
 
     void compute(double*& data, std::size_t size)
     {
@@ -119,8 +119,8 @@ adaptor before calling ``compute`` and pass it to the function:
 .. code::
 
     #include <cstddef>
-    #include <xtensor/xarray.hpp>
-    #include <xtensor/xadapt.hpp>
+    #include <xtensor/containers/xarray.hpp>
+    #include <xtensor/containers/xadapt.hpp>
 
     template <class A>
     void compute(A& a)
@@ -154,8 +154,8 @@ Adapting C arrays allocated on the stack is as simple as adapting ``std::vector`
 
     #include <cstddef>
     #include <vector>
-    #include <xtensor/xarray.hpp>
-    #include <xtensor/xadapt.hpp>
+    #include <xtensor/containers/xarray.hpp>
+    #include <xtensor/containers/xadapt.hpp>
 
     double v[6] = {1., 2., 3., 4., 5., 6. };
     std::vector<std::size_t> shape = { 2, 3 };
@@ -185,8 +185,8 @@ It will automatically increment the reference count of shared pointers upon crea
 .. code::
 
     #include <memory>
-    #include <xtensor/xadapt.hpp>
-    #include <xtensor/xio.hpp>
+    #include <xtensor/containers/xadapt.hpp>
+    #include <xtensor/io/xio.hpp>
 
     std::shared_ptr<double> sptr(new double[8], std::default_delete<double[]>());
     sptr.get()[2] = 321.;
@@ -201,8 +201,8 @@ memory) as follows:
 .. code::
 
     #include <memory>
-    #include <xtensor/xadapt.hpp>
-    #include <xtensor/xio.hpp>
+    #include <xtensor/containers/xadapt.hpp>
+    #include <xtensor/io/xio.hpp>
 
     struct Buffer {
         Buffer(std::vector<double>& buf) : m_buf(buf) {}

diff --git a/docs/source/api/accumulating_functions.rst b/docs/source/api/accumulating_functions.rst
@@ -9,7 +9,7 @@ Accumulating functions
 
 **xtensor** provides the following accumulating functions for xexpressions:
 
-Defined in ``xtensor/xmath.hpp``
+Defined in ``xtensor/core/xmath.hpp``
 
 .. doxygenfunction:: cumsum(E&&)
 

diff --git a/docs/source/api/basic_functions.rst b/docs/source/api/basic_functions.rst
@@ -9,7 +9,7 @@ Basic functions
 
 **xtensor** provides the following basic functions for xexpressions and scalars:
 
-Defined in ``xtensor/xmath.hpp``
+Defined in ``xtensor/core/xmath.hpp``
 
 .. doxygenfunction:: abs(E&&)
 

diff --git a/docs/source/api/classif_functions.rst b/docs/source/api/classif_functions.rst
@@ -9,7 +9,7 @@ Classification functions
 
 **xtensor** provides the following classification functions for xexpressions and scalars:
 
-Defined in ``xtensor/xmath.hpp``
+Defined in ``xtensor/core/xmath.hpp``
 
 .. doxygenfunction:: isfinite(E&&)
 

diff --git a/docs/source/api/error_functions.rst b/docs/source/api/error_functions.rst
@@ -9,7 +9,7 @@ Error and gamma functions
 
 **xtensor** provides the following error and gamma functions for xexpressions:
 
-Defined in ``xtensor/xmath.hpp``
+Defined in ``xtensor/core/xmath.hpp``
 
 .. doxygenfunction:: erf(E&&)
 

diff --git a/docs/source/api/exponential_functions.rst b/docs/source/api/exponential_functions.rst
@@ -9,7 +9,7 @@ Exponential functions
 
 **xtensor** provides the following exponential functions for xexpressions:
 
-Defined in ``xtensor/xmath.hpp``
+Defined in ``xtensor/core/xmath.hpp``
 
 .. doxygenfunction:: exp(E&&)
 

diff --git a/docs/source/api/hyperbolic_functions.rst b/docs/source/api/hyperbolic_functions.rst
@@ -9,7 +9,7 @@ Hyperbolic functions
 
 **xtensor** provides the following hyperbolic functions for xexpressions:
 
-Defined in ``xtensor/xmath.hpp``
+Defined in ``xtensor/core/xmath.hpp``
 
 .. _sinh-function-reference:
 .. doxygenfunction:: sinh(E&&)

diff --git a/docs/source/api/index_related.rst b/docs/source/api/index_related.rst
@@ -7,7 +7,7 @@
 Index related functions
 =======================
 
-Defined in ``xtensor/xoperation.hpp``
+Defined in ``xtensor/core/xoperation.hpp``
 
 .. doxygenfunction:: where(const T&)
 

diff --git a/docs/source/api/nan_functions.rst b/docs/source/api/nan_functions.rst
@@ -9,7 +9,7 @@ NaN functions
 
 **xtensor** provides the following functions that deal with NaNs in xexpressions:
 
-Defined in ``xtensor/xmath.hpp``
+Defined in ``xtensor/core/xmath.hpp``
 
 .. doxygenfunction:: nan_to_num(E&&)
 

diff --git a/docs/source/api/nearint_operations.rst b/docs/source/api/nearint_operations.rst
@@ -9,7 +9,7 @@ Nearest integer floating point operations
 
 **xtensor** provides the following rounding operations for xexpressions:
 
-Defined in ``xtensor/xmath.hpp``
+Defined in ``xtensor/core/xmath.hpp``
 
 .. doxygenfunction:: ceil(E&&)
 

diff --git a/docs/source/api/operators.rst b/docs/source/api/operators.rst
@@ -7,7 +7,7 @@
 Operators and related functions
 ===============================
 
-Defined in ``xtensor/xmath.hpp`` and ``xtensor/xoperation.hpp``
+Defined in ``xtensor/core/xmath.hpp`` and ``xtensor/core/xoperation.hpp``
 
 .. doxygenfunction:: operator+(E&&)
 

diff --git a/docs/source/api/power_functions.rst b/docs/source/api/power_functions.rst
@@ -10,7 +10,7 @@ Power functions
 
 **xtensor** provides the following power functions for xexpressions and scalars:
 
-Defined in ``xtensor/xmath.hpp``
+Defined in ``xtensor/core/xmath.hpp``
 
 .. doxygenfunction:: pow(E1&&, E2&&)
 

diff --git a/docs/source/api/reducing_functions.rst b/docs/source/api/reducing_functions.rst
@@ -9,7 +9,7 @@ Reducing functions
 
 **xtensor** provides the following reducing functions for xexpressions:
 
-Defined in ``xtensor/xmath.hpp``
+Defined in ``xtensor/core/xmath.hpp``
 
 .. doxygenfunction:: sum(E&&, EVS)
 
@@ -49,7 +49,7 @@ Defined in ``xtensor/xmath.hpp``
 
 .. doxygenfunction:: trapz(const xexpression<T>&, const xexpression<E>&, std::ptrdiff_t)
 
-Defined in ``xtensor/xnorm.hpp``
+Defined in ``xtensor/reducers/xnorm.hpp``
 
 .. doxygenfunction:: norm_l0(E&&, X&&, EVS)
 

diff --git a/docs/source/api/trigonometric_functions.rst b/docs/source/api/trigonometric_functions.rst
@@ -9,7 +9,7 @@ Trigonometric functions
 
 **xtensor** provides the following trigonometric functions for xexpressions and scalars:
 
-Defined in ``xtensor/xmath.hpp``
+Defined in ``xtensor/core/xmath.hpp``
 
 .. doxygenfunction:: sin(E&&)
 

diff --git a/docs/source/api/xaccumulator.rst b/docs/source/api/xaccumulator.rst
@@ -7,7 +7,7 @@
 xaccumulator
 ============
 
-Defined in ``xtensor/xaccumulator.hpp``
+Defined in ``xtensor/reducers/xaccumulator.hpp``
 
 .. doxygenfunction:: xt::accumulate(F&&, E&&, EVS)
 

diff --git a/docs/source/api/xadapt.rst b/docs/source/api/xadapt.rst
@@ -7,7 +7,7 @@
 xadapt
 ======
 
-Defined in ``xtensor/xadapt.hpp``
+Defined in ``xtensor/containers/xadapt.hpp``
 
 .. cpp:namespace-push:: xt
 

diff --git a/docs/source/api/xarray.rst b/docs/source/api/xarray.rst
@@ -7,7 +7,7 @@
 xarray
 ======
 
-Defined in ``xtensor/xarray.hpp``
+Defined in ``xtensor/containers/xarray.hpp``
 
 .. doxygenclass:: xt::xarray_container
    :members:

diff --git a/docs/source/api/xarray_adaptor.rst b/docs/source/api/xarray_adaptor.rst
@@ -7,7 +7,7 @@
 xarray_adaptor
 ==============
 
-Defined in ``xtensor/xarray.hpp``
+Defined in ``xtensor/containers/xarray.hpp``
 
 .. doxygenclass:: xt::xarray_adaptor
    :members:
diff --git a/docs/source/api/xaxis_iterator.rst b/docs/source/api/xaxis_iterator.rst
@@ -7,7 +7,7 @@
 xaxis_iterator
 ==============
 
-Defined in ``xtensor/xaxis_iterator.hpp``
+Defined in ``xtensor/views/xaxis_iterator.hpp``
 
 .. doxygenclass:: xt::xaxis_iterator
    :members:

diff --git a/docs/source/api/xaxis_slice_iterator.rst b/docs/source/api/xaxis_slice_iterator.rst
@@ -8,7 +8,7 @@
 xaxis_slice_iterator
 ====================
 
-Defined in ``xtensor/xaxis_slice_iterator.hpp``
+Defined in ``xtensor/views/xaxis_slice_iterator.hpp``
 
 .. doxygenclass:: xt::xaxis_slice_iterator
    :members:

diff --git a/docs/source/api/xbroadcast.rst b/docs/source/api/xbroadcast.rst
@@ -7,7 +7,7 @@
 xbroadcast
 ==========
 
-Defined in ``xtensor/xbroadcast.hpp``
+Defined in ``xtensor/views/xbroadcast.hpp``
 
 .. doxygenclass:: xt::xbroadcast
    :members:

diff --git a/docs/source/api/xbuilder.rst b/docs/source/api/xbuilder.rst
@@ -7,7 +7,7 @@
 xbuilder
 ========
 
-Defined in ``xtensor/xbuilder.hpp``
+Defined in ``xtensor/generators/xbuilder.hpp``
 
 .. doxygenfunction:: xt::ones(S)
 

diff --git a/docs/source/api/xcontainer.rst b/docs/source/api/xcontainer.rst
@@ -7,7 +7,7 @@
 layout
 ======
 
-Defined in ``xtensor/xlayout.hpp``
+Defined in ``xtensor/core/xlayout.hpp``
 
 .. doxygenenum:: xt::layout_type
 
@@ -16,15 +16,15 @@ Defined in ``xtensor/xlayout.hpp``
 xcontainer
 ==========
 
-Defined in ``xtensor/xcontainer.hpp``
+Defined in ``xtensor/containers/xcontainer.hpp``
 
 .. doxygenclass:: xt::xcontainer
    :members:
 
 xstrided_container
 ==================
 
-Defined in ``xtensor/xcontainer.hpp``
+Defined in ``xtensor/containers/xcontainer.hpp``
 
 .. doxygenclass:: xt::xstrided_container
    :members:
diff --git a/docs/source/api/xcontainer_semantic.rst b/docs/source/api/xcontainer_semantic.rst
@@ -7,7 +7,7 @@
 xcontainer_semantic
 ===================
 
-Defined in ``xtensor/xsemantic.hpp``
+Defined in ``xtensor/core/xsemantic.hpp``
 
 .. doxygenclass:: xt::xcontainer_semantic
    :members:
diff --git a/docs/source/api/xcsv.rst b/docs/source/api/xcsv.rst
@@ -7,7 +7,7 @@
 xcsv: read/write CSV files
 ==========================
 
-Defined in ``xtensor/xcsv.hpp``
+Defined in ``xtensor/io/xcsv.hpp``
 
 .. doxygenfunction:: xt::load_csv
 

diff --git a/docs/source/api/xexpression.rst b/docs/source/api/xexpression.rst
@@ -7,7 +7,7 @@
 xexpression
 ===========
 
-Defined in ``xtensor/xexpression.hpp``
+Defined in ``xtensor/core/xexpression.hpp``
 
 .. doxygenclass:: xt::xexpression
    :members:

diff --git a/docs/source/api/xfixed.rst b/docs/source/api/xfixed.rst
@@ -7,7 +7,7 @@
 xtensor_fixed
 =============
 
-Defined in ``xtensor/xfixed.hpp``
+Defined in ``xtensor/containers/xfixed.hpp``
 
 .. doxygenclass:: xt::xfixed_container
    :members:

diff --git a/docs/source/api/xfunction.rst b/docs/source/api/xfunction.rst
@@ -7,11 +7,11 @@
 xfunction
 =========
 
-Defined in ``xtensor/xfunction.hpp``
+Defined in ``xtensor/core/xfunction.hpp``
 
 .. doxygenclass:: xt::xfunction
    :members:
 
-Defined in ``xtensor/xmath.hpp``
+Defined in ``xtensor/core/xmath.hpp``
 
 .. doxygenfunction:: make_lambda_xfunction
diff --git a/docs/source/api/xgenerator.rst b/docs/source/api/xgenerator.rst
@@ -7,7 +7,7 @@
 xgenerator
 ==========
 
-Defined in ``xtensor/xgenerator.hpp``
+Defined in ``xtensor/generators/xgenerator.hpp``
 
 .. doxygenclass:: xt::xgenerator
    :members:
diff --git a/docs/source/api/xhistogram.rst b/docs/source/api/xhistogram.rst
@@ -7,7 +7,7 @@
 xhistogram
 ==========
 
-Defined in ``xtensor/xhistogram.hpp``
+Defined in ``xtensor/misc/xhistogram.hpp``
 
 .. doxygenenum:: xt::histogram_algorithm
 

diff --git a/docs/source/api/xindex_view.rst b/docs/source/api/xindex_view.rst
@@ -7,7 +7,7 @@
 xindex_view
 ===========
 
-Defined in ``xtensor/xindex_view.hpp``
+Defined in ``xtensor/views/xindex_view.hpp``
 
 .. doxygenclass:: xt::xindex_view
    :members:

diff --git a/docs/source/api/xio.rst b/docs/source/api/xio.rst
@@ -7,15 +7,15 @@
 xio: pretty printing
 ====================
 
-Defined in ``xtensor/xio.hpp``
+Defined in ``xtensor/io/xio.hpp``
 
 This file defines functions for pretty printing xexpressions. It defines appropriate
 overloads for the ``<<`` operator for std::ostreams and xexpressions.
 
 .. code::
 
-    #include <xtensor/xio.hpp>
-    #include <xtensor/xarray.hpp>
+    #include <xtensor/io/xio.hpp>
+    #include <xtensor/containers/xarray.hpp>
 
     int main()
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
     xadapt
     ======
-    Defined in ``xtensor/xadapt.hpp``
+    Defined in ``xtensor/containers/xadapt.hpp``
     .. cpp:namespace-push:: xt
@@ Expand Down @@