Revert "Sync pybind11 with master (#3832)" (#3841)

This reverts commit 51a2732.

Author: danpovey

.travis.yml

@@ -29,7 +29,6 @@ addons:
 branches:
   only:
     - master
-    - pybind11
 
 before_install:
   - cat /proc/sys/kernel/core_pattern

egs/wsj/s5/utils/data/get_allowed_durations.py

@@ -155,10 +155,6 @@ int main(int argc, char *argv[]) {
     int32 num_done = 0;
     for (; !prob_reader.Done(); prob_reader.Next()) {
       std::string key = prob_reader.Key();
-      if (!alignment_reader.HasKey(key)) {
-        KALDI_WARN << "No alignment for utterance " << key;
-        continue;
-      }       
       auto alignment = alignment_reader.Value(key);
       Matrix<BaseFloat> &probs = prob_reader.Value();
       if (log_applied) probs.ApplyExp();

src/bin/compute-gop.cc

@@ -26,12 +26,8 @@ LIBFILE_EXTENSION := $(PYBIND_EXTENSION)
 
 # pybind11 is heavily templated and generates code that is bloated before optimization.
 # -flto is link time optimization which apparently is important.
-ifndef CI_TARGETS
-  LTOFLAG = -flto
-endif
-
-CXXFLAGS += -O3 $(LTOFLAG) -I.
-LDFLAGS += $(LTOFLAG)
+CXXFLAGS += -O3 -flto -I.
+LDFLAGS += -flto
 
 ifeq ($(shell uname),Darwin)
   LDFLAGS += -undefined dynamic_lookup

src/pybind/Makefile

@@ -68,7 +68,7 @@ CCC=$(mtoken CXX "$CXX")
 echo "Building tools..." [Time: $(date)]
 runvx cd tools
 runvx make -j$MAXPAR openfst "$CCC" CXXFLAGS="$CF" \
-      OPENFST_CONFIGURE="--disable-static --enable-shared --disable-dependency-tracking"
+      OPENFST_CONFIGURE="--disable-static --enable-shared --disable-bin --disable-dependency-tracking"
 runvx make -j$MAXPAR cub "$CCC" CXXFLAGS="$CF"
 cd ..