-
Notifications
You must be signed in to change notification settings - Fork 3.3k
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
adding RDEVAL #52070
Merged
+179
−0
Merged
adding RDEVAL #52070
Changes from 20 commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
674dcc0
initial attempt
e33c5e2
adding make as a dependency
2b072df
new hash
8231e37
adding test
f4652bc
fixing build.sh
2f4e58a
Merge branch 'master' into rdeval
richard-burhans 87296b0
using version with submodules
9bd1425
adding zlib
13e7bd6
updates
ce7037f
update
b1a6e2b
foo
303792e
quote
0ae2fef
u
2d066a0
Merge branch 'master' into rdeval
richard-burhans a401dab
a
5e87326
patch
de1a4fb
zlib
2c7164a
zlib
9ce5806
foo
b5372a1
clean up recipe
mencian b061c2d
clean up patches
mencian 7a51e11
Update build.sh
mencian 340e33a
Merge branch 'master' into rdeval
mencian 5155d5c
add gfalibs patch
mencian 68a3123
Update meta.yaml
mencian a32a8b4
Update meta.yaml
mencian 165854e
add gfalibs patch
mencian 9557f45
edit foo.patch
mencian e758cf8
Update foo.patch
mencian 7b3e888
edit foo.patch
mencian 8e8c1f1
edit foo.patch
mencian 8434782
Update build.sh
mencian File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#!/usr/bin/env bash | ||
|
||
set -o errexit | ||
set -o nounset | ||
set -o xtrace | ||
|
||
cd "$SRC_DIR" | ||
|
||
export CXXFLAGS="$CXXFLAGS -O3 -I$PREFIX/include" | ||
export LDFLAGS="$LDFLAGS -L$PREFIX/lib" | ||
|
||
make -j"${CPU_COUNT}" | ||
install -v -m 0755 build/bin/rdeval "$PREFIX/bin/rdeval" |
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,30 @@ | ||
diff --git a/Makefile b/Makefile2 | ||
index 5823f28..41cdab3 100644 | ||
--- a/Makefile | ||
+++ b/Makefile2 | ||
@@ -1,5 +1,5 @@ | ||
-CXX ?= g++ | ||
-INCLUDE_DIR = -I./include -I./gfalibs/include | ||
+CXX ?= ${CXX} | ||
+INCLUDE_DIR = -I./include -I./gfalibs/include -I${PREFIX}/include | ||
WARNINGS = -Wall -Wextra | ||
|
||
CXXFLAGS = -g -std=gnu++14 -O3 $(INCLUDE_DIR) $(WARNINGS) | ||
@@ -12,7 +12,7 @@ SOURCE = src | ||
INCLUDE = include | ||
BINDIR := $(BUILD)/.o | ||
|
||
-LDFLAGS := -pthread | ||
+LDFLAGS := -pthread -L${PREFIX}/lib | ||
LIBS = -lz | ||
|
||
OBJS := main input reads | ||
@@ -27,7 +27,7 @@ head: $(BINS) gfalibs | $(BUILD) | ||
all: head validate regenerate | ||
|
||
$(BINDIR)%: $(SOURCE)/%.cpp $(INCLUDE)/%.h | $(BINDIR) | ||
- $(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(SOURCE)/$(notdir $@).cpp -o $@ | ||
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(SOURCE)/$(notdir $@).cpp -o $@ $(LIBS) | ||
|
||
.PHONY: gfalibs | ||
gfalibs: |
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,13 @@ | ||
diff --git a/Makefile b/Makefile | ||
index 5823f28..19d1be3 100644 | ||
--- a/Makefile | ||
+++ b/Makefile | ||
@@ -13,7 +13,7 @@ INCLUDE = include | ||
BINDIR := $(BUILD)/.o | ||
|
||
LDFLAGS := -pthread | ||
-LIBS = -lz | ||
+LIBS := -lz | ||
|
||
OBJS := main input reads | ||
BINS := $(addprefix $(BINDIR)/, $(OBJS)) |
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,39 @@ | ||
{% set name = "rdeval" %} | ||
{% set version = "0.0.2" %} | ||
|
||
package: | ||
name: {{ name|lower }} | ||
version: {{ version }} | ||
|
||
source: | ||
url: https://github.com/vgl-hub/{{ name }}/releases/download/v{{ version }}/{{ name }}.v{{ version }}-with_submodules.zip | ||
sha256: 56c2f4d7d2c22b27d1b380dc41b81cc77a2d97c792a69b9360bed9e0027bac4d | ||
patches: | ||
- zlib.patch | ||
- libs.patch | ||
- foo.patch | ||
|
||
build: | ||
number: 0 | ||
run_exports: | ||
- {{ pin_subpackage(name|lower, max_pin="x.x") }} | ||
|
||
requirements: | ||
build: | ||
- {{ compiler('cxx') }} | ||
- make | ||
host: | ||
- zlib | ||
|
||
test: | ||
commands: | ||
- rdeval --help | ||
|
||
about: | ||
home: https://github.com/vgl-hub/{{ name }} | ||
summary: A general purpose, multithreaded read analysis and manipulation tool. | ||
license: MIT | ||
license_family: MIT | ||
license_file: LICENSE | ||
license_url: https://github.com/vgl-hub/{{ name }}/blob/main/LICENSE | ||
dev_url: https://github.com/vgl-hub/{{ name }} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🛠️ Refactor suggestion Enhance summary for Bioconda context While the license information is complete, the summary should better explain:
This helps users understand why the package belongs in Bioconda rather than conda-forge. |
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,52 @@ | ||
diff --git a/gfalibs/include/output.h b/gfalibs/include/output.h | ||
index aabbec0..20f0dc1 100644 | ||
--- a/gfalibs/include/output.h | ||
+++ b/gfalibs/include/output.h | ||
@@ -12,7 +12,7 @@ | ||
#include "gfa-lines.h" | ||
#include "gfa.h" | ||
|
||
-#include "zlib.h" | ||
+#include <zlib.h> | ||
#include "zstream/zstream_common.hpp" | ||
#include "zstream/ozstream.hpp" | ||
#include "zstream/ozstream_impl.hpp" | ||
diff --git a/gfalibs/include/stream-obj.h b/gfalibs/include/stream-obj.h | ||
index 1faa4df..8e28bf6 100644 | ||
--- a/gfalibs/include/stream-obj.h | ||
+++ b/gfalibs/include/stream-obj.h | ||
@@ -2,7 +2,7 @@ | ||
#define STREAM_OBJ_H | ||
|
||
#include <fstream> | ||
-#include "zlib.h" | ||
+#include <zlib.h> | ||
|
||
class membuf : public std::streambuf { | ||
|
||
diff --git a/gfalibs/src/stream-obj.cpp b/gfalibs/src/stream-obj.cpp | ||
index e9694ee..c6eca26 100644 | ||
--- a/gfalibs/src/stream-obj.cpp | ||
+++ b/gfalibs/src/stream-obj.cpp | ||
@@ -5,7 +5,7 @@ | ||
|
||
#include "bed.h" | ||
#include "struct.h" | ||
-#include "zlib.h" | ||
+#include <zlib.h> | ||
#include "global.h" | ||
#include "log.h" | ||
#include "threadpool.h" | ||
diff --git a/src/reads.cpp b/src/reads.cpp | ||
index 866f49b..ac714cf 100644 | ||
--- a/src/reads.cpp | ||
+++ b/src/reads.cpp | ||
@@ -14,7 +14,7 @@ | ||
#include "functions.h" // global functions | ||
#include "stream-obj.h" | ||
|
||
-#include "zlib.h" | ||
+#include <zlib.h> | ||
#include "zstream/zstream_common.hpp" | ||
#include "zstream/ozstream.hpp" | ||
#include "zstream/ozstream_impl.hpp" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Codebase verification
Binary
rdeval
not found in the codebaseThe test command references
rdeval
, but no such binary exists. Please verify the correct binary name and update the test configuration accordingly.🔗 Analysis chain
Verify binary name and enhance test coverage
The test command uses
rdeval
while a past review noted a different binary namegenodsp
. Please clarify:Additionally, consider adding tests with sample data to verify core functionality.
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
Length of output: 448
Script:
Length of output: 915