Skip to content

Commit 2ab92f7

Browse files
rprogersrprogers
committed
merged changes to remove non-portable Bashisms
2 parents 40add23 + 9f39e39 commit 2ab92f7

File tree

16 files changed

+337
-86
lines changed

16 files changed

+337
-86
lines changed

‎.hgignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ syntax: glob
1111
*.Po
1212
*.tar.gz
1313
*.orig
14+
*.1
1415
mitk/discrete-mi/ac_config.h
1516
mitk/discrete-mi/ac_config.h.in
1617
tksrc/GMTK_FileTokenizer.cc

‎Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ scripts/triangulateGA \
1616
scripts/triangulateParallel \
1717
scripts/triangulateTimings
1818

19-
SUBDIRS = IEEEFloatingpoint miscSupport featureFileIO mitk deepMLP tksrc tests
19+
SUBDIRS = IEEEFloatingpoint miscSupport featureFileIO mitk deepMLP tksrc tests man
2020

2121
# machine to publish to (any that mount /g/melodi/html will probably do)
2222
PUBLISHHOST=trumpet

‎NEWS

+3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ Subscribe to the email list at
1111
http://mailman.u.washington.edu/mailman/listinfo/gmtk-users
1212

1313
Version 1.4.2 2015-
14+
* Removed some non-portable Bashisms
1415
* "observation" is now allowed as an identifier in GMTKL
1516
(the structure file language)
17+
* Fixed gmtkViz build failure on Ubuntu-derived Linuxes
18+
* Added automatically generated man pages
1619

1720
Version 1.4.1 2015-09-02
1821
* Reduced latency in gmtkOnline

‎README

-7
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,6 @@ GMTK distribution at:
159159

160160
and will be updated in the near future.
161161

162-
Also note that the default linker configuration on recent Ubuntu Linux
163-
distributions may cause problems building wxWidgets or gmtkViz. Doing
164-
the build with
165-
166-
make CXXFLAGS="-Wl,--no-as-needed"
167-
168-
may fix the problem.
169162

170163
enjoy!!
171164

‎configure.ac

+2-1
Original file line numberDiff line numberDiff line change
@@ -155,5 +155,6 @@ AC_CONFIG_SUBDIRS([IEEEFloatingpoint
155155
featureFileIO
156156
mitk
157157
deepMLP
158-
tksrc])
158+
tksrc
159+
man])
159160
AC_OUTPUT

‎debian7/gmtk.manpages

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
man/gmtkDMLPtrain.1
2+
man/gmtkDTindex.1
3+
man/gmtkEMtrain.1
4+
man/gmtkJT.1
5+
man/gmtkKernel.1
6+
man/gmtkMMItrain.1
7+
man/gmtkModelInfo.1
8+
man/gmtkNGramIndex.1
9+
man/gmtkOnline.1
10+
man/gmtkParmConvert.1
11+
man/gmtkPrint.1
12+
man/gmtkTFmerge.1
13+
man/gmtkTie.1
14+
man/gmtkTime.1
15+
man/gmtkTriangulate.1
16+
man/gmtkViterbi.1
17+
man/gmtkViz.1
18+
man/obs-cat.1
19+
man/obs-concat.1
20+
man/obs-diff.1
21+
man/obs-info.1
22+
man/obs-print.1
23+
man/obs-skmeans.1
24+
man/obs-stats.1
25+
man/obs-window.1

‎debian8/gmtk.manpages

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
man/gmtkDMLPtrain.1
2+
man/gmtkDTindex.1
3+
man/gmtkEMtrain.1
4+
man/gmtkJT.1
5+
man/gmtkKernel.1
6+
man/gmtkMMItrain.1
7+
man/gmtkModelInfo.1
8+
man/gmtkNGramIndex.1
9+
man/gmtkOnline.1
10+
man/gmtkParmConvert.1
11+
man/gmtkPrint.1
12+
man/gmtkTFmerge.1
13+
man/gmtkTie.1
14+
man/gmtkTime.1
15+
man/gmtkTriangulate.1
16+
man/gmtkViterbi.1
17+
man/gmtkViz.1
18+
man/obs-cat.1
19+
man/obs-concat.1
20+
man/obs-diff.1
21+
man/obs-info.1
22+
man/obs-print.1
23+
man/obs-skmeans.1
24+
man/obs-stats.1
25+
man/obs-window.1

