diff options
| author | Pjotr Prins | 2018-09-26 09:38:20 +0000 |
|---|---|---|
| committer | Pjotr Prins | 2018-09-26 09:38:20 +0000 |
| commit | 5095e0dfa99ef6474e233f36af5755d90786b63e (patch) | |
| tree | 2f2ba420fb68d363f08d46e9f81adcce7d6acf58 | |
| parent | 98aeb737941508515acd4a6beccd946ca39d79c1 (diff) | |
| download | pangemma-5095e0dfa99ef6474e233f36af5755d90786b63e.tar.gz | |
Updated version and added performance stats
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | src/version.h | 6 | ||||
| -rw-r--r-- | test/performance/releases.org | 25 |
4 files changed, 18 insertions, 17 deletions
@@ -214,7 +214,7 @@ OBJS = $(SOURCES:.cpp=.o) all: $(OUTPUT) ./src/version.h: ./VERSION - $(VGEN) $(GUIX_PROFILE) > src/version.h + $(shell bash $(VGEN) $(GUIX_PROFILE) > src/version.h) $(OUTPUT): $(OBJS) $(CPP) $(CPPFLAGS) $(OBJS) $(LIBS) -o $(OUTPUT) @@ -1 +1 @@ -0.98-beta1 +0.98 diff --git a/src/version.h b/src/version.h index 5afd64d..14ed70f 100644 --- a/src/version.h +++ b/src/version.h @@ -1,5 +1,5 @@ // version.h generated by GEMMA scripts/gen_version_info.sh -#define GEMMA_VERSION "0.98-beta1" -#define GEMMA_DATE "2018-09-06" +#define GEMMA_VERSION "0.98" +#define GEMMA_DATE "2018-09-26" #define GEMMA_YEAR "2018" -#define GEMMA_PROFILE "/gnu/store/8h46wb8hi8n492i2vlbfcz4dm44xwlpc-profile" +#define GEMMA_PROFILE "" diff --git a/test/performance/releases.org b/test/performance/releases.org index 2419960..f1772dc 100644 --- a/test/performance/releases.org +++ b/test/performance/releases.org @@ -90,7 +90,7 @@ trix const*, gsl_matrix*, gsl_matrix*) onst*) #+END_SRC -* GEMMA 0.98-beta1 +* GEMMA 0.98 (release) #+BEGIN_SRC bash linux-vdso.so.1 (0x00007ffe475d2000) @@ -107,9 +107,8 @@ onst*) #+END_SRC #+BEGIN_SRC bash - -time ./bin/gemma -g ~/tmp/mouse_hs1940/mouse_hs1940.geno.txt.gz -p ~/tmp/mouse_hs1940/mouse_hs1940.pheno.txt -a ~/tmp/mouse_hs1940/mouse_hs1940.anno.txt -gk -no-check -GEMMA 0.98-beta1 (2018-09-06) by Xiang Zhou and team (C) 2012-2018 +time ./bin/gemma -g ./example/mouse_hs1940.geno.txt.gz -p ./example/mouse_hs1940.pheno.txt -a ./example/mouse_hs1940.anno.txt -gk -no-check +GEMMA 0.98 (2018-09-26) by Xiang Zhou and team (C) 2012-2018 Reading Files ... ## number of total individuals = 1940 ## number of analyzed individuals = 1410 @@ -119,15 +118,16 @@ Reading Files ... ## number of analyzed SNPs = 10768 Calculating Relatedness Matrix ... ================================================== 100% +**** INFO: Done. -real 0m16.875s -user 0m25.180s -sys 0m1.740s +real 0m7.169s +user 0m13.656s +sys 0m1.584s #+END_SRC #+BEGIN_SRC bash -lario:~/izip/git/opensource/genenetwork/gemma$ time bin/gemma -g ~/tmp/mouse_hs1940/mouse_hs1940.geno.txt.gz -p ~/tmp/mouse_hs1940/mouse_hs1940.pheno.txt -n 1 -a ~/tmp/mouse_hs1940/mouse_hs1940.anno.txt -k ./output/result.cXX.txt -lmm -no-check -GEMMA 0.98-beta1 (2018-09-06) by Xiang Zhou and team (C) 2012-2018 +time ./bin/gemma -g ./example/mouse_hs1940.geno.txt.gz -p ./example/mouse_hs1940.pheno.txt -n 1 -a ./example/mouse_hs1940.anno.txt -k ./output/result.cXX.txt -lmm -no-check +GEMMA 0.98 (2018-09-26) by Xiang Zhou and team (C) 2012-2018 Reading Files ... ## number of total individuals = 1940 ## number of analyzed individuals = 1410 @@ -139,10 +139,11 @@ Start Eigen-Decomposition... pve estimate =0.608801 se(pve) =0.032774 ================================================== 100% +**** INFO: Done. -real 0m13.255s -user 0m18.272s -sys 0m3.324s +real 0m12.356s +user 0m15.788s +sys 0m3.036s #+END_SRC * GEMMA 0.98-pre |