Skip to content

cope with xtensor include files move #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KrisThielemans merged 2 commits into from
Nov 10, 2025
Merged

cope with xtensor include files move #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2ffbff
cope with xtensor include files move
KrisThielemans Nov 9, 2025
29db601
make sure XTENSOR version info is available
KrisThielemans Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions cpp/helpers/include/petsird_helpers/geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,19 @@
#ifndef __petsird_helpers_geometry_h__
#define __petsird_helpers_geometry_h__

#include <xtensor/xarray.hpp>
#include <xtensor/xview.hpp>
#include <xtensor/xio.hpp>
#ifndef XTENSOR_VERSION_MAJOR
# include <xtensor/xtensor.hpp>
#endif

#if XTENSOR_VERSION_MAJOR == 0 && XTENSOR_VERSION_MINOR < 26
# include <xtensor/xarray.hpp>
# include <xtensor/xview.hpp>
# include <xtensor/xio.hpp>
#else
# include <xtensor/containers/xarray.hpp>
# include <xtensor/views/xview.hpp>
# include <xtensor/io/xio.hpp>
#endif
#include <xtensor-blas/xlinalg.hpp>
#include <vector>
#include "petsird/types.h"
Expand Down
9 changes: 7 additions & 2 deletions cpp/helpers/petsird_analysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,13 @@ using petsird::binary::PETSIRDReader;
#endif
#include "petsird_helpers.h"
#include "petsird_helpers/geometry.h"
#include <xtensor/xview.hpp>
#include <xtensor/xio.hpp>
#if XTENSOR_VERSION_MAJOR == 0 && XTENSOR_VERSION_MINOR < 26
# include <xtensor/xview.hpp>
# include <xtensor/xio.hpp>
#else
# include <xtensor/views/xview.hpp>
# include <xtensor/io/xio.hpp>
#endif
#include <iostream>
#include <variant>
#include <cstdlib>
Expand Down
Loading