Skip to content

Commit 7638329

Browse files
cope with xtensor include files move (#174)
* cope with xtensor include files move * make sure XTENSOR version info is available
1 parent fa2f043 commit 7638329

File tree

2 files changed

+20
-5
lines changed

2 files changed

+20
-5
lines changed

cpp/helpers/include/petsird_helpers/geometry.h

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,19 @@
66
#ifndef __petsird_helpers_geometry_h__
77
#define __petsird_helpers_geometry_h__
88

9-
#include <xtensor/xarray.hpp>
10-
#include <xtensor/xview.hpp>
11-
#include <xtensor/xio.hpp>
9+
#ifndef XTENSOR_VERSION_MAJOR
10+
# include <xtensor/xtensor.hpp>
11+
#endif
12+
13+
#if XTENSOR_VERSION_MAJOR == 0 && XTENSOR_VERSION_MINOR < 26
14+
# include <xtensor/xarray.hpp>
15+
# include <xtensor/xview.hpp>
16+
# include <xtensor/xio.hpp>
17+
#else
18+
# include <xtensor/containers/xarray.hpp>
19+
# include <xtensor/views/xview.hpp>
20+
# include <xtensor/io/xio.hpp>
21+
#endif
1222
#include <xtensor-blas/xlinalg.hpp>
1323
#include <vector>
1424
#include "petsird/types.h"

cpp/helpers/petsird_analysis.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,13 @@ using petsird::binary::PETSIRDReader;
1717
#endif
1818
#include "petsird_helpers.h"
1919
#include "petsird_helpers/geometry.h"
20-
#include <xtensor/xview.hpp>
21-
#include <xtensor/xio.hpp>
20+
#if XTENSOR_VERSION_MAJOR == 0 && XTENSOR_VERSION_MINOR < 26
21+
# include <xtensor/xview.hpp>
22+
# include <xtensor/xio.hpp>
23+
#else
24+
# include <xtensor/views/xview.hpp>
25+
# include <xtensor/io/xio.hpp>
26+
#endif
2227
#include <iostream>
2328
#include <variant>
2429
#include <cstdlib>

0 commit comments

Comments
 (0)