about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPjotr Prins2018-09-28 09:37:36 +0000
committerPjotr Prins2018-09-28 09:37:36 +0000
commit8597ff255020980a7e79603331b5d1dd6a7a42b9 (patch)
treed2314aa0bcb7f824e80a33ebbc324277480e335b
parent1fdd4ca1ae891ff9dd3736e6ed94bc01c3423dfd (diff)
downloadpangemma-8597ff255020980a7e79603331b5d1dd6a7a42b9.tar.gz
Atlas compilation (still not working)
-rw-r--r--INSTALL.md5
-rw-r--r--Makefile5
2 files changed, 9 insertions, 1 deletions
diff --git a/INSTALL.md b/INSTALL.md
index cdb3096..e6e3908 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -69,6 +69,11 @@ To test with another dependency, e.g. GSLv1
 
     env GUIX_PACKAGE_PATH=../guix-bioinformatics/ guix environment -C guix --ad-hoc gcc gdb gfortran:lib gsl1 eigen openblas zlib bash ld-wrapper perl
 
+or replace openblas with atlas
+
+    env GUIX_PACKAGE_PATH=~/izip/git/opensource/genenetwork/guix-bioinformatics/ ~/.config/guix/current/bin/guix environment -C guix --ad-hoc gcc gdb gfortran:lib gsl1 eigen lapack atlas zlib bash ld-wrapper perl
+    make clean && make WITH_OPENBLAS= WITH_ATLAS=1
+
 #### GNU Guix reproducible build system
 
 One of the challenges of developing software is dealing with
diff --git a/Makefile b/Makefile
index 916115e..17bad5f 100644
--- a/Makefile
+++ b/Makefile
@@ -65,6 +65,7 @@ DEBUG                  = 1                # DEBUG mode, set DEBUG=0 for a releas
 PROFILING              =                  # Add profiling info
 SHOW_COMPILER_WARNINGS =
 WITH_OPENBLAS          = 1                # Without OpenBlas uses LAPACK
+WITH_ATLAS             =                  # In place of OpenBlas(?)
 WITH_LAPACK            =                  # Force linking LAPACK (if OpenBlas lacks it)
 WITH_GSLCBLAS          =                  # Force linking gslcblas (if OpenBlas lacks it)
 OPENBLAS_LEGACY        =                  # Using older OpenBlas
@@ -129,7 +130,9 @@ ifdef WITH_OPENBLAS
     CPPFLAGS += -DOPENBLAS_LEGACY
   endif
 else
-  CPPFLAGS += -DUSE_BLAS=atlas
+  ifdef WITH_ATLAS
+    CPPFLAGS += -DUSE_BLAS=atlas
+  endif
 endif
 
 ifeq ($(CXX), clang++)