Commit 3a35faa3 authored by Karel Vesely's avatar Karel Vesely
Browse files

trunk,openblas : sync of linux_openblas.mk with linux_atlas.mk

- linux_atlas_64bit.mk was specific to BUT cluster and is no longer necessary



git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@4608 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
parent 5adc8e8e
......@@ -838,8 +838,6 @@ if [ "`uname`" == "Linux" ]; then
failure "Expected to find the file $OPENBLASROOT/lib/libopenblas.so"
fi
echo "Your math library seems to be OpenBLAS. Configuring appropriately."
cat makefiles/linux_openblas.mk >> kaldi.mk
fix_cxx_flag
if $static_math; then
echo "Configuring static OpenBlas since --static-math=yes"
OPENBLASLIBS="$OPENBLASROOT/lib/libopenblas.a -lgfortran"
......@@ -849,7 +847,8 @@ if [ "`uname`" == "Linux" ]; then
fi
echo "OPENBLASLIBS = $OPENBLASLIBS" >> kaldi.mk
echo "OPENBLASROOT = $OPENBLASROOT" >> kaldi.mk
echo "Warning (OPENBLAS): this part of the configure process is not properly tested and will not work."
cat makefiles/linux_openblas.mk >> kaldi.mk
fix_cxx_flag
$use_cuda && linux_configure_cuda
linux_configure_speex
echo "Successfully configured OpenBLAS from $OPENBLASROOT."
......
# This version is specialized for 64-bit cross-compilation on BUT machines.
# The configure script will not pick it up automatically.
#
# To use it, from src/ run in bash:
#
# cat makefiles/common.mk makefiles/linux_atlas_64bit.mk > kaldi.mk
# echo "CUDA = true" >> kaldi.mk
# echo "CUDATKDIR = /usr/local/share/cuda" >> kaldi.mk
# cat makefiles/linux_x86_64_cuda.mk >> kaldi.mk
#
# Note that for 64bit compilation of kaldi,
# you need to compile 64bit OpenFST first.
#
### You need to set KALDI_ROOT manually
KALDI_ROOT=/mnt/matylda5/iveselyk/DEVEL/kaldi/trunk
###
FSTROOT = $(KALDI_ROOT)/tools/openfst
ATLASINC = $(KALDI_ROOT)/tools/ATLAS/include
ATLASLIBS = /usr/local/lib64/liblapack.a /usr/local/lib64/libcblas.a /usr/local/lib64/libatlas.a /usr/local/lib64/libf77blas.a
# You have to make sure ATLASLIBS is set...
ifndef FSTROOT
$(error FSTROOT not defined.)
endif
ifndef ATLASINC
$(error ATLASINC not defined.)
endif
ifndef ATLASLIBS
$(error ATLASLIBS not defined.)
endif
CXXFLAGS = -msse -msse2 -Wall -I.. -pthread \
-DKALDI_DOUBLEPRECISION=0 -DHAVE_POSIX_MEMALIGN \
-Wno-sign-compare -Winit-self \
-DHAVE_EXECINFO_H=1 -rdynamic -DHAVE_CXXABI_H \
-DHAVE_ATLAS -I$(ATLASINC) \
-I$(FSTROOT)/include \
$(EXTRA_CXXFLAGS) \
-g # -O0 -DKALDI_PARANOID
ifeq ($(KALDI_FLAVOR), dynamic)
CXXFLAGS += -fPIC
endif
LDFLAGS = -rdynamic $(OPENFSTLDFLAGS)
LDLIBS = $(EXTRA_LDLIBS) $(OPENFSTLIBS) $(ATLASLIBS) -lm -lpthread -ldl
CC = x86_64-linux-g++
CXX = x86_64-linux-g++
AR = x86_64-linux-ar
AS = x86_64-linux-as
RANLIB = x86_64-linux-ranlib
# You have to make sure CLAPACKLIBS is set...
# You have to make sure FSTROOT,OPENBLASROOT,OPENBLASLIBS are set...
CXXFLAGS = -msse -Wall -I.. \
-pthread \
-DKALDI_DOUBLEPRECISION=0 -msse2 -DHAVE_POSIX_MEMALIGN \
-Wno-sign-compare -Wno-unused-local-typedefs \
ifndef FSTROOT
$(error FSTROOT not defined.)
endif
ifndef OPENBLASLIBS
$(error OPENBLASLIBS not defined.)
endif
ifndef OPENBLASROOT
$(error OPENBLASROOT not defined.)
endif
CXXFLAGS = -msse -msse2 -Wall -I.. \
-pthread \
-DKALDI_DOUBLEPRECISION=0 -DHAVE_POSIX_MEMALIGN \
-Wno-sign-compare -Wno-unused-local-typedefs -Winit-self \
-DHAVE_EXECINFO_H=1 -rdynamic -DHAVE_CXXABI_H \
-DUSE_KALDI_SVD -DHAVE_OPENBLAS -I $(OPENBLASROOT)/include \
-DHAVE_OPENBLAS -I $(OPENBLASROOT)/include \
-I $(FSTROOT)/include \
$(EXTRA_CXXFLAGS) \
-g # -O0 -DKALDI_PARANOID
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment