Skip to content

Commit 2d1b72a

Browse files
committed
Switched from gulrak filesystem to std filesystem
1 parent a80ce7b commit 2d1b72a

6 files changed

Lines changed: 7 additions & 19 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,6 @@ target_compile_features(xtensor-io INTERFACE cxx_std_17)
125125

126126
include_directories(${GTEST_INCLUDE_DIRS})
127127

128-
find_path(ghc-filesystem-include REQUIRED
129-
NAMES "ghc/filesystem.hpp"
130-
DOC "Path to include directory of https://github.com/gulrak/filesystem"
131-
)
132-
target_include_directories(xtensor-io
133-
INTERFACE
134-
$<BUILD_INTERFACE:${ghc-filesystem-include}>
135-
$<INSTALL_INTERFACE:include>
136-
)
137-
138128
target_include_directories(xtensor-io
139129
INTERFACE
140130
$<BUILD_INTERFACE:${XTENSOR_IO_INCLUDE_DIR}>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Reading and writing image, sound and npz file formats to and from xtensor data s
2727
```bash
2828
mamba install xtensor-io -c conda-forge
2929
```
30-
- `xtensor-io` depends on `xtensor` `^0.26.0` and [filesystem](https://github.com/gulrak/filesystem).
30+
- `xtensor-io` depends on `xtensor` `^0.26.0
3131

3232
- `OpenImageIO`, `libsndfile`, `zlib`, `HighFive`, and `blosc` are optional dependencies to `xtensor-io`
3333

environment-dev.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,3 @@ dependencies:
1717
- google-cloud-cpp >=3.0,<4
1818
- aws-sdk-cpp >=1.11,<2
1919
- xtensor=0.26.0
20-
- cpp-filesystem >=1.5,<2
21-

include/xtensor-io/xchunk_store_manager.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <vector>
55
#include <array>
66

7-
#include "ghc/filesystem.hpp"
7+
#include <filesystem>
88

99
#include <xtl/xsequence.hpp>
1010

@@ -671,7 +671,7 @@ namespace xt
671671
template <class EC, class IP>
672672
inline std::string xchunk_store_manager<EC, IP>::get_temporary_directory() const
673673
{
674-
namespace fs = ghc::filesystem;
674+
namespace fs = std::filesystem;
675675
fs::path tmp_dir = fs::temp_directory_path();
676676
std::size_t count = 0;
677677
while(fs::exists(tmp_dir / std::to_string(count)))
@@ -684,7 +684,7 @@ namespace xt
684684
template <class EC, class IP>
685685
inline void xchunk_store_manager<EC, IP>::reset_to_directory(const std::string& directory)
686686
{
687-
namespace fs = ghc::filesystem;
687+
namespace fs = std::filesystem;
688688
fs::remove_all(get_directory());
689689
fs::rename(directory, get_directory());
690690
m_unload_index = 0u;

include/xtensor-io/xio_disk_handler.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#ifndef XTENSOR_IO_DISK_HANDLER_HPP
22
#define XTENSOR_IO_DISK_HANDLER_HPP
33

4-
#include <ghc/filesystem.hpp>
4+
#include <filesystem>
55
#include <xtensor/containers/xarray.hpp>
66
#include <xtensor/core/xexpression.hpp>
77
#include "xio_stream_wrapper.hpp"
88
#include "xfile_array.hpp"
99

10-
namespace fs = ghc::filesystem;
10+
namespace fs = std::filesystem;
1111

1212
namespace xt
1313
{

test/test_xchunk_store_manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
namespace xt
1919
{
20-
namespace fs = ghc::filesystem;
20+
namespace fs = std::filesystem;
2121

2222
template <class S>
2323
inline auto make_test_chunked_array(const S& shape,

0 commit comments

Comments
 (0)