Skip to content
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.

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

[MISC] Remove range-v3 #2998

Merged
merged 4 commits into from
Jun 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[submodule "sdsl-lite"]
path = submodules/sdsl-lite
url = https://github.com/xxsds/sdsl-lite
[submodule "range-v3"]
path = submodules/range-v3
url = https://github.com/seqan/range-v3
[submodule "cereal"]
path = submodules/cereal
url = https://github.com/USCiLab/cereal
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ Please see the [online documentation](https://docs.seqan.de/seqan/3-master-user/
|**compiler** | [GCC](https://gcc.gnu.org) | ≥ 10 | no other compiler is currently supported! |
|**build system** | [CMake](https://cmake.org) | ≥ 3.4 | optional, but recommended |
|**required libs** | [SDSL](https://github.com/xxsds/sdsl-lite) | ≥ 3 | |
| | [Range-V3](https://github.com/ericniebler/range-v3) | ≥ 0.11.0 | |
|**optional libs** | [cereal](https://github.com/USCiLab/cereal) | ≥ 1.2.3 | required for serialisation and CTD support |
| | [zlib](https://github.com/madler/zlib) | ≥ 1.2 | required for `*.gz` and `.bam` file support |
| | [bzip2](https://www.sourceware.org/bzip2) | ≥ 1.0 | required for `*.bz2` file support |
Expand All @@ -93,7 +92,6 @@ Quick-Setup without CMake:
g++-11 -O3 -DNDEBUG -Wall -Wextra \
-std=c++20 \
-I /path/to/seqan3/include \
-isystem /path/to/seqan3/submodules/range-v3/include \
-isystem /path/to/seqan3/submodules/sdsl-lite/include \
-isystem /path/to/seqan3/submodules/cereal/include \
-DSEQAN3_HAS_ZLIB=1 -DSEQAN3_HAS_BZIP2=1 \
Expand Down
12 changes: 1 addition & 11 deletions build_system/seqan3-config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
# SeqAn requires the following libraries:
#
# SDSL -- the succinct data structure library
# Range-V3 -- Ranges Library by Eric Niebler
#
# SeqAn has the following optional dependencies:
#
Expand Down Expand Up @@ -309,18 +308,9 @@ else ()
endif ()

# ----------------------------------------------------------------------------
# Require Ranges and SDSL
# Require SDSL
# ----------------------------------------------------------------------------

check_include_file_cxx (range/v3/version.hpp _SEQAN3_HAVE_RANGEV3)

if (_SEQAN3_HAVE_RANGEV3)
seqan3_config_print ("Required dependency: Range-V3 found.")
else ()
seqan3_config_error (
"The range-v3 library is required, but wasn't found. Get it from https://github.com/ericniebler/range-v3/")
endif ()

check_include_file_cxx (sdsl/version.hpp _SEQAN3_HAVE_SDSL)

if (_SEQAN3_HAVE_SDSL)
Expand Down
2 changes: 1 addition & 1 deletion doc/howto/write_a_view/solution_iterator.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//![start]
#include <iostream>
#include <seqan3/std/ranges>
#include <ranges>
#include <vector>

#include <seqan3/alphabet/nucleotide/all.hpp>
Expand Down
2 changes: 1 addition & 1 deletion doc/howto/write_a_view/solution_view.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//![iterator]
#include <iostream>
#include <seqan3/std/ranges>
#include <ranges>
#include <vector>

#include <seqan3/alphabet/nucleotide/all.hpp>
Expand Down
2 changes: 1 addition & 1 deletion doc/howto/write_a_view/view_exercise1.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//![start]
#include <iostream>
#include <seqan3/std/ranges>
#include <ranges>

#include <seqan3/alphabet/nucleotide/all.hpp>

Expand Down
2 changes: 1 addition & 1 deletion doc/howto/write_a_view/view_exercise2.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//![start]
#include <seqan3/std/ranges>
#include <ranges>

#include <seqan3/alphabet/nucleotide/all.hpp>
#include <seqan3/core/debug_stream.hpp>
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorial/05_ranges/range_snippets.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <iostream>
#include <seqan3/std/ranges> // include all of the standard library's views
#include <ranges> // include all of the standard library's views
#include <vector>

int main()
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorial/05_ranges/range_solution1.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <iostream>
#include <seqan3/std/ranges> // include all of the standard library's views
#include <ranges> // include all of the standard library's views
#include <vector>

int main()
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorial/05_ranges/range_solution3.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <seqan3/std/ranges> // include all of the standard library's views
#include <ranges> // include all of the standard library's views

#include <seqan3/alphabet/views/all.hpp> // include all of SeqAn's views
#include <seqan3/argument_parser/all.hpp> // optional: include the argument_parser
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorial/06_minimisers/minimisers_snippets.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <iostream>
#include <seqan3/std/ranges> // include all of the standard library's views
#include <ranges> // include all of the standard library's views
#include <vector>

#include <seqan3/alphabet/nucleotide/dna4.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ seqan3::test::create_temporary_snippet_file output_fastq{"output.fastq", ""};

//![main]
#include <algorithm>
#include <seqan3/std/ranges>
#include <ranges>

#include <seqan3/io/sequence_file/all.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ IIIIHHGIIIIHHGIIIH

//![main]
#include <numeric> // std::accumulate
#include <seqan3/std/ranges>
#include <ranges>

#include <seqan3/core/debug_stream.hpp>
#include <seqan3/io/sequence_file/all.hpp>
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorial/07_sequence_file/sequence_file_solution2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CGATCGA

//![solution]
#include <filesystem>
#include <seqan3/std/ranges> // std::ranges::copy
#include <ranges> // std::ranges::copy

#include <seqan3/core/debug_stream.hpp>
#include <seqan3/io/sequence_file/all.hpp>
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorial/07_sequence_file/sequence_file_solution3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ IIIIIHIIJJIIIII
//![solution]
#include <filesystem>
//![include_ranges]
#include <seqan3/std/ranges>
#include <ranges>
//![include_ranges]

#include <seqan3/core/debug_stream.hpp>
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorial/07_sequence_file/sequence_file_solution4.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ seqan3::test::create_temporary_snippet_file output{"output.fastq", ""};

//![solution]
#include <filesystem>
#include <seqan3/std/ranges>
#include <ranges>

#include <seqan3/io/sequence_file/all.hpp>

Expand Down
2 changes: 1 addition & 1 deletion doc/tutorial/07_sequence_file/sequence_file_solution5.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ seqan3::test::create_temporary_snippet_file output{"output.fastq", ""};
//![solution]
#include <algorithm>
#include <filesystem>
#include <seqan3/std/ranges>
#include <ranges>

#include <seqan3/io/sequence_file/all.hpp>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <seqan3/std/ranges>
#include <ranges>
#include <utility>
#include <vector>

Expand Down
2 changes: 1 addition & 1 deletion doc/tutorial/10_sam_file/sam_file_solution1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ r001 147 ref 37 30 9M = 7 -39 CAGCGGCAT * NM:i:1

//![solution]
#include <filesystem>
#include <seqan3/std/ranges>
#include <ranges>

#include <seqan3/core/debug_stream.hpp>
#include <seqan3/io/sam_file/all.hpp>
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorial/10_sam_file/sam_file_solution2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ r003 2064 chr2 18 10 5M * 0 0 TAGGC *
//![solution]
#include <algorithm> // std::ranges::count
#include <filesystem>
#include <seqan3/std/ranges>
#include <ranges>
#include <string>
#include <vector>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#pragma once

#include <algorithm>
#include <seqan3/std/ranges>
#include <ranges>

#include <seqan3/alignment/exception.hpp>
#include <seqan3/alphabet/gap/gapped.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/seqan3/alignment/decorator/gap_decorator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#include <algorithm>
#include <limits>
#include <seqan3/std/ranges>
#include <ranges>
#include <set>
#include <tuple>
#include <type_traits>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#pragma once

#include <concepts>
#include <seqan3/std/ranges>
#include <ranges>
#include <type_traits>
#include <vector>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include <cassert>
#include <iterator>
#include <seqan3/std/ranges>
#include <ranges>
#include <span>

#include <seqan3/core/range/type_traits.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#pragma once

#include <iterator>
#include <seqan3/std/ranges>
#include <ranges>
#include <span>

#include <seqan3/alignment/matrix/detail/alignment_matrix_column_major_range_base.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include <cassert>
#include <iterator>
#include <seqan3/std/ranges>
#include <ranges>
#include <span>

#include <seqan3/alignment/configuration/align_config_band.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#pragma once

#include <iterator>
#include <seqan3/std/ranges>
#include <ranges>

#include <seqan3/alignment/matrix/detail/alignment_matrix_column_major_range_base.hpp>
#include <seqan3/alignment/matrix/detail/alignment_trace_matrix_base.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#pragma once

#include <iterator>
#include <seqan3/std/ranges>
#include <ranges>

#include <seqan3/alignment/configuration/align_config_band.hpp>
#include <seqan3/alignment/matrix/detail/alignment_matrix_column_major_range_base.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#pragma once

#include <seqan3/std/ranges>
#include <ranges>

#include <seqan3/alignment/matrix/detail/affine_cell_proxy.hpp>
#include <seqan3/alignment/matrix/detail/matrix_coordinate.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#pragma once

#include <concepts>
#include <seqan3/std/ranges>
#include <ranges>

#include <seqan3/alignment/matrix/detail/matrix_coordinate.hpp>
#include <seqan3/core/detail/template_inspection.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#pragma once

#include <seqan3/std/ranges>
#include <ranges>
#include <vector>

#include <seqan3/alignment/matrix/detail/affine_cell_proxy.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#pragma once

#include <concepts>
#include <seqan3/std/ranges>
#include <ranges>

#include <seqan3/alignment/matrix/detail/trace_directions.hpp>
#include <seqan3/alignment/matrix/detail/two_dimensional_matrix_iterator_base.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#pragma once

#include <seqan3/std/ranges>
#include <ranges>
#include <span>
#include <vector>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include <algorithm>
#include <memory>
#include <seqan3/std/ranges>
#include <ranges>
#include <vector>

#include <seqan3/alignment/matrix/detail/matrix_coordinate.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#pragma once

#include <concepts>
#include <seqan3/std/ranges>
#include <ranges>
#include <type_traits>

#include <seqan3/alignment/matrix/detail/matrix_coordinate.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/seqan3/alignment/pairwise/align_pairwise.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <concepts>
#include <functional>
#include <iostream>
#include <seqan3/std/ranges>
#include <ranges>
#include <tuple>
#include <type_traits>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#pragma once

#include <optional>
#include <seqan3/std/ranges>
#include <ranges>
#include <type_traits>

#include <seqan3/alignment/configuration/align_config_debug.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/seqan3/alignment/pairwise/alignment_algorithm.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <iterator>
#include <memory>
#include <optional>
#include <seqan3/std/ranges>
#include <ranges>
#include <type_traits>

#include <seqan3/alignment/configuration/align_config_band.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/seqan3/alignment/pairwise/detail/concept.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#pragma once

#include <seqan3/std/ranges>
#include <ranges>
#include <tuple>

#include <seqan3/alphabet/concept.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#pragma once

#include <concepts>
#include <seqan3/std/ranges>
#include <ranges>

#include <seqan3/alignment/pairwise/detail/type_traits.hpp>
#include <seqan3/core/detail/empty_type.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#pragma once

#include <concepts>
#include <seqan3/std/ranges>
#include <ranges>

#include <seqan3/alignment/pairwise/detail/pairwise_alignment_algorithm.hpp>
#include <seqan3/utility/views/slice.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#pragma once

#include <limits>
#include <seqan3/std/ranges>
#include <ranges>

#include <seqan3/alignment/pairwise/detail/policy_optimum_tracker.hpp>
#include <seqan3/utility/simd/algorithm.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/seqan3/alignment/pairwise/detail/type_traits.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#pragma once

#include <seqan3/std/ranges>
#include <ranges>
#include <type_traits>

#include <seqan3/alignment/configuration/align_config_band.hpp>
Expand Down
Loading