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.

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

[INFRA] Update CPM Packages #277

Merged
merged 2 commits into from
Jan 30, 2025
Merged

[INFRA] Update CPM Packages #277

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
400bd07
[INFRA] Update CPM Packages
seqan-actions Jan 30, 2025
926722e
[TEST] Update hibf_config
eseiler Jan 30, 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
4 changes: 2 additions & 2 deletions cmake/package-lock.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# This file should be committed to version control

# hibf
set (CHOPPER_HIBF_VERSION 06aaab39a3f5117c35d112e83241074178edab67)
set (CHOPPER_HIBF_VERSION 5853f7a35061632f4c3674fc9fc434f917f230f6)
CPMDeclarePackage (hibf
NAME hibf
GIT_TAG ${CHOPPER_HIBF_VERSION} # main
Expand All @@ -26,7 +26,7 @@ CPMDeclarePackage (sharg
OPTIONS "INSTALL_SHARG OFF" "INSTALL_TDL OFF" "CMAKE_MESSAGE_LOG_LEVEL WARNING" "BUILD_TESTING OFF"
)
# seqan3
set (CHOPPER_SEQAN3_VERSION 7ee839814e168ab57c4401d46e6114a801cebc28)
set (CHOPPER_SEQAN3_VERSION 666b87694bef9411d995e4678a26e5e9a31ca255)
CPMDeclarePackage (seqan3
NAME seqan3
GIT_TAG ${CHOPPER_SEQAN3_VERSION} # main
Expand Down
3 changes: 2 additions & 1 deletion test/api/config_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,15 @@ static constexpr std::string_view config_string_view{"@CHOPPER_CONFIG\n"
"@HIBF_CONFIG\n"
"@{\n"
"@ \"hibf_config\": {\n"
"@ \"version\": 1,\n"
"@ \"version\": 2,\n"
"@ \"number_of_user_bins\": 123456789,\n"
"@ \"number_of_hash_functions\": 4,\n"
"@ \"maximum_fpr\": 0.0001,\n"
"@ \"relaxed_fpr\": 0.2,\n"
"@ \"threads\": 31,\n"
"@ \"sketch_bits\": 8,\n"
"@ \"tmax\": 128,\n"
"@ \"empty_bin_fraction\": 0.0,\n"
"@ \"alpha\": 1.0,\n"
"@ \"max_rearrangement_ratio\": 0.333,\n"
"@ \"disable_estimate_union\": true,\n"
Expand Down
6 changes: 4 additions & 2 deletions test/api/layout/execute_layout_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,15 @@ TEST(execute_test, few_ubs)
"@HIBF_CONFIG\n"
"@{\n"
"@ \"hibf_config\": {\n"
"@ \"version\": 1,\n"
"@ \"version\": 2,\n"
"@ \"number_of_user_bins\": 8,\n"
"@ \"number_of_hash_functions\": 2,\n"
"@ \"maximum_fpr\": 0.05,\n"
"@ \"relaxed_fpr\": 0.3,\n"
"@ \"threads\": 1,\n"
"@ \"sketch_bits\": 12,\n"
"@ \"tmax\": 64,\n"
"@ \"empty_bin_fraction\": 0.0,\n"
"@ \"alpha\": 1.2,\n"
"@ \"max_rearrangement_ratio\": 0.5,\n"
"@ \"disable_estimate_union\": true,\n"
Expand Down Expand Up @@ -307,14 +308,15 @@ TEST(execute_test, many_ubs)
"@HIBF_CONFIG\n"
"@{\n"
"@ \"hibf_config\": {\n"
"@ \"version\": 1,\n"
"@ \"version\": 2,\n"
"@ \"number_of_user_bins\": 96,\n"
"@ \"number_of_hash_functions\": 2,\n"
"@ \"maximum_fpr\": 0.05,\n"
"@ \"relaxed_fpr\": 0.3,\n"
"@ \"threads\": 1,\n"
"@ \"sketch_bits\": 12,\n"
"@ \"tmax\": 64,\n"
"@ \"empty_bin_fraction\": 0.0,\n"
"@ \"alpha\": 1.2,\n"
"@ \"max_rearrangement_ratio\": 0.5,\n"
"@ \"disable_estimate_union\": true,\n"
Expand Down
3 changes: 2 additions & 1 deletion test/api/layout/execute_with_estimation_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,14 +270,15 @@ TEST(execute_estimation_test, many_ubs)
"@HIBF_CONFIG\n"
"@{\n"
"@ \"hibf_config\": {\n"
"@ \"version\": 1,\n"
"@ \"version\": 2,\n"
"@ \"number_of_user_bins\": 96,\n"
"@ \"number_of_hash_functions\": 2,\n"
"@ \"maximum_fpr\": 0.05,\n"
"@ \"relaxed_fpr\": 0.3,\n"
"@ \"threads\": 1,\n"
"@ \"sketch_bits\": 12,\n"
"@ \"tmax\": 64,\n"
"@ \"empty_bin_fraction\": 0.0,\n"
"@ \"alpha\": 1.2,\n"
"@ \"max_rearrangement_ratio\": 0.5,\n"
"@ \"disable_estimate_union\": true,\n"
Expand Down
3 changes: 2 additions & 1 deletion test/api/layout/input_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,15 @@ std::string const layout_header{"@CHOPPER_USER_BINS\n"
"@HIBF_CONFIG\n"
"@{\n"
"@ \"hibf_config\": {\n"
"@ \"version\": 1,\n"
"@ \"version\": 2,\n"
"@ \"number_of_user_bins\": 3,\n"
"@ \"number_of_hash_functions\": 2,\n"
"@ \"maximum_fpr\": 0.05,\n"
"@ \"relaxed_fpr\": 0.3,\n"
"@ \"threads\": 2,\n"
"@ \"sketch_bits\": 12,\n"
"@ \"tmax\": 64,\n"
"@ \"empty_bin_fraction\": 0.0,\n"
"@ \"alpha\": 1.2,\n"
"@ \"max_rearrangement_ratio\": 0.5,\n"
"@ \"disable_estimate_union\": false,\n"
Expand Down
3 changes: 2 additions & 1 deletion test/cli/cli_chopper_layout_from_sketch_file.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,15 @@ TEST_F(cli_test, chopper_layout_from_sketch_file)
"@HIBF_CONFIG\n"
"@{\n"
"@ \"hibf_config\": {\n"
"@ \"version\": 1,\n"
"@ \"version\": 2,\n"
"@ \"number_of_user_bins\": 4,\n"
"@ \"number_of_hash_functions\": 2,\n"
"@ \"maximum_fpr\": 0.05,\n"
"@ \"relaxed_fpr\": 0.3,\n"
"@ \"threads\": 2,\n"
"@ \"sketch_bits\": 12,\n"
"@ \"tmax\": 64,\n"
"@ \"empty_bin_fraction\": 0.0,\n"
"@ \"alpha\": 1.2,\n"
"@ \"max_rearrangement_ratio\": 0.5,\n"
"@ \"disable_estimate_union\": false,\n"
Expand Down
6 changes: 4 additions & 2 deletions test/cli/cli_chopper_pipeline_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,15 @@ TEST_F(cli_test, chopper_layout)
"@HIBF_CONFIG\n"
"@{\n"
"@ \"hibf_config\": {\n"
"@ \"version\": 1,\n"
"@ \"version\": 2,\n"
"@ \"number_of_user_bins\": 3,\n"
"@ \"number_of_hash_functions\": 2,\n"
"@ \"maximum_fpr\": 0.05,\n"
"@ \"relaxed_fpr\": 0.3,\n"
"@ \"threads\": 2,\n"
"@ \"sketch_bits\": 12,\n"
"@ \"tmax\": 64,\n"
"@ \"empty_bin_fraction\": 0.0,\n"
"@ \"alpha\": 1.2,\n"
"@ \"max_rearrangement_ratio\": 0.5,\n"
"@ \"disable_estimate_union\": false,\n"
Expand Down Expand Up @@ -193,14 +194,15 @@ TEST_F(cli_test, chopper_layout2)
"@HIBF_CONFIG\n"
"@{\n"
"@ \"hibf_config\": {\n"
"@ \"version\": 1,\n"
"@ \"version\": 2,\n"
"@ \"number_of_user_bins\": 4,\n"
"@ \"number_of_hash_functions\": 2,\n"
"@ \"maximum_fpr\": 0.05,\n"
"@ \"relaxed_fpr\": 0.3,\n"
"@ \"threads\": 2,\n"
"@ \"sketch_bits\": 12,\n"
"@ \"tmax\": 64,\n"
"@ \"empty_bin_fraction\": 0.0,\n"
"@ \"alpha\": 1.2,\n"
"@ \"max_rearrangement_ratio\": 0.5,\n"
"@ \"disable_estimate_union\": false,\n"
Expand Down
3 changes: 2 additions & 1 deletion test/cli/util_display_layout_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,15 @@ std::string get_layout_with_correct_filenames(std::string_view const seq1_filena
"@HIBF_CONFIG\n"
"@{\n"
"@ \"hibf_config\": {\n"
"@ \"version\": 1,\n"
"@ \"version\": 2,\n"
"@ \"number_of_user_bins\": 4,\n"
"@ \"number_of_hash_functions\": 2,\n"
"@ \"maximum_fpr\": 0.05,\n"
"@ \"relaxed_fpr\": 0.3,\n"
"@ \"threads\": 2,\n"
"@ \"sketch_bits\": 12,\n"
"@ \"tmax\": 4,\n"
"@ \"empty_bin_fraction\": 0.0,\n"
"@ \"alpha\": 1.2,\n"
"@ \"max_rearrangement_ratio\": 0.5,\n"
"@ \"disable_estimate_union\": false,\n"
Expand Down