trunk: modify the configure script to build more easily on red hat; cosmetic change in mutex code.

danpovey · danpovey · commit b2b3b7846756 · 2014-08-21T18:46:18.000Z
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@4330 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
diff --git a/src/configure b/src/configure
@@ -418,6 +418,24 @@ function linux_configure_debian7 {
   exit_success;
 }
 
+function linux_configure_redhat {
+  m=$1  # 64 or empty.
+  ATLASLIBS="/usr/lib$m/atlas/libatlas.so.3 /usr/lib$m/atlas/libf77blas.so.3 /usr/lib$m/atlas/libcblas.so.3 /usr/lib$m/atlas/libclapack.so.3"
+  for f in $ATLASLIBS; do 
+    [ ! -f $f ] && return 1;
+  done
+  libdir=$(dirname $(echo $ATLASLIBS | awk '{print $1}'))
+  [ -z "$libdir" ] && echo "Error getting libdir in linux_configure_redhat" && exit 1;
+  echo ATLASINC = $ATLASROOT/include >> kaldi.mk
+  echo ATLASLIBS = $ATLASLIBS -Wl,-rpath=$libdir >> kaldi.mk
+  echo 
+  cat makefiles/linux_atlas.mk >> kaldi.mk
+  fix_cxx_flag
+  echo "Successfully configured for red hat [dynamic libraries] with ATLASLIBS =$ATLASLIBS"
+  $use_cuda && linux_configure_cuda
+  exit_success;
+}
+
 
 function linux_configure_static {
   if $threaded_atlas; then pt=pt; else pt=""; fi
@@ -670,6 +688,8 @@ if [ "`uname`" == "Linux" ]; then
         linux_configure_debian_ubuntu 64 || \
         linux_configure_debian_ubuntu || \
         linux_configure_debian7 || \
+        linux_configure_redhat 64 || \
+        linux_configure_redhat || \
         linux_atlas_failure "Failed to configure ATLAS lbiraries";
     else
       # Prefer dynamic to static math.
@@ -678,6 +698,8 @@ if [ "`uname`" == "Linux" ]; then
         linux_configure_debian_ubuntu 64 || \
         linux_configure_debian_ubuntu || \
         linux_configure_debian7 || \
+        linux_configure_redhat 64 || \
+        linux_configure_redhat || \
         linux_atlas_failure "Failed to configure ATLAS lbiraries";
     fi
 
diff --git a/src/thread/kaldi-mutex.cc b/src/thread/kaldi-mutex.cc
@@ -66,8 +66,10 @@ bool Mutex::TryLock() {
 
 
 void Mutex::Unlock() {
-  if (pthread_mutex_unlock(&mutex_) != 0)
-    KALDI_ERR << "Error on unlocking pthread mutex";
+  int ret;
+  if ((ret = pthread_mutex_unlock(&mutex_)) != 0)
+    KALDI_ERR << "Error on unlocking pthread mutex, error is: "
+              << strerror(ret);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,10 @@ bool Mutex::TryLock() {`
`66`	`66`
`67`	`67`
`68`	`68`	`void Mutex::Unlock() {`
`69`		`- if (pthread_mutex_unlock(&mutex_) != 0)`
`70`		`- KALDI_ERR << "Error on unlocking pthread mutex";`
	`69`	`+ int ret;`
	`70`	`+ if ((ret = pthread_mutex_unlock(&mutex_)) != 0)`
	`71`	`+ KALDI_ERR << "Error on unlocking pthread mutex, error is: "`
	`72`	`+ << strerror(ret);`
`71`	`73`	`}`
`72`	`74`
`73`	`75`