diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e7f277..51f610e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,16 +125,6 @@ target_compile_features(xtensor-io INTERFACE cxx_std_17) include_directories(${GTEST_INCLUDE_DIRS}) -find_path(ghc-filesystem-include REQUIRED - NAMES "ghc/filesystem.hpp" - DOC "Path to include directory of https://github.com/gulrak/filesystem" - ) -target_include_directories(xtensor-io - INTERFACE - $ - $ -) - target_include_directories(xtensor-io INTERFACE $ diff --git a/README.md b/README.md index 2aa86f7..8f0862e 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Reading and writing image, sound and npz file formats to and from xtensor data s ```bash mamba install xtensor-io -c conda-forge ``` -- `xtensor-io` depends on `xtensor` `^0.26.0` and [filesystem](https://github.com/gulrak/filesystem). +- `xtensor-io` depends on `xtensor` `^0.26.0 - `OpenImageIO`, `libsndfile`, `zlib`, `HighFive`, and `blosc` are optional dependencies to `xtensor-io` diff --git a/environment-dev.yml b/environment-dev.yml index bb09d65..a269c83 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -17,5 +17,3 @@ dependencies: - google-cloud-cpp >=3.0,<4 - aws-sdk-cpp >=1.11,<2 - xtensor=0.26.0 - - cpp-filesystem >=1.5,<2 - diff --git a/include/xtensor-io/xchunk_store_manager.hpp b/include/xtensor-io/xchunk_store_manager.hpp index 2b46873..eb47e5f 100644 --- a/include/xtensor-io/xchunk_store_manager.hpp +++ b/include/xtensor-io/xchunk_store_manager.hpp @@ -4,7 +4,7 @@ #include #include -#include "ghc/filesystem.hpp" +#include #include @@ -671,7 +671,7 @@ namespace xt template inline std::string xchunk_store_manager::get_temporary_directory() const { - namespace fs = ghc::filesystem; + namespace fs = std::filesystem; fs::path tmp_dir = fs::temp_directory_path(); std::size_t count = 0; while(fs::exists(tmp_dir / std::to_string(count))) @@ -684,7 +684,7 @@ namespace xt template inline void xchunk_store_manager::reset_to_directory(const std::string& directory) { - namespace fs = ghc::filesystem; + namespace fs = std::filesystem; fs::remove_all(get_directory()); fs::rename(directory, get_directory()); m_unload_index = 0u; diff --git a/include/xtensor-io/xio_disk_handler.hpp b/include/xtensor-io/xio_disk_handler.hpp index 9f3b5bd..c3f43c4 100644 --- a/include/xtensor-io/xio_disk_handler.hpp +++ b/include/xtensor-io/xio_disk_handler.hpp @@ -1,13 +1,13 @@ #ifndef XTENSOR_IO_DISK_HANDLER_HPP #define XTENSOR_IO_DISK_HANDLER_HPP -#include +#include #include #include #include "xio_stream_wrapper.hpp" #include "xfile_array.hpp" -namespace fs = ghc::filesystem; +namespace fs = std::filesystem; namespace xt { diff --git a/test/test_xchunk_store_manager.cpp b/test/test_xchunk_store_manager.cpp index 6a52bd9..a2cdbf8 100644 --- a/test/test_xchunk_store_manager.cpp +++ b/test/test_xchunk_store_manager.cpp @@ -17,7 +17,7 @@ namespace xt { - namespace fs = ghc::filesystem; + namespace fs = std::filesystem; template inline auto make_test_chunked_array(const S& shape,