Code reorganization

.github/workflows/windows.yml

@@ -20,7 +20,8 @@ jobs:
         runs-on: [windows-latest]
         sys:
         - {compiler: default}
-        - {compiler: clang}
+        # Enable again and fix remaining issues after refactoring
+        #- {compiler: clang}
 
     steps:
 

CMakeLists.txt

@@ -15,7 +15,7 @@ set(XTENSOR_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
 # Versionning
 # ===========
 
-file(STRINGS "${XTENSOR_INCLUDE_DIR}/xtensor/xtensor_config.hpp" xtensor_version_defines
+file(STRINGS "${XTENSOR_INCLUDE_DIR}/xtensor/core/xtensor_config.hpp" xtensor_version_defines
      REGEX "#define XTENSOR_VERSION_(MAJOR|MINOR|PATCH)")
 foreach(ver ${xtensor_version_defines})
     if(ver MATCHES "#define XTENSOR_VERSION_(MAJOR|MINOR|PATCH) +([^ ]+)$")
@@ -113,79 +113,79 @@ endif()
 # =====
 
 set(XTENSOR_HEADERS
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xaccessible.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xaccumulator.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xadapt.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xarray.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xassign.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xaxis_iterator.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xaxis_slice_iterator.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xblockwise_reducer.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xblockwise_reducer_functors.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xbroadcast.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xbuffer_adaptor.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xbuilder.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xchunked_array.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xchunked_assign.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xchunked_view.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xcomplex.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xcontainer.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xcsv.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xdynamic_view.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xeval.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xexception.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xexpression.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xexpression_holder.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xexpression_traits.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xfixed.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xfunction.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xfunctor_view.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xfft.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xgenerator.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xhistogram.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xindex_view.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xinfo.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xio.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xiterable.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xiterator.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xjson.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xlayout.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xmanipulation.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xmasked_view.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xmath.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xmime.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xmultiindex_iterator.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xnoalias.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xnorm.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xnpy.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xoffset_view.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xoperation.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xoptional.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xoptional_assembly.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xoptional_assembly_base.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xoptional_assembly_storage.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xpad.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xrandom.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xreducer.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xrepeat.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xscalar.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xsemantic.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xset_operation.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xshape.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xslice.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xsort.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xstorage.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xstrided_view.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xstrided_view_base.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xstrides.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xtensor.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xtensor_config.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xtensor_forward.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xtensor_simd.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xutils.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xvectorize.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xview.hpp
-    ${XTENSOR_INCLUDE_DIR}/xtensor/xview_utils.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/chunk/xchunked_array.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/chunk/xchunked_assign.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/chunk/xchunked_view.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/containers/xadapt.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/containers/xarray.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/containers/xbuffer_adaptor.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/containers/xcontainer.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/containers/xfixed.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/containers/xscalar.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/containers/xstorage.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/containers/xtensor.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xaccessible.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xassign.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xeval.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xexpression.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xexpression_traits.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xfunction.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xiterable.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xiterator.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xlayout.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xmath.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xmultiindex_iterator.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xnoalias.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xoperation.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xsemantic.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xshape.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xstrides.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xtensor_config.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xtensor_forward.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/core/xvectorize.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/generators/xbuilder.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/generators/xgenerator.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/generators/xrandom.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/io/xcsv.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/io/xinfo.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/io/xio.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/io/xjson.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/io/xmime.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/io/xnpy.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/misc/xcomplex.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/misc/xexpression_holder.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/misc/xfft.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/misc/xhistogram.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/misc/xmanipulation.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/misc/xpad.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/misc/xset_operation.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/misc/xsort.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/optional/xoptional.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/optional/xoptional_assembly.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/optional/xoptional_assembly_base.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/optional/xoptional_assembly_storage.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/reducers/xaccumulator.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/reducers/xblockwise_reducer.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/reducers/xblockwise_reducer_functors.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/reducers/xnorm.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/reducers/xreducer.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/utils/xexception.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/utils/xtensor_simd.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/utils/xutils.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/views/xaxis_iterator.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/views/xaxis_slice_iterator.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/views/xbroadcast.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/views/xdynamic_view.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/views/xfunctor_view.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/views/xindex_view.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/views/xmasked_view.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/views/xoffset_view.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/views/xrepeat.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/views/xslice.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/views/xstrided_view.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/views/xstrided_view_base.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/views/xview.hpp
+    ${XTENSOR_INCLUDE_DIR}/xtensor/views/xview_utils.hpp
 )
 
 add_library(xtensor INTERFACE)
@@ -263,8 +263,8 @@ install(TARGETS xtensor
 export(EXPORT ${PROJECT_NAME}-targets
        FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake")
 
-install(FILES ${XTENSOR_HEADERS}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtensor)
+install(DIRECTORY ${XTENSOR_INCLUDE_DIR}/xtensor
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 set(XTENSOR_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}" CACHE
     STRING "install path for xtensorConfig.cmake")
@@ -317,10 +317,10 @@ endfunction()
 set(XTENSOR_SINGLE_INCLUDE ${XTENSOR_HEADERS})
 string(REPLACE "${XTENSOR_INCLUDE_DIR}/" "" XTENSOR_SINGLE_INCLUDE "${XTENSOR_SINGLE_INCLUDE}")
 list(REMOVE_ITEM XTENSOR_SINGLE_INCLUDE
-    xtensor/xexpression_holder.hpp
-    xtensor/xjson.hpp
-    xtensor/xmime.hpp
-    xtensor/xnpy.hpp)
+    xtensor/misc/xexpression_holder.hpp
+    xtensor/io/xjson.hpp
+    xtensor/io/xmime.hpp
+    xtensor/io/xnpy.hpp)
 
 PREPEND(XTENSOR_SINGLE_INCLUDE "#include <" ${XTENSOR_SINGLE_INCLUDE})
 POSTFIX(XTENSOR_SINGLE_INCLUDE ">" ${XTENSOR_SINGLE_INCLUDE})

include/xtensor/xchunked_array.hpp → include/xtensor/chunk/xchunked_array.hpp

@@ -13,8 +13,8 @@
 #include <array>
 #include <vector>
 
-#include "xarray.hpp"
-#include "xchunked_assign.hpp"
+#include "../chunk/xchunked_assign.hpp"
+#include "../containers/xarray.hpp"
 
 namespace xt
 {

include/xtensor/xchunked_assign.hpp → include/xtensor/chunk/xchunked_assign.hpp

@@ -10,8 +10,8 @@
 #ifndef XTENSOR_CHUNKED_ASSIGN_HPP
 #define XTENSOR_CHUNKED_ASSIGN_HPP
 
-#include "xnoalias.hpp"
-#include "xstrided_view.hpp"
+#include "../core/xnoalias.hpp"
+#include "../views/xstrided_view.hpp"
 
 namespace xt
 {

include/xtensor/xchunked_view.hpp → include/xtensor/chunk/xchunked_view.hpp

@@ -12,10 +12,10 @@
 
 #include <xtl/xsequence.hpp>
 
-#include "xchunked_array.hpp"
-#include "xnoalias.hpp"
-#include "xstorage.hpp"
-#include "xstrided_view.hpp"
+#include "../chunk/xchunked_array.hpp"
+#include "../containers/xstorage.hpp"
+#include "../core/xnoalias.hpp"
+#include "../views/xstrided_view.hpp"
 
 namespace xt
 {

include/xtensor/xadapt.hpp → include/xtensor/containers/xadapt.hpp

@@ -17,10 +17,10 @@
 
 #include <xtl/xsequence.hpp>
 
-#include "xarray.hpp"
-#include "xbuffer_adaptor.hpp"
-#include "xfixed.hpp"
-#include "xtensor.hpp"
+#include "../containers/xarray.hpp"
+#include "../containers/xbuffer_adaptor.hpp"
+#include "../containers/xfixed.hpp"
+#include "../containers/xtensor.hpp"
 
 namespace xt
 {

include/xtensor/xarray.hpp → include/xtensor/containers/xarray.hpp

@@ -16,9 +16,9 @@
 
 #include <xtl/xsequence.hpp>
 
-#include "xbuffer_adaptor.hpp"
-#include "xcontainer.hpp"
-#include "xsemantic.hpp"
+#include "../containers/xbuffer_adaptor.hpp"
+#include "../containers/xcontainer.hpp"
+#include "../core/xsemantic.hpp"
 
 namespace xt
 {

include/xtensor/xbuffer_adaptor.hpp → include/xtensor/containers/xbuffer_adaptor.hpp

@@ -18,8 +18,8 @@
 
 #include <xtl/xclosure.hpp>
 
-#include "xstorage.hpp"
-#include "xtensor_config.hpp"
+#include "../containers/xstorage.hpp"
+#include "../core/xtensor_config.hpp"
 
 namespace xt
 {

include/xtensor/xcontainer.hpp → include/xtensor/containers/xcontainer.hpp

@@ -19,14 +19,14 @@
 #include <xtl/xmeta_utils.hpp>
 #include <xtl/xsequence.hpp>
 
-#include "xaccessible.hpp"
-#include "xiterable.hpp"
-#include "xiterator.hpp"
-#include "xmath.hpp"
-#include "xoperation.hpp"
-#include "xstrides.hpp"
-#include "xtensor_config.hpp"
-#include "xtensor_forward.hpp"
+#include "../core/xaccessible.hpp"
+#include "../core/xiterable.hpp"
+#include "../core/xiterator.hpp"
+#include "../core/xmath.hpp"
+#include "../core/xoperation.hpp"
+#include "../core/xstrides.hpp"
+#include "../core/xtensor_config.hpp"
+#include "../core/xtensor_forward.hpp"
 
 namespace xt
 {

include/xtensor/xfixed.hpp → include/xtensor/containers/xfixed.hpp

@@ -18,11 +18,11 @@
 
 #include <xtl/xsequence.hpp>
 
-#include "xcontainer.hpp"
-#include "xsemantic.hpp"
-#include "xstorage.hpp"
-#include "xstrides.hpp"
-#include "xtensor_config.hpp"
+#include "../containers/xcontainer.hpp"
+#include "../containers/xstorage.hpp"
+#include "../core/xsemantic.hpp"
+#include "../core/xstrides.hpp"
+#include "../core/xtensor_config.hpp"
 
 namespace xtl
 {

include/xtensor/xscalar.hpp → include/xtensor/containers/xscalar.hpp

@@ -16,11 +16,11 @@
 
 #include <xtl/xtype_traits.hpp>
 
-#include "xaccessible.hpp"
-#include "xexpression.hpp"
-#include "xiterable.hpp"
-#include "xlayout.hpp"
-#include "xtensor_simd.hpp"
+#include "../core/xaccessible.hpp"
+#include "../core/xexpression.hpp"
+#include "../core/xiterable.hpp"
+#include "../core/xlayout.hpp"
+#include "../utils/xtensor_simd.hpp"
 
 namespace xt
 {

include/xtensor/xstorage.hpp → include/xtensor/containers/xstorage.hpp

@@ -18,10 +18,10 @@
 #include <memory>
 #include <type_traits>
 
-#include "xexception.hpp"
-#include "xtensor_config.hpp"
-#include "xtensor_simd.hpp"
-#include "xutils.hpp"
+#include "../core/xtensor_config.hpp"
+#include "../utils/xexception.hpp"
+#include "../utils/xtensor_simd.hpp"
+#include "../utils/xutils.hpp"
 
 namespace xt
 {

include/xtensor/xtensor.hpp → include/xtensor/containers/xtensor.hpp

@@ -16,9 +16,9 @@
 #include <utility>
 #include <vector>
 
-#include "xbuffer_adaptor.hpp"
-#include "xcontainer.hpp"
-#include "xsemantic.hpp"
+#include "../containers/xbuffer_adaptor.hpp"
+#include "../containers/xcontainer.hpp"
+#include "../core/xsemantic.hpp"
 
 namespace xt
 {

include/xtensor/xaccessible.hpp → include/xtensor/core/xaccessible.hpp

@@ -10,9 +10,9 @@
 #ifndef XTENSOR_ACCESSIBLE_HPP
 #define XTENSOR_ACCESSIBLE_HPP
 
-#include "xexception.hpp"
-#include "xstrides.hpp"
-#include "xtensor_forward.hpp"
+#include "../core/xstrides.hpp"
+#include "../core/xtensor_forward.hpp"
+#include "../utils/xexception.hpp"
 
 namespace xt
 {

include/xtensor/xassign.hpp → include/xtensor/core/xassign.hpp

@@ -18,13 +18,13 @@
 #include <xtl/xcomplex.hpp>
 #include <xtl/xsequence.hpp>
 
-#include "xexpression.hpp"
-#include "xfunction.hpp"
-#include "xiterator.hpp"
-#include "xstrides.hpp"
-#include "xtensor_config.hpp"
-#include "xtensor_forward.hpp"
-#include "xutils.hpp"
+#include "../core/xexpression.hpp"
+#include "../core/xfunction.hpp"
+#include "../core/xiterator.hpp"
+#include "../core/xstrides.hpp"
+#include "../core/xtensor_config.hpp"
+#include "../core/xtensor_forward.hpp"
+#include "../utils/xutils.hpp"
 
 #if defined(XTENSOR_USE_TBB)
 #include <tbb/tbb.h>