Skip to content

Commit b81849b

Browse files
committed
update bgen
1 parent f08b08d commit b81849b

18 files changed

+603
-427
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,3 +212,7 @@ ld_tests:
212212
./PCAone -B adj.residuals --match-bim adj.mbim --ld-r2 0.8 --ld-bp 1000000 -o adj_prune_m0 -m 0
213213
./PCAone -B adj.residuals --match-bim adj.mbim --ld-r2 0.8 --ld-bp 1000000 -o adj_prune_m1 -m 2
214214
diff adj_prune_m0.ld.prune.out adj_prune_m1.ld.prune.out > /dev/null
215+
216+
bgen_tests:
217+
./PCAone -g example/test.bgen -n6
218+
./PCAone -g example/test.bgen -m 0.1 -n6

external/bgen/Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
#
22
# Makefile to compile bgen library
33
#
4+
Platform := $(shell uname -s)
45
CXX ?= g++
5-
CXXFLAGS += -O3 -Wall -std=c++11
6+
CXXFLAGS = -O2 -Wall -std=c++11
67
AVX = 1
78

8-
ifeq ($(strip $(AVX)), 1)
9-
$(info "use -mavx2 for bgen")
10-
CXXFLAGS += -mavx -mavx2 -DAVX2
9+
ifeq ($(Platform), Darwin)
10+
CXXFLAGS += -march=native
11+
else
12+
CXXFLAGS += -mavx -mavx2
1113
endif
1214

1315
OBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))

0 commit comments

Comments
 (0)