From 6e637d14bc2cd3fe606201df40ed6c2592b90fae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20W=C3=B3jtowicz?= <andre@amu.edu.pl>
Date: Sun, 1 May 2016 22:57:06 +0200
Subject: [PATCH] gotoblas2: moved ld config to check function

---
 install-env.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/install-env.sh b/install-env.sh
index 627c4ab..57a05b5 100644
--- a/install-env.sh
+++ b/install-env.sh
@@ -245,9 +245,6 @@ function gotoblas2_install {
     cd ..
     rm -r survivegotoblas2-3.141
     
-    echo "${DIR_GOTOBLAS2}" > /etc/ld.so.conf.d/gotoblas2.conf
-    ldconfig
-    
     Rscript -e "library(checkpoint); checkpoint('${CHECKPOINT_DATE}', scanForPackages=FALSE, verbose=FALSE); install.packages('RhpcBLASctl')"
     
     echo "Installed files:"
@@ -260,10 +257,14 @@ function gotoblas2_check {
 
     echo "Started checking GotoBLAS2."
 
+    echo "${DIR_GOTOBLAS2}" > /etc/ld.so.conf.d/gotoblas2.conf
+    ldconfig
     sed "2i\library(RhpcBLASctl); blas_set_num_threads(`nproc`)" sample-benchmark.R > sample-benchmark-gotoblas2.R
     
     LD_PRELOAD="${DIR_GOTOBLAS2}/libgoto2blas.so ${DIR_GOTOBLAS2}/libgoto2lapack.so" GOTO_NUM_THREADS=`nproc` Rscript sample-benchmark-gotoblas2.R
     
+    rm /etc/ld.so.conf.d/gotoblas2.conf
+    ldconfig
     rm sample-benchmark-gotoblas2.R
 
     echo "Finished checking GotoBLAS2."