Skip to content

Commit c2e9b7b

Browse files
JohanMabilleJohanMabille
committed
Code reorganization
1 parent 4788614 commit c2e9b7b

File tree

156 files changed

+701
-700
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+701
-700
lines changed

‎.github/workflows/windows.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ jobs:
2020
runs-on: [windows-latest]
2121
sys:
2222
- {compiler: default}
23-
- {compiler: clang}
23+
# Enable again and fix remaining issues after refactoring
24+
#- {compiler: clang}
2425

2526
steps:
2627

‎CMakeLists.txt‎

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set(XTENSOR_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
1515
# Versionning
1616
# ===========
1717

18-
file(STRINGS "${XTENSOR_INCLUDE_DIR}/xtensor/xtensor_config.hpp" xtensor_version_defines
18+
file(STRINGS "${XTENSOR_INCLUDE_DIR}/xtensor/core/xtensor_config.hpp" xtensor_version_defines
1919
REGEX "#define XTENSOR_VERSION_(MAJOR|MINOR|PATCH)")
2020
foreach(ver ${xtensor_version_defines})
2121
if(ver MATCHES "#define XTENSOR_VERSION_(MAJOR|MINOR|PATCH) +([^ ]+)$")
@@ -113,79 +113,79 @@ endif()
113113
# =====
114114

115115
set(XTENSOR_HEADERS
116-
${XTENSOR_INCLUDE_DIR}/xtensor/xaccessible.hpp
117-
${XTENSOR_INCLUDE_DIR}/xtensor/xaccumulator.hpp
118-
${XTENSOR_INCLUDE_DIR}/xtensor/xadapt.hpp
119-
${XTENSOR_INCLUDE_DIR}/xtensor/xarray.hpp
120-
${XTENSOR_INCLUDE_DIR}/xtensor/xassign.hpp
121-
${XTENSOR_INCLUDE_DIR}/xtensor/xaxis_iterator.hpp
122-
${XTENSOR_INCLUDE_DIR}/xtensor/xaxis_slice_iterator.hpp
123-
${XTENSOR_INCLUDE_DIR}/xtensor/xblockwise_reducer.hpp
124-
${XTENSOR_INCLUDE_DIR}/xtensor/xblockwise_reducer_functors.hpp
125-
${XTENSOR_INCLUDE_DIR}/xtensor/xbroadcast.hpp
126-
${XTENSOR_INCLUDE_DIR}/xtensor/xbuffer_adaptor.hpp
127-
${XTENSOR_INCLUDE_DIR}/xtensor/xbuilder.hpp
128-
${XTENSOR_INCLUDE_DIR}/xtensor/xchunked_array.hpp
129-
${XTENSOR_INCLUDE_DIR}/xtensor/xchunked_assign.hpp
130-
${XTENSOR_INCLUDE_DIR}/xtensor/xchunked_view.hpp
131-
${XTENSOR_INCLUDE_DIR}/xtensor/xcomplex.hpp
132-
${XTENSOR_INCLUDE_DIR}/xtensor/xcontainer.hpp
133-
${XTENSOR_INCLUDE_DIR}/xtensor/xcsv.hpp
134-
${XTENSOR_INCLUDE_DIR}/xtensor/xdynamic_view.hpp
135-
${XTENSOR_INCLUDE_DIR}/xtensor/xeval.hpp
136-
${XTENSOR_INCLUDE_DIR}/xtensor/xexception.hpp
137-
${XTENSOR_INCLUDE_DIR}/xtensor/xexpression.hpp
138-
${XTENSOR_INCLUDE_DIR}/xtensor/xexpression_holder.hpp
139-
${XTENSOR_INCLUDE_DIR}/xtensor/xexpression_traits.hpp
140-
${XTENSOR_INCLUDE_DIR}/xtensor/xfixed.hpp
141-
${XTENSOR_INCLUDE_DIR}/xtensor/xfunction.hpp
142-
${XTENSOR_INCLUDE_DIR}/xtensor/xfunctor_view.hpp
143-
${XTENSOR_INCLUDE_DIR}/xtensor/xfft.hpp
144-
${XTENSOR_INCLUDE_DIR}/xtensor/xgenerator.hpp
145-
${XTENSOR_INCLUDE_DIR}/xtensor/xhistogram.hpp
146-
${XTENSOR_INCLUDE_DIR}/xtensor/xindex_view.hpp
147-
${XTENSOR_INCLUDE_DIR}/xtensor/xinfo.hpp
148-
${XTENSOR_INCLUDE_DIR}/xtensor/xio.hpp
149-
${XTENSOR_INCLUDE_DIR}/xtensor/xiterable.hpp
150-
${XTENSOR_INCLUDE_DIR}/xtensor/xiterator.hpp
151-
${XTENSOR_INCLUDE_DIR}/xtensor/xjson.hpp
152-
${XTENSOR_INCLUDE_DIR}/xtensor/xlayout.hpp
153-
${XTENSOR_INCLUDE_DIR}/xtensor/xmanipulation.hpp
154-
${XTENSOR_INCLUDE_DIR}/xtensor/xmasked_view.hpp
155-
${XTENSOR_INCLUDE_DIR}/xtensor/xmath.hpp
156-
${XTENSOR_INCLUDE_DIR}/xtensor/xmime.hpp
157-
${XTENSOR_INCLUDE_DIR}/xtensor/xmultiindex_iterator.hpp
158-
${XTENSOR_INCLUDE_DIR}/xtensor/xnoalias.hpp
159-
${XTENSOR_INCLUDE_DIR}/xtensor/xnorm.hpp
160-
${XTENSOR_INCLUDE_DIR}/xtensor/xnpy.hpp
161-
${XTENSOR_INCLUDE_DIR}/xtensor/xoffset_view.hpp
162-
${XTENSOR_INCLUDE_DIR}/xtensor/xoperation.hpp
163-
${XTENSOR_INCLUDE_DIR}/xtensor/xoptional.hpp
164-
${XTENSOR_INCLUDE_DIR}/xtensor/xoptional_assembly.hpp
165-
${XTENSOR_INCLUDE_DIR}/xtensor/xoptional_assembly_base.hpp
166-
${XTENSOR_INCLUDE_DIR}/xtensor/xoptional_assembly_storage.hpp
167-
${XTENSOR_INCLUDE_DIR}/xtensor/xpad.hpp
168-
${XTENSOR_INCLUDE_DIR}/xtensor/xrandom.hpp
169-
${XTENSOR_INCLUDE_DIR}/xtensor/xreducer.hpp
170-
${XTENSOR_INCLUDE_DIR}/xtensor/xrepeat.hpp
171-
${XTENSOR_INCLUDE_DIR}/xtensor/xscalar.hpp
172-
${XTENSOR_INCLUDE_DIR}/xtensor/xsemantic.hpp
173-
${XTENSOR_INCLUDE_DIR}/xtensor/xset_operation.hpp
174-
${XTENSOR_INCLUDE_DIR}/xtensor/xshape.hpp
175-
${XTENSOR_INCLUDE_DIR}/xtensor/xslice.hpp
176-
${XTENSOR_INCLUDE_DIR}/xtensor/xsort.hpp
177-
${XTENSOR_INCLUDE_DIR}/xtensor/xstorage.hpp
178-
${XTENSOR_INCLUDE_DIR}/xtensor/xstrided_view.hpp
179-
${XTENSOR_INCLUDE_DIR}/xtensor/xstrided_view_base.hpp
180-
${XTENSOR_INCLUDE_DIR}/xtensor/xstrides.hpp
181-
${XTENSOR_INCLUDE_DIR}/xtensor/xtensor.hpp
182-
${XTENSOR_INCLUDE_DIR}/xtensor/xtensor_config.hpp
183-
${XTENSOR_INCLUDE_DIR}/xtensor/xtensor_forward.hpp
184-
${XTENSOR_INCLUDE_DIR}/xtensor/xtensor_simd.hpp
185-
${XTENSOR_INCLUDE_DIR}/xtensor/xutils.hpp
186-
${XTENSOR_INCLUDE_DIR}/xtensor/xvectorize.hpp
187-
${XTENSOR_INCLUDE_DIR}/xtensor/xview.hpp
188-
${XTENSOR_INCLUDE_DIR}/xtensor/xview_utils.hpp
116+
${XTENSOR_INCLUDE_DIR}/xtensor/chunk/xchunked_array.hpp
117+
${XTENSOR_INCLUDE_DIR}/xtensor/chunk/xchunked_assign.hpp
118+
${XTENSOR_INCLUDE_DIR}/xtensor/chunk/xchunked_view.hpp
119+
${XTENSOR_INCLUDE_DIR}/xtensor/containers/xadapt.hpp
120+
${XTENSOR_INCLUDE_DIR}/xtensor/containers/xarray.hpp
121+
${XTENSOR_INCLUDE_DIR}/xtensor/containers/xbuffer_adaptor.hpp
122+
${XTENSOR_INCLUDE_DIR}/xtensor/containers/xcontainer.hpp
123+
${XTENSOR_INCLUDE_DIR}/xtensor/containers/xfixed.hpp
124+
${XTENSOR_INCLUDE_DIR}/xtensor/containers/xscalar.hpp
125+
${XTENSOR_INCLUDE_DIR}/xtensor/containers/xstorage.hpp
126+
${XTENSOR_INCLUDE_DIR}/xtensor/containers/xtensor.hpp
127+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xaccessible.hpp
128+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xassign.hpp
129+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xeval.hpp
130+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xexpression.hpp
131+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xexpression_traits.hpp
132+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xfunction.hpp
133+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xiterable.hpp
134+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xiterator.hpp
135+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xlayout.hpp
136+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xmath.hpp
137+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xmultiindex_iterator.hpp
138+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xnoalias.hpp
139+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xoperation.hpp
140+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xsemantic.hpp
141+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xshape.hpp
142+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xstrides.hpp
143+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xtensor_config.hpp
144+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xtensor_forward.hpp
145+
${XTENSOR_INCLUDE_DIR}/xtensor/core/xvectorize.hpp
146+
${XTENSOR_INCLUDE_DIR}/xtensor/generators/xbuilder.hpp
147+
${XTENSOR_INCLUDE_DIR}/xtensor/generators/xgenerator.hpp
148+
${XTENSOR_INCLUDE_DIR}/xtensor/generators/xrandom.hpp
149+
${XTENSOR_INCLUDE_DIR}/xtensor/io/xcsv.hpp
150+
${XTENSOR_INCLUDE_DIR}/xtensor/io/xinfo.hpp
151+
${XTENSOR_INCLUDE_DIR}/xtensor/io/xio.hpp
152+
${XTENSOR_INCLUDE_DIR}/xtensor/io/xjson.hpp
153+
${XTENSOR_INCLUDE_DIR}/xtensor/io/xmime.hpp
154+
${XTENSOR_INCLUDE_DIR}/xtensor/io/xnpy.hpp
155+
${XTENSOR_INCLUDE_DIR}/xtensor/misc/xcomplex.hpp
156+
${XTENSOR_INCLUDE_DIR}/xtensor/misc/xexpression_holder.hpp
157+
${XTENSOR_INCLUDE_DIR}/xtensor/misc/xfft.hpp
158+
${XTENSOR_INCLUDE_DIR}/xtensor/misc/xhistogram.hpp
159+
${XTENSOR_INCLUDE_DIR}/xtensor/misc/xmanipulation.hpp
160+
${XTENSOR_INCLUDE_DIR}/xtensor/misc/xpad.hpp
161+
${XTENSOR_INCLUDE_DIR}/xtensor/misc/xset_operation.hpp
162+
${XTENSOR_INCLUDE_DIR}/xtensor/misc/xsort.hpp
163+
${XTENSOR_INCLUDE_DIR}/xtensor/optional/xoptional.hpp
164+
${XTENSOR_INCLUDE_DIR}/xtensor/optional/xoptional_assembly.hpp
165+
${XTENSOR_INCLUDE_DIR}/xtensor/optional/xoptional_assembly_base.hpp
166+
${XTENSOR_INCLUDE_DIR}/xtensor/optional/xoptional_assembly_storage.hpp
167+
${XTENSOR_INCLUDE_DIR}/xtensor/reducers/xaccumulator.hpp
168+
${XTENSOR_INCLUDE_DIR}/xtensor/reducers/xblockwise_reducer.hpp
169+
${XTENSOR_INCLUDE_DIR}/xtensor/reducers/xblockwise_reducer_functors.hpp
170+
${XTENSOR_INCLUDE_DIR}/xtensor/reducers/xnorm.hpp
171+
${XTENSOR_INCLUDE_DIR}/xtensor/reducers/xreducer.hpp
172+
${XTENSOR_INCLUDE_DIR}/xtensor/utils/xexception.hpp
173+
${XTENSOR_INCLUDE_DIR}/xtensor/utils/xtensor_simd.hpp
174+
${XTENSOR_INCLUDE_DIR}/xtensor/utils/xutils.hpp
175+
${XTENSOR_INCLUDE_DIR}/xtensor/views/xaxis_iterator.hpp
176+
${XTENSOR_INCLUDE_DIR}/xtensor/views/xaxis_slice_iterator.hpp
177+
${XTENSOR_INCLUDE_DIR}/xtensor/views/xbroadcast.hpp
178+
${XTENSOR_INCLUDE_DIR}/xtensor/views/xdynamic_view.hpp
179+
${XTENSOR_INCLUDE_DIR}/xtensor/views/xfunctor_view.hpp
180+
${XTENSOR_INCLUDE_DIR}/xtensor/views/xindex_view.hpp
181+
${XTENSOR_INCLUDE_DIR}/xtensor/views/xmasked_view.hpp
182+
${XTENSOR_INCLUDE_DIR}/xtensor/views/xoffset_view.hpp
183+
${XTENSOR_INCLUDE_DIR}/xtensor/views/xrepeat.hpp
184+
${XTENSOR_INCLUDE_DIR}/xtensor/views/xslice.hpp
185+
${XTENSOR_INCLUDE_DIR}/xtensor/views/xstrided_view.hpp
186+
${XTENSOR_INCLUDE_DIR}/xtensor/views/xstrided_view_base.hpp
187+
${XTENSOR_INCLUDE_DIR}/xtensor/views/xview.hpp
188+
${XTENSOR_INCLUDE_DIR}/xtensor/views/xview_utils.hpp
189189
)
190190

191191
add_library(xtensor INTERFACE)
@@ -263,8 +263,8 @@ install(TARGETS xtensor
263263
export(EXPORT ${PROJECT_NAME}-targets
264264
FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake")
265265

266-
install(FILES ${XTENSOR_HEADERS}
267-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtensor)
266+
install(DIRECTORY ${XTENSOR_INCLUDE_DIR}/xtensor
267+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
268268

269269
set(XTENSOR_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}" CACHE
270270
STRING "install path for xtensorConfig.cmake")
@@ -317,10 +317,10 @@ endfunction()
317317
set(XTENSOR_SINGLE_INCLUDE ${XTENSOR_HEADERS})
318318
string(REPLACE "${XTENSOR_INCLUDE_DIR}/" "" XTENSOR_SINGLE_INCLUDE "${XTENSOR_SINGLE_INCLUDE}")
319319
list(REMOVE_ITEM XTENSOR_SINGLE_INCLUDE
320-
xtensor/xexpression_holder.hpp
321-
xtensor/xjson.hpp
322-
xtensor/xmime.hpp
323-
xtensor/xnpy.hpp)
320+
xtensor/misc/xexpression_holder.hpp
321+
xtensor/io/xjson.hpp
322+
xtensor/io/xmime.hpp
323+
xtensor/io/xnpy.hpp)
324324

325325
PREPEND(XTENSOR_SINGLE_INCLUDE "#include <" ${XTENSOR_SINGLE_INCLUDE})
326326
POSTFIX(XTENSOR_SINGLE_INCLUDE ">" ${XTENSOR_SINGLE_INCLUDE})

‎include/xtensor/xchunked_array.hpp‎ renamed to ‎include/xtensor/chunk/xchunked_array.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#include <array>
1414
#include <vector>
1515

16-
#include "xarray.hpp"
17-
#include "xchunked_assign.hpp"
16+
#include "../chunk/xchunked_assign.hpp"
17+
#include "../containers/xarray.hpp"
1818

1919
namespace xt
2020
{

‎include/xtensor/xchunked_assign.hpp‎ renamed to ‎include/xtensor/chunk/xchunked_assign.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#ifndef XTENSOR_CHUNKED_ASSIGN_HPP
1111
#define XTENSOR_CHUNKED_ASSIGN_HPP
1212

13-
#include "xnoalias.hpp"
14-
#include "xstrided_view.hpp"
13+
#include "../core/xnoalias.hpp"
14+
#include "../views/xstrided_view.hpp"
1515

1616
namespace xt
1717
{

‎include/xtensor/xchunked_view.hpp‎ renamed to ‎include/xtensor/chunk/xchunked_view.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
#include <xtl/xsequence.hpp>
1414

15-
#include "xchunked_array.hpp"
16-
#include "xnoalias.hpp"
17-
#include "xstorage.hpp"
18-
#include "xstrided_view.hpp"
15+
#include "../chunk/xchunked_array.hpp"
16+
#include "../containers/xstorage.hpp"
17+
#include "../core/xnoalias.hpp"
18+
#include "../views/xstrided_view.hpp"
1919

2020
namespace xt
2121
{

‎include/xtensor/xadapt.hpp‎ renamed to ‎include/xtensor/containers/xadapt.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
#include <xtl/xsequence.hpp>
1919

20-
#include "xarray.hpp"
21-
#include "xbuffer_adaptor.hpp"
22-
#include "xfixed.hpp"
23-
#include "xtensor.hpp"
20+
#include "../containers/xarray.hpp"
21+
#include "../containers/xbuffer_adaptor.hpp"
22+
#include "../containers/xfixed.hpp"
23+
#include "../containers/xtensor.hpp"
2424

2525
namespace xt
2626
{

‎include/xtensor/xarray.hpp‎ renamed to ‎include/xtensor/containers/xarray.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
#include <xtl/xsequence.hpp>
1818

19-
#include "xbuffer_adaptor.hpp"
20-
#include "xcontainer.hpp"
21-
#include "xsemantic.hpp"
19+
#include "../containers/xbuffer_adaptor.hpp"
20+
#include "../containers/xcontainer.hpp"
21+
#include "../core/xsemantic.hpp"
2222

2323
namespace xt
2424
{

‎include/xtensor/xbuffer_adaptor.hpp‎ renamed to ‎include/xtensor/containers/xbuffer_adaptor.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include <xtl/xclosure.hpp>
2020

21-
#include "xstorage.hpp"
22-
#include "xtensor_config.hpp"
21+
#include "../containers/xstorage.hpp"
22+
#include "../core/xtensor_config.hpp"
2323

2424
namespace xt
2525
{

‎include/xtensor/xcontainer.hpp‎ renamed to ‎include/xtensor/containers/xcontainer.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
#include <xtl/xmeta_utils.hpp>
2020
#include <xtl/xsequence.hpp>
2121

22-
#include "xaccessible.hpp"
23-
#include "xiterable.hpp"
24-
#include "xiterator.hpp"
25-
#include "xmath.hpp"
26-
#include "xoperation.hpp"
27-
#include "xstrides.hpp"
28-
#include "xtensor_config.hpp"
29-
#include "xtensor_forward.hpp"
22+
#include "../core/xaccessible.hpp"
23+
#include "../core/xiterable.hpp"
24+
#include "../core/xiterator.hpp"
25+
#include "../core/xmath.hpp"
26+
#include "../core/xoperation.hpp"
27+
#include "../core/xstrides.hpp"
28+
#include "../core/xtensor_config.hpp"
29+
#include "../core/xtensor_forward.hpp"
3030

3131
namespace xt
3232
{

‎include/xtensor/xfixed.hpp‎ renamed to ‎include/xtensor/containers/xfixed.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919
#include <xtl/xsequence.hpp>
2020

21-
#include "xcontainer.hpp"
22-
#include "xsemantic.hpp"
23-
#include "xstorage.hpp"
24-
#include "xstrides.hpp"
25-
#include "xtensor_config.hpp"
21+
#include "../containers/xcontainer.hpp"
22+
#include "../containers/xstorage.hpp"
23+
#include "../core/xsemantic.hpp"
24+
#include "../core/xstrides.hpp"
25+
#include "../core/xtensor_config.hpp"
2626

2727
namespace xtl
2828
{

0 commit comments

Comments
 (0)