‎featureFileIO/Makefile.am

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ endif
1818

1919
DEBUGFLAGS =
2020

21-
2221
# If configure determines we're using GCC C/C++ compilers, set flags appropriately
2322
if USE_GCC_FLAGS
2423
# Only used for GCC compilers
@@ -123,6 +122,10 @@ testMerge
123122

124123
#testFileSource
125124

125+
#check_PROGRAMS = gmtest
126+
127+
#gmtest_SOURCES = gmtest.cc
128+
126129

127130
testPFileFile_SOURCES = testPFileFile.cc
128131
testASCIIFile_SOURCES = testASCIIFile.cc
@@ -141,11 +144,8 @@ testMerge_SOURCES = testMerge.cc
141144
bin_PROGRAMS = obs-print obs-info obs-skmeans obs-window \
142145
obs-concat obs-diff obs-stats obs-cat
143146

144-
#check_PROGRAMS = gmtest
145-
146-
#gmtest_SOURCES = gmtest.cc
147-
148147
obs_cat_SOURCES = obs-cat.cc
148+
149149
obs_stats_SOURCES = obs-stats.cc
150150

151151
obs_print_SOURCES = \

‎man/Makefile.am

+127
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
2+
#
3+
# Written by Richard Rogers <[email protected]>
4+
#
5+
# Copyright (C) 2015 Jeff Bilmes
6+
# Licensed under the Open Software License version 3.0
7+
# See COPYING or http://opensource.org/licenses/OSL-3.0
8+
#
9+
10+
HELP2MANOPTS = -h -help -v -version -N -I gmtk.h2m -n "a Graphical Models Toolkit (GMTK) "`cat $(srcdir)/../RELEASE`" program"
11+
#--version-string=`cat $(srcdir)/../RELEASE`
12+
13+
SECTIONCMD = 's/\*\*\* \([A-Za-z0-9 ]*\) \*\*\*/.in -0.4i\n.B \1:\n.in 0.4i\n/g'
14+
15+
EXTRA_DIST = gmtk.h2m
16+
17+
dist_man1_MANS = \
18+
obs-print.1 \
19+
obs-info.1 \
20+
obs-skmeans.1 \
21+
obs-window.1 \
22+
obs-concat.1 \
23+
obs-diff.1 \
24+
obs-stats.1 \
25+
obs-cat.1 \
26+
gmtkTime.1 \
27+
gmtkJT.1 \
28+
gmtkEMtrain.1 \
29+
gmtkKernel.1 \
30+
gmtkViterbi.1 \
31+
gmtkTriangulate.1 \
32+
gmtkParmConvert.1 \
33+
gmtkTFmerge.1 \
34+
gmtkDTindex.1 \
35+
gmtkNGramIndex.1 \
36+
gmtkTie.1 \
37+
gmtkModelInfo.1 \
38+
gmtkOnline.1 \
39+
gmtkPrint.1 \
40+
gmtkMMItrain.1 \
41+
gmtkDMLPtrain.1 \
42+
gmtkViz.1
43+
44+
# Intentionally fails if you generate man pages in an
45+
# environment that doesn't build gmtkDMLPtrain or gmtkViz,
46+
# because their man pages must exist for the distribution.
47+
48+
h2m_verbose = $(h2m_verbose_@AM_V@)
49+
h2m_verbose_ = $(h2m_verbose_@AM_DEFAULT_V@)
50+
h2m_verbose_0 = @echo " H2M " $@;
51+
52+
obs-print.1: gmtk.h2m
53+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../featureFileIO/obs-print$(EXEEXT) | \
54+
$(SED) $(SECTIONCMD) > $@
55+
obs-info.1: gmtk.h2m
56+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../featureFileIO/obs-info$(EXEEXT) | \
57+
$(SED) $(SECTIONCMD) > $@
58+
obs-skmeans.1: gmtk.h2m
59+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../featureFileIO/obs-skmeans$(EXEEXT) | \
60+
$(SED) $(SECTIONCMD) > $@
61+
obs-window.1: gmtk.h2m
62+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../featureFileIO/obs-window$(EXEEXT) | \
63+
$(SED) $(SECTIONCMD) > $@
64+
obs-concat.1: gmtk.h2m
65+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../featureFileIO/obs-concat$(EXEEXT) | \
66+
$(SED) $(SECTIONCMD) > $@
67+
obs-diff.1: gmtk.h2m
68+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../featureFileIO/obs-diff$(EXEEXT) | \
69+
$(SED) $(SECTIONCMD) > $@
70+
obs-stats.1: gmtk.h2m
71+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../featureFileIO/obs-stats$(EXEEXT) | \
72+
$(SED) $(SECTIONCMD) > $@
73+
obs-cat.1: gmtk.h2m
74+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../featureFileIO/obs-cat$(EXEEXT) | \
75+
$(SED) $(SECTIONCMD) > $@
76+
77+
gmtkTime.1: gmtk.h2m
78+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../tksrc/gmtkTime$(EXEEXT) | \
79+
$(SED) $(SECTIONCMD) > $@
80+
gmtkJT.1: gmtk.h2m
81+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../tksrc/gmtkJT$(EXEEXT) | \
82+
$(SED) $(SECTIONCMD) > $@
83+
gmtkEMtrain.1: gmtk.h2m
84+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../tksrc/gmtkEMtrain$(EXEEXT) | \
85+
$(SED) $(SECTIONCMD) > $@
86+
gmtkKernel.1: gmtk.h2m
87+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../tksrc/gmtkKernel$(EXEEXT) | \
88+
$(SED) $(SECTIONCMD) > $@
89+
gmtkViterbi.1: gmtk.h2m
90+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../tksrc/gmtkViterbi$(EXEEXT) | \
91+
$(SED) $(SECTIONCMD) > $@
92+
gmtkTriangulate.1: gmtk.h2m
93+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../tksrc/gmtkTriangulate$(EXEEXT) | \
94+
$(SED) $(SECTIONCMD) > $@
95+
gmtkParmConvert.1: gmtk.h2m
96+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../tksrc/gmtkParmConvert$(EXEEXT) | \
97+
$(SED) $(SECTIONCMD) > $@
98+
gmtkTFmerge.1: gmtk.h2m
99+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../tksrc/gmtkTFmerge$(EXEEXT) | \
100+
$(SED) $(SECTIONCMD) > $@
101+
gmtkDTindex.1: gmtk.h2m
102+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../tksrc/gmtkDTindex$(EXEEXT) | \
103+
$(SED) $(SECTIONCMD) > $@
104+
gmtkNGramIndex.1: gmtk.h2m
105+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../tksrc/gmtkNGramIndex$(EXEEXT) | \
106+
$(SED) $(SECTIONCMD) > $@
107+
gmtkTie.1: gmtk.h2m
108+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../tksrc/gmtkTie$(EXEEXT) | \
109+
$(SED) $(SECTIONCMD) > $@
110+
gmtkModelInfo.1: gmtk.h2m
111+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../tksrc/gmtkModelInfo$(EXEEXT) | \
112+
$(SED) $(SECTIONCMD) > $@
113+
gmtkOnline.1: gmtk.h2m
114+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../tksrc/gmtkOnline$(EXEEXT) | \
115+
$(SED) $(SECTIONCMD) > $@
116+
gmtkPrint.1: gmtk.h2m
117+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../tksrc/gmtkPrint$(EXEEXT) | \
118+
$(SED) $(SECTIONCMD) > $@
119+
gmtkMMItrain.1: gmtk.h2m
120+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../tksrc/gmtkMMItrain$(EXEEXT) | \
121+
$(SED) $(SECTIONCMD) > $@
122+
gmtkDMLPtrain.1: gmtk.h2m
123+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../tksrc/gmtkDMLPtrain$(EXEEXT) | \
124+
$(SED) $(SECTIONCMD) > $@
125+
gmtkViz.1: gmtk.h2m
126+
$(h2m_verbose) $(HELP2MAN) $(HELP2MANOPTS) $(builddir)/../tksrc/gmtkViz$(EXEEXT) | \
127+
$(SED) $(SECTIONCMD) > $@

‎man/configure.ac

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# -*- Autoconf -*-
2+
3+
#
4+
# Written by Richard Rogers <[email protected]>
5+
#
6+
# Copyright (C) 2015 Jeff Bilmes
7+
# Licensed under the Open Software License version 3.0
8+
# See COPYING or http://opensource.org/licenses/OSL-3.0
9+
#
10+
11+
# Process this file with autoconf to produce a configure script.
12+
13+
AC_PREREQ(2.69)
14+
AC_INIT([GMTK], m4_esyscmd(printf %s `head -n 1 ../RELEASE`),
15+
[https://j.ee.washington.edu/trac/gmtk/newticket])
16+
17+
AC_CONFIG_SRCDIR([gmtk.h2m])
18+
19+
AM_INIT_AUTOMAKE([1.12 silent-rules -Wall -Werror foreign])
20+
AM_SILENT_RULES([yes])
21+
22+
# Checks for programs.
23+
24+
AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
25+
AC_PROG_SED
26+
27+
#AC_PROG_INSTALL
28+
29+
# Checks for header files.
30+
31+
# Checks for typedefs, structures, and compiler characteristics.
32+
33+
# Checks for library functions.
34+
35+
AC_CONFIG_FILES([Makefile])
36+
AC_OUTPUT

‎man/gmtk.h2m

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
[ENVIRONMENT]
2+
3+
.TP
4+
GMTKTMPDIR
5+
Temporary directory gmtkDMLPtrain uses to store neural network parameters
6+
.TP
7+
GMTK_CPP_CMD
8+
Command GMTK programs use to preprocess ASCII input files
9+
.TP
10+
GMTK_GZIP_CMD
11+
Command GMTK programs use to uncompress ASCII input files with ".gz" extensions
12+
.TP
13+
GMTK_BZIP2_CMD
14+
Command GMTK programs ue to uncompress ASCII input files with ".bz2" extensions
15+
16+
[REPORTING BUGS]
17+
18+
Report bugs to http://j.ee.washington.edu/trac/gmtk
19+
20+
[COPYRIGHT]
21+
22+
Copyright \(co 2001-2015 Jeff Bilmes
23+
.PP
24+
Licensed under the Open Software License version 3.0
25+
.br
26+
See COPYING or http://opensource.org/licenses/OSL-3.0
27+
28+
[SEE ALSO]
29+
30+
The GMTK source code and full documentation is available at
31+
.br
32+
http://melodi.ee.washington.edu/gmtk
33+
.PP
34+
Support is availabe via the GMTK Users' mailing list
35+
.br
36+
[email protected]
37+
.PP
38+
Subscribe at
39+
.br
40+
http://mailman.u.washington.edu/mailman/listinfo/gmtk-users

‎miscSupport/arguments.cc

+4-2
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,8 @@ void Arg::usage(const char* filter,bool stdErrPrint, const char *programDescript
10101010
fprintf(destStream,"%s\n", programDescription);
10111011
}
10121012
fprintf(destStream,"Usage: %s [[[-flag] [option]] ...]\n",Program_Name);
1013-
fprintf(destStream,"Required: <>; Optional: []; Flagless arguments must be in order.\n");
1013+
fprintf(destStream,"Options:\n");
1014+
fprintf(destStream,"Required: <>; Optional: []; Flagless arguments must be in order.\n\n");
10141015

10151016
Arg* arg_ptr = Args;
10161017
int longest_variation = 0;
@@ -1377,8 +1378,9 @@ bool Arg::parse(int argc,char** argv, const char *programDescription)
13771378
cnt=arg_ptr->getCount();
13781379
}
13791380
if (cnt > 0) {
1381+
printf("%s (GMTK) %s\n", Program_Name, PACKAGE_VERSION);
13801382
#ifdef HAVE_CONFIG_H
1381-
printf("%s (Mercurial id: %s checkin date: %s)\n",PACKAGE_STRING,HGID,HGDATE);
1383+
printf("Mercurial id: %s\ncheckin date: %s\n",HGID,HGDATE);
13821384
#else
13831385
printf("Use the Autotools build to get a working -version argument\n");
13841386
#endif

0 commit comments

Comments
 (0)