Skip to content

Commit ddf71be

Browse files
galvdanpovey
galv
authored and
danpovey
committed
[build] Remove download of ATLAS header files from tools/. (kaldi-asr#1974)
Commit the header files cblas.h and clapack.h from ATLAS directly instead for simplicity. Use a new directory for the atlas header files. This way, when people pull this commit from github, they won't get an error from git saying that the pull will overwrite untracked files (namely, clapack.h and cblas.h). Also remove custom installation of ATLAS from tools/ since it's rarely used and apparently broken at the moment.
1 parent 41301bd commit ddf71be

File tree

7 files changed

+780
-71
lines changed

7 files changed

+780
-71
lines changed

‎src/configure

+1-1
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ mkl_threading=sequential
849849
android=false
850850

851851
MATHLIB='ATLAS'
852-
ATLASROOT=`rel2abs ../tools/ATLAS/`
852+
ATLASROOT=`rel2abs ../tools/ATLAS_headers/`
853853
FSTROOT=`rel2abs ../tools/openfst`
854854

855855
# Save the command line to include in kaldi.mk

‎tools/ATLAS_headers/include/README.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
These files were copy-pasted from ATLAS 3.10.2. We don't anticipate
2+
them changing. These are included here because system-provided
3+
versions of these two files are not in consistent locations.

‎tools/ATLAS_headers/include/cblas.h

+597
Large diffs are not rendered by default.

‎tools/ATLAS_headers/include/clapack.h

+177
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
#ifndef CLAPACK_H
2+
3+
#define CLAPACK_H
4+
#include "cblas.h"
5+
6+
#ifndef ATL_INT
7+
#define ATL_INT int
8+
#endif
9+
#ifndef ATL_CINT
10+
#define ATL_CINT const ATL_INT
11+
#endif
12+
#ifndef ATLAS_ORDER
13+
#define ATLAS_ORDER CBLAS_ORDER
14+
#endif
15+
#ifndef ATLAS_UPLO
16+
#define ATLAS_UPLO CBLAS_UPLO
17+
#endif
18+
#ifndef ATLAS_DIAG
19+
#define ATLAS_DIAG CBLAS_DIAG
20+
#endif
21+
int clapack_sgesv(const enum CBLAS_ORDER Order, const int N, const int NRHS,
22+
float *A, const int lda, int *ipiv,
23+
float *B, const int ldb);
24+
int clapack_sgetrf(const enum CBLAS_ORDER Order, const int M, const int N,
25+
float *A, const int lda, int *ipiv);
26+
int clapack_sgetrs
27+
(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE Trans,
28+
const int N, const int NRHS, const float *A, const int lda,
29+
const int *ipiv, float *B, const int ldb);
30+
int clapack_sgetri(const enum CBLAS_ORDER Order, const int N, float *A,
31+
const int lda, const int *ipiv);
32+
int clapack_sposv(const enum ATLAS_ORDER Order, const enum ATLAS_UPLO Uplo,
33+
const int N, const int NRHS, float *A, const int lda,
34+
float *B, const int ldb);
35+
int clapack_spotrf(const enum ATLAS_ORDER Order, const enum ATLAS_UPLO Uplo,
36+
const int N, float *A, const int lda);
37+
int clapack_spotrs(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
38+
const int N, const int NRHS, const float *A, const int lda,
39+
float *B, const int ldb);
40+
int clapack_spotri(const enum ATLAS_ORDER Order, const enum ATLAS_UPLO Uplo,
41+
const int N, float *A, const int lda);
42+
int clapack_slauum(const enum ATLAS_ORDER Order, const enum ATLAS_UPLO Uplo,
43+
const int N, float *A, const int lda);
44+
int clapack_strtri(const enum ATLAS_ORDER Order,const enum ATLAS_UPLO Uplo,
45+
const enum ATLAS_DIAG Diag, const int N, float *A,
46+
const int lda);
47+
int clapack_sgels(const enum CBLAS_ORDER Order,
48+
const enum CBLAS_TRANSPOSE TA,
49+
ATL_CINT M, ATL_CINT N, ATL_CINT NRHS, float *A,
50+
ATL_CINT lda, float *B, const int ldb);
51+
int clapack_sgelqf(const enum CBLAS_ORDER Order, ATL_CINT M, ATL_CINT N,
52+
float *A, ATL_CINT lda, float *TAU);
53+
int clapack_sgeqlf(const enum CBLAS_ORDER Order, ATL_CINT M, ATL_CINT N,
54+
float *A, ATL_CINT lda, float *TAU);
55+
int clapack_sgerqf(const enum CBLAS_ORDER Order, ATL_CINT M, ATL_CINT N,
56+
float *A, ATL_CINT lda, float *TAU);
57+
int clapack_sgeqrf(const enum CBLAS_ORDER Order, ATL_CINT M, ATL_CINT N,
58+
float *A, ATL_CINT lda, float *TAU);
59+
60+
int clapack_dgesv(const enum CBLAS_ORDER Order, const int N, const int NRHS,
61+
double *A, const int lda, int *ipiv,
62+
double *B, const int ldb);
63+
int clapack_dgetrf(const enum CBLAS_ORDER Order, const int M, const int N,
64+
double *A, const int lda, int *ipiv);
65+
int clapack_dgetrs
66+
(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE Trans,
67+
const int N, const int NRHS, const double *A, const int lda,
68+
const int *ipiv, double *B, const int ldb);
69+
int clapack_dgetri(const enum CBLAS_ORDER Order, const int N, double *A,
70+
const int lda, const int *ipiv);
71+
int clapack_dposv(const enum ATLAS_ORDER Order, const enum ATLAS_UPLO Uplo,
72+
const int N, const int NRHS, double *A, const int lda,
73+
double *B, const int ldb);
74+
int clapack_dpotrf(const enum ATLAS_ORDER Order, const enum ATLAS_UPLO Uplo,
75+
const int N, double *A, const int lda);
76+
int clapack_dpotrs(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
77+
const int N, const int NRHS, const double *A, const int lda,
78+
double *B, const int ldb);
79+
int clapack_dpotri(const enum ATLAS_ORDER Order, const enum ATLAS_UPLO Uplo,
80+
const int N, double *A, const int lda);
81+
int clapack_dlauum(const enum ATLAS_ORDER Order, const enum ATLAS_UPLO Uplo,
82+
const int N, double *A, const int lda);
83+
int clapack_dtrtri(const enum ATLAS_ORDER Order,const enum ATLAS_UPLO Uplo,
84+
const enum ATLAS_DIAG Diag, const int N, double *A,
85+
const int lda);
86+
int clapack_dgels(const enum CBLAS_ORDER Order,
87+
const enum CBLAS_TRANSPOSE TA,
88+
ATL_CINT M, ATL_CINT N, ATL_CINT NRHS, double *A,
89+
ATL_CINT lda, double *B, const int ldb);
90+
int clapack_dgelqf(const enum CBLAS_ORDER Order, ATL_CINT M, ATL_CINT N,
91+
double *A, ATL_CINT lda, double *TAU);
92+
int clapack_dgeqlf(const enum CBLAS_ORDER Order, ATL_CINT M, ATL_CINT N,
93+
double *A, ATL_CINT lda, double *TAU);
94+
int clapack_dgerqf(const enum CBLAS_ORDER Order, ATL_CINT M, ATL_CINT N,
95+
double *A, ATL_CINT lda, double *TAU);
96+
int clapack_dgeqrf(const enum CBLAS_ORDER Order, ATL_CINT M, ATL_CINT N,
97+
double *A, ATL_CINT lda, double *TAU);
98+
99+
int clapack_cgesv(const enum CBLAS_ORDER Order, const int N, const int NRHS,
100+
void *A, const int lda, int *ipiv,
101+
void *B, const int ldb);
102+
int clapack_cgetrf(const enum CBLAS_ORDER Order, const int M, const int N,
103+
void *A, const int lda, int *ipiv);
104+
int clapack_cgetrs
105+
(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE Trans,
106+
const int N, const int NRHS, const void *A, const int lda,
107+
const int *ipiv, void *B, const int ldb);
108+
int clapack_cgetri(const enum CBLAS_ORDER Order, const int N, void *A,
109+
const int lda, const int *ipiv);
110+
int clapack_cposv(const enum ATLAS_ORDER Order, const enum ATLAS_UPLO Uplo,
111+
const int N, const int NRHS, void *A, const int lda,
112+
void *B, const int ldb);
113+
int clapack_cpotrf(const enum ATLAS_ORDER Order, const enum ATLAS_UPLO Uplo,
114+
const int N, void *A, const int lda);
115+
int clapack_cpotrs(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
116+
const int N, const int NRHS, const void *A, const int lda,
117+
void *B, const int ldb);
118+
int clapack_cpotri(const enum ATLAS_ORDER Order, const enum ATLAS_UPLO Uplo,
119+
const int N, void *A, const int lda);
120+
int clapack_clauum(const enum ATLAS_ORDER Order, const enum ATLAS_UPLO Uplo,
121+
const int N, void *A, const int lda);
122+
int clapack_ctrtri(const enum ATLAS_ORDER Order,const enum ATLAS_UPLO Uplo,
123+
const enum ATLAS_DIAG Diag, const int N, void *A,
124+
const int lda);
125+
int clapack_cgels(const enum CBLAS_ORDER Order,
126+
const enum CBLAS_TRANSPOSE TA,
127+
ATL_CINT M, ATL_CINT N, ATL_CINT NRHS, void *A,
128+
ATL_CINT lda, void *B, const int ldb);
129+
int clapack_cgelqf(const enum CBLAS_ORDER Order, ATL_CINT M, ATL_CINT N,
130+
void *A, ATL_CINT lda, void *TAU);
131+
int clapack_cgeqlf(const enum CBLAS_ORDER Order, ATL_CINT M, ATL_CINT N,
132+
void *A, ATL_CINT lda, void *TAU);
133+
int clapack_cgerqf(const enum CBLAS_ORDER Order, ATL_CINT M, ATL_CINT N,
134+
void *A, ATL_CINT lda, void *TAU);
135+
int clapack_cgeqrf(const enum CBLAS_ORDER Order, ATL_CINT M, ATL_CINT N,
136+
void *A, ATL_CINT lda, void *TAU);
137+
138+
int clapack_zgesv(const enum CBLAS_ORDER Order, const int N, const int NRHS,
139+
void *A, const int lda, int *ipiv,
140+
void *B, const int ldb);
141+
int clapack_zgetrf(const enum CBLAS_ORDER Order, const int M, const int N,
142+
void *A, const int lda, int *ipiv);
143+
int clapack_zgetrs
144+
(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE Trans,
145+
const int N, const int NRHS, const void *A, const int lda,
146+
const int *ipiv, void *B, const int ldb);
147+
int clapack_zgetri(const enum CBLAS_ORDER Order, const int N, void *A,
148+
const int lda, const int *ipiv);
149+
int clapack_zposv(const enum ATLAS_ORDER Order, const enum ATLAS_UPLO Uplo,
150+
const int N, const int NRHS, void *A, const int lda,
151+
void *B, const int ldb);
152+
int clapack_zpotrf(const enum ATLAS_ORDER Order, const enum ATLAS_UPLO Uplo,
153+
const int N, void *A, const int lda);
154+
int clapack_zpotrs(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
155+
const int N, const int NRHS, const void *A, const int lda,
156+
void *B, const int ldb);
157+
int clapack_zpotri(const enum ATLAS_ORDER Order, const enum ATLAS_UPLO Uplo,
158+
const int N, void *A, const int lda);
159+
int clapack_zlauum(const enum ATLAS_ORDER Order, const enum ATLAS_UPLO Uplo,
160+
const int N, void *A, const int lda);
161+
int clapack_ztrtri(const enum ATLAS_ORDER Order,const enum ATLAS_UPLO Uplo,
162+
const enum ATLAS_DIAG Diag, const int N, void *A,
163+
const int lda);
164+
int clapack_zgels(const enum CBLAS_ORDER Order,
165+
const enum CBLAS_TRANSPOSE TA,
166+
ATL_CINT M, ATL_CINT N, ATL_CINT NRHS, void *A,
167+
ATL_CINT lda, void *B, const int ldb);
168+
int clapack_zgelqf(const enum CBLAS_ORDER Order, ATL_CINT M, ATL_CINT N,
169+
void *A, ATL_CINT lda, void *TAU);
170+
int clapack_zgeqlf(const enum CBLAS_ORDER Order, ATL_CINT M, ATL_CINT N,
171+
void *A, ATL_CINT lda, void *TAU);
172+
int clapack_zgerqf(const enum CBLAS_ORDER Order, ATL_CINT M, ATL_CINT N,
173+
void *A, ATL_CINT lda, void *TAU);
174+
int clapack_zgeqrf(const enum CBLAS_ORDER Order, ATL_CINT M, ATL_CINT N,
175+
void *A, ATL_CINT lda, void *TAU);
176+
177+
#endif

‎tools/Makefile

+2-15
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ ifeq ("$(shell expr $(OPENFST_VER_NUM) \< 10600)","1")
1818
Supported versions: >= 1.6.0)
1919
endif
2020

21-
all: check_required_programs sph2pipe atlas sclite openfst
21+
all: check_required_programs sph2pipe sclite openfst
2222
@echo -e "\n\n"
2323
@echo "Warning: IRSTLM is not installed by default anymore. If you need IRSTLM"
2424
@echo "Warning: use the script extras/install_irstlm.sh"
2525
@echo "All done OK."
2626

2727
# make sure check_required_programs runs before anything else:
28-
sph2pipe atlas sclite openfst sctk: | check_required_programs
28+
sph2pipe sclite openfst sctk: | check_required_programs
2929

3030
check_required_programs:
3131
extras/check_dependencies.sh
@@ -43,10 +43,8 @@ distclean:
4343
rm -rf openfst-$(OPENFST_VERSION)/
4444
rm -rf sctk-2.4.10/
4545
rm -rf sctk
46-
rm -rf ATLAS/
4746
rm -rf sph2pipe_v2.5/
4847
rm -rf sph2pipe_v2.5.tar.gz
49-
rm -rf atlas3.8.3.tar.gz
5048
rm -rf sctk-2.4.10-20151007-1312Z.tar.bz2
5149
rm -rf openfst-$(OPENFST_VERSION).tar.gz
5250
rm -f openfst
@@ -112,17 +110,6 @@ sctk-2.4.10-20151007-1312Z.tar.bz2:
112110
wget -T 10 -t 3 ftp://jaguar.ncsl.nist.gov/pub/sctk-2.4.10-20151007-1312Z.tar.bz2|| \
113111
wget --no-check-certificate -T 10 http://www.openslr.org/resources/4/sctk-2.4.10-20151007-1312Z.tar.bz2
114112

115-
116-
atlas: ATLAS/include/cblas.h
117-
118-
ATLAS/include/cblas.h: | atlas3.8.3.tar.gz
119-
tar xozf atlas3.8.3.tar.gz ATLAS/include
120-
121-
atlas3.8.3.tar.gz:
122-
wget -T 10 ftp://ftp.vim.org/vol/2/metalab/distributions/tinycorelinux/2.x/tce/src/libatlas/atlas3.8.3.tar.gz || \
123-
wget -T 10 http://sourceforge.net/projects/math-atlas/files/Stable/3.8.3/atlas3.8.3.tar.gz || \
124-
wget --no-check-certificate -T 10 -t 3 http://www.danielpovey.com/files/kaldi/atlas3.8.3.tar.gz
125-
126113
sph2pipe: sph2pipe_compiled
127114

128115
sph2pipe_compiled: sph2pipe_v2.5/sph2pipe

‎tools/extras/install_atlas.sh

-54
This file was deleted.

‎tools/install_atlas.sh

-1
This file was deleted.

0 commit comments

Comments
 (0)