-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into bump/starfish
- Loading branch information
Showing
26 changed files
with
528 additions
and
208 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,21 @@ | ||
#!/bin/bash -euo | ||
#!/bin/bash | ||
|
||
set -xeuo | ||
|
||
# Add workaround for SSH-based Git connections from Rust/cargo. See https://github.com/rust-lang/cargo/issues/2078 for details. | ||
# We set CARGO_HOME because we don't pass on HOME to conda-build, thus rendering the default "${HOME}/.cargo" defunct. | ||
export CARGO_NET_GIT_FETCH_WITH_CLI=true CARGO_HOME="$(pwd)/.cargo" | ||
export CARGO_HOME="$(pwd)/.cargo" | ||
|
||
# build statically linked binary with Rust | ||
cargo-bundle-licenses --format yaml --output THIRDPARTY.yml | ||
RUST_BACKTRACE=1 cargo install --verbose --locked --no-track --root $PREFIX --path . | ||
|
||
case $(uname -m) in | ||
aarch64 | arm64) | ||
FEATURES="--features neon --no-default-features" | ||
;; | ||
*) | ||
FEATURES="" | ||
;; | ||
esac | ||
|
||
RUST_BACKTRACE=1 cargo install --verbose --locked --no-track --root $PREFIX --path . ${FEATURES} | ||
cp scripts/* $PREFIX/bin |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
--- Cargo.toml.orig 2024-10-14 10:59:48.140000000 +0000 | ||
+++ Cargo.toml 2024-10-14 11:03:33.120000000 +0000 | ||
@@ -13,9 +13,9 @@ | ||
rayon="1.7" | ||
rand="0.8" | ||
rand_core="0.6" | ||
-rust-htslib= { version = "0.44", default-features = false } | ||
+rust-htslib= { version = "0.47", default-features = false } | ||
clap = { version = "=4.2.0", features = ["derive"] } | ||
-block-aligner = { version = "0.4", default-features = false } | ||
+block-aligner = { version = "0.5", default-features = false } | ||
debruijn = "0.3" | ||
simple_logger="4" | ||
log="0.4" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
diff --git a/src/Makefile b/src/Makefile | ||
index 6272ad5..473407a 100644 | ||
--- a/src/Makefile | ||
+++ b/src/Makefile | ||
@@ -1,10 +1,10 @@ | ||
.PHONY: all clean | ||
-CXX= g++ | ||
-CXXFLAGS= -g -Wall -Wno-unused-function -std=c++17 -O2 | ||
-PROG= ../fmsi | ||
-INCLUDES-PATH?=. | ||
+CXX= ${CXX} | ||
+CXXFLAGS= -g -Wall -Wno-unused-function -std=c++17 -O3 | ||
+PROG= ${PREFIX}/bin/fmsi | ||
+INCLUDES-PATH?= ${PREFIX} | ||
INCLUDES= -I$(INCLUDES-PATH)/include -L$(INCLUDES-PATH)/lib | ||
-LIBS= -lz -lsdsl -ldivsufsort -ldivsufsort64 | ||
+LIBS+= -lz -lsdsl -ldivsufsort -ldivsufsort64 -L${PREFIX}/lib | ||
|
||
all:$(PROG) | ||
|
||
@@ -14,7 +14,7 @@ include/sdsl/suffix_arrays.hpp: sdsl-lite/build/Makefile | ||
$(MAKE) -C sdsl-lite/build install | ||
|
||
sdsl-lite/build/Makefile: | ||
- cd sdsl-lite/build && cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=../.. .. | ||
+ cd sdsl-lite/build && cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=${PREFIX} .. | ||
|
||
|
||
$(PROG): $(wildcard *.cpp *.c *.h) ./include/sdsl/suffix_arrays.hpp version.h |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
diff --git a/src/version b/src/version | ||
index ee1372d..abd4105 100644 | ||
--- a/src/version | ||
+++ b/src/version | ||
@@ -1 +1 @@ | ||
-0.2.2 | ||
+${PKG_VERSION} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
#!/bin/bash | ||
|
||
mkdir -p ${PREFIX}/bin | ||
|
||
export INCLUDES="-I${PREFIX}/include" | ||
export LIBPATH="-L${PREFIX}/lib" | ||
export LDFLAGS="${LDFLAGS} -L${PREFIX}/lib" | ||
export CXXFLAGS="${CXXFLAGS} -O3 -I${PREFIX}/include" | ||
|
||
if [[ `uname` == "Darwin" ]]; then | ||
export CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" | ||
else | ||
export CXXFLAGS="${CXXFLAGS}" | ||
fi | ||
|
||
make CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ | ||
CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ | ||
-j"${CPU_COUNT}" | ||
|
||
chmod 0755 ${PREFIX}/bin/fmsi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
{% set version = "0.2.4" %} | ||
{% set sha256 = "67c930b8bad30e786fb7a59cc8592e1a7231024debc95af7e2c203bb7022b0b3" %} | ||
|
||
package: | ||
name: fmsi | ||
version: {{ version }} | ||
|
||
source: | ||
url: https://github.com/OndrejSladky/fmsi/archive/v{{ version }}.tar.gz | ||
sha256: {{ sha256 }} | ||
patches: | ||
- 0001-Makefile.patch | ||
- 0002-version.patch | ||
|
||
build: | ||
number: 0 | ||
run_exports: | ||
- {{ pin_subpackage('fmsi', max_pin="x.x") }} | ||
|
||
requirements: | ||
build: | ||
- make | ||
- cmake | ||
- {{ compiler('cxx') }} | ||
host: | ||
- zlib | ||
- sdsl-lite | ||
run: | ||
- sdsl-lite | ||
|
||
test: | ||
commands: | ||
- fmsi -h 2>&1 | grep "FMSI" | ||
|
||
about: | ||
home: "https://github.com/OndrejSladky/fmsi" | ||
license: MIT | ||
license_family: MIT | ||
license_file: LICENSE | ||
summary: "FMSI - memory efficient k-mer set index based on masked superstrings and Burrows-Wheeler transform." | ||
dev_url: "https://github.com/OndrejSladky/fmsi" | ||
doc_url: "https://github.com/OndrejSladky/fmsi/blob/v{{ version }}/README.md" | ||
|
||
extra: | ||
identifiers: | ||
- doi:10.1101/2024.03.06.583483 | ||
- doi:10.1101/2023.02.01.526717 | ||
additional-platforms: | ||
- linux-aarch64 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.