-
Notifications
You must be signed in to change notification settings - Fork 3.1k
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
Add SuSiEx with a patch to make its Makefile portable to Apple Clang. #44131
Open
pettyalex
wants to merge
13
commits into
bioconda:master
Choose a base branch
from
belowlab:add-recipe-susiex
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
039a4f1
Add SuSiEx with a patch to make its Makefile portable to Apple Clang.
pettyalex 4240f13
Fix run_exports.
pettyalex 34a7038
Patch was based on latest. Fix so that patch is based on v1.1.0
pettyalex 4f5def0
Fix LDFLAGS on Linux
pettyalex a14776a
Fix patch, can't add a line to patch without telling the patch about it.
pettyalex 83d4065
Fix cp binary
pettyalex 1559ac3
Fix license file location.
pettyalex ce5d262
Set LDFLAGS to include the libs directory, hopefully this finds llvm…
pettyalex ec63d9a
I guess that non-apple clang supports -fopenmp
pettyalex b6f3fb0
Merge branch 'master' into add-recipe-susiex
pettyalex 67f1d9a
Apply suggestions from code review
pettyalex a851ca8
Merge branch 'master' into add-recipe-susiex
pettyalex ab8a573
Merge branch 'master' into add-recipe-susiex
pettyalex 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,7 @@ | ||
#!/bin/bash | ||
|
||
mkdir -p $PREFIX/bin | ||
|
||
cd src | ||
make | ||
cp ../bin/SuSiEx $PREFIX/bin/SuSiEx | ||
pettyalex marked this conversation as resolved.
Show resolved
Hide resolved
|
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 = '1.1.0' %} | ||
|
||
package: | ||
name: susiex | ||
version: {{ version }} | ||
|
||
source: | ||
url: https://github.com/getian107/SuSiEx/archive/refs/tags/v{{ version }}.tar.gz | ||
sha256: b67dca665e05b1e2a715033c29ad1485b8b3408edcf758d6f5f31a3bd202662c | ||
patches: | ||
- portable_makefile.patch | ||
|
||
build: | ||
number: 0 | ||
run_exports: | ||
- {{ pin_subpackage('susiex', max_pin="x") }} | ||
|
||
requirements: | ||
build: | ||
- {{ compiler('cxx') }} | ||
- make | ||
- llvm-openmp # [osx] | ||
- libgomp # [linux] | ||
|
||
host: | ||
- llvm-openmp # [osx] | ||
- libgomp # [linux] | ||
|
||
run: | ||
- llvm-openmp # [osx] | ||
- libgomp # [linux] | ||
pettyalex marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
test: | ||
commands: | ||
- SuSiEx | ||
|
||
about: | ||
home: https://github.com/getian107/SuSiEx | ||
license: MIT | ||
license_family: MIT | ||
license_file: LICENSE | ||
summary: 'SuSiEx is a C++ based command line tool that performs cross-ancestry | ||
fine-mapping using GWAS summary statistics and LD reference panels' | ||
|
||
extra: | ||
identifiers: | ||
- doi:10.1111/rssb.12388 | ||
recipe-maintainers: | ||
- pettyalex |
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,36 @@ | ||
diff --git a/src/makefile b/src/makefile | ||
index 2f32523..a5057a8 100644 | ||
--- a/src/makefile | ||
+++ b/src/makefile | ||
@@ -1,14 +1,28 @@ | ||
+CXXFLAGS=-O3 -Wall -Wextra | ||
+LDFLAGS=-O3 -flto | ||
+ | ||
all: SuSiEx | ||
|
||
+UNAME_S := $(shell uname -s) | ||
+ | ||
+ifeq ($(UNAME_S),Darwin) | ||
+ CXXFLAGS+=-fopenmp | ||
+ LDLIBS+=-fopenmp | ||
+else | ||
+ CXXFLAGS=-fopenmp | ||
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. Why this overwrites CXXFLAGS ? The earlier set |
||
+ LDFLAGS+=-fopenmp | ||
+endif | ||
+ | ||
SuSiEx: main.cpp data.o model.o | ||
mkdir -p ../bin | ||
- g++ main.cpp data.o model.o -o ../bin/SuSiEx -fopenmp | ||
+ $(CXX) $(LDFLAGS) main.cpp data.o model.o -o ../bin/SuSiEx $(LDLIBS) | ||
|
||
data.o: data.cpp data.hpp | ||
- g++ -c data.cpp -fopenmp | ||
+ $(CXX) $(CXXFLAGS) -c data.cpp | ||
|
||
model.o: model.cpp model.hpp | ||
- g++ -c model.cpp -fopenmp | ||
+ $(CXX) $(CXXFLAGS) -c model.cpp | ||
|
||
+.PHONY: clean | ||
clean: | ||
rm -rf *.o ../bin/SuSiEx |
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.