Use relative header paths

aria1991 · Jun 7, 2021 · a5f86a3 · a5f86a3
1 parent 6438318
commit a5f86a3
Show file tree

Hide file tree

Showing 186 changed files with 737 additions and 740 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -90,10 +90,7 @@ find_package(Boost 1.41.0 REQUIRED COMPONENTS
 )
 
 # Define where include files live
-include_directories(
-  ${PROJECT_SOURCE_DIR}
-  ${Boost_INCLUDE_DIRS}
-)
+include_directories(${Boost_INCLUDE_DIRS})
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)

diff --git a/lm/bhiksha.cc b/lm/bhiksha.cc
@@ -1,9 +1,9 @@
-#include "lm/bhiksha.hh"
+#include "bhiksha.hh"
 
-#include "lm/binary_format.hh"
-#include "lm/config.hh"
-#include "util/file.hh"
-#include "util/exception.hh"
+#include "binary_format.hh"
+#include "config.hh"
+#include "../util/file.hh"
+#include "../util/exception.hh"
 
 #include <limits>
 

diff --git a/lm/bhiksha.hh b/lm/bhiksha.hh
@@ -13,10 +13,10 @@
 #ifndef LM_BHIKSHA_H
 #define LM_BHIKSHA_H
 
-#include "lm/model_type.hh"
-#include "lm/trie.hh"
-#include "util/bit_packing.hh"
-#include "util/sorted_uniform.hh"
+#include "model_type.hh"
+#include "trie.hh"
+#include "../util/bit_packing.hh"
+#include "../util/sorted_uniform.hh"
 
 #include <algorithm>
 #include <stdint.h>

diff --git a/lm/binary_format.cc b/lm/binary_format.cc
@@ -1,8 +1,8 @@
-#include "lm/binary_format.hh"
+#include "binary_format.hh"
 
-#include "lm/lm_exception.hh"
-#include "util/file.hh"
-#include "util/file_piece.hh"
+#include "lm_exception.hh"
+#include "../util/file.hh"
+#include "../util/file_piece.hh"
 
 #include <cstddef>
 #include <cstring>

diff --git a/lm/binary_format.hh b/lm/binary_format.hh
@@ -1,13 +1,13 @@
 #ifndef LM_BINARY_FORMAT_H
 #define LM_BINARY_FORMAT_H
 
-#include "lm/config.hh"
-#include "lm/model_type.hh"
-#include "lm/read_arpa.hh"
+#include "config.hh"
+#include "model_type.hh"
+#include "read_arpa.hh"
 
-#include "util/file_piece.hh"
-#include "util/mmap.hh"
-#include "util/scoped.hh"
+#include "../util/file_piece.hh"
+#include "../util/mmap.hh"
+#include "../util/scoped.hh"
 
 #include <cstddef>
 #include <vector>

diff --git a/lm/build_binary_main.cc b/lm/build_binary_main.cc
@@ -1,7 +1,7 @@
-#include "lm/model.hh"
-#include "lm/sizes.hh"
-#include "util/file_piece.hh"
-#include "util/usage.hh"
+#include "model.hh"
+#include "sizes.hh"
+#include "../util/file_piece.hh"
+#include "../util/usage.hh"
 
 #include <algorithm>
 #include <cstdlib>
@@ -12,7 +12,7 @@
 #include <cmath>
 
 #ifdef WIN32
-#include "util/getopt.hh"
+#include "../util/getopt.hh"
 #else
 #include <unistd.h>
 #endif

diff --git a/lm/builder/adjust_counts.cc b/lm/builder/adjust_counts.cc
@@ -1,6 +1,6 @@
-#include "lm/builder/adjust_counts.hh"
-#include "lm/common/ngram_stream.hh"
-#include "lm/builder/payload.hh"
+#include "adjust_counts.hh"
+#include "../common/ngram_stream.hh"
+#include "payload.hh"
 
 #include <algorithm>
 #include <iostream>

diff --git a/lm/builder/adjust_counts.hh b/lm/builder/adjust_counts.hh
@@ -1,9 +1,9 @@
 #ifndef LM_BUILDER_ADJUST_COUNTS_H
 #define LM_BUILDER_ADJUST_COUNTS_H
 
-#include "lm/builder/discount.hh"
-#include "lm/lm_exception.hh"
-#include "util/exception.hh"
+#include "discount.hh"
+#include "../lm_exception.hh"
+#include "../../util/exception.hh"
 
 #include <vector>
 

diff --git a/lm/builder/adjust_counts_test.cc b/lm/builder/adjust_counts_test.cc
@@ -1,8 +1,8 @@
-#include "lm/builder/adjust_counts.hh"
+#include "adjust_counts.hh"
 
-#include "lm/common/ngram_stream.hh"
-#include "lm/builder/payload.hh"
-#include "util/scoped.hh"
+#include "../common/ngram_stream.hh"
+#include "payload.hh"
+#include "../../util/scoped.hh"
 
 #include <boost/thread/thread.hpp>
 #define BOOST_TEST_MODULE AdjustCounts

diff --git a/lm/builder/combine_counts.hh b/lm/builder/combine_counts.hh
@@ -1,11 +1,11 @@
 #ifndef LM_BUILDER_COMBINE_COUNTS_H
 #define LM_BUILDER_COMBINE_COUNTS_H
 
-#include "lm/builder/payload.hh"
-#include "lm/common/ngram.hh"
-#include "lm/common/compare.hh"
-#include "lm/word_index.hh"
-#include "util/stream/sort.hh"
+#include "payload.hh"
+#include "../common/ngram.hh"
+#include "../common/compare.hh"
+#include "../word_index.hh"
+#include "../../util/stream/sort.hh"
 
 #include <functional>
 #include <string>

diff --git a/lm/builder/corpus_count.cc b/lm/builder/corpus_count.cc
@@ -1,18 +1,18 @@
-#include "lm/builder/corpus_count.hh"
-
-#include "lm/builder/payload.hh"
-#include "lm/common/ngram.hh"
-#include "lm/lm_exception.hh"
-#include "lm/vocab.hh"
-#include "lm/word_index.hh"
-#include "util/file_stream.hh"
-#include "util/file.hh"
-#include "util/file_piece.hh"
-#include "util/murmur_hash.hh"
-#include "util/probing_hash_table.hh"
-#include "util/scoped.hh"
-#include "util/stream/chain.hh"
-#include "util/tokenize_piece.hh"
+#include "corpus_count.hh"
+
+#include "payload.hh"
+#include "../common/ngram.hh"
+#include "../lm_exception.hh"
+#include "../vocab.hh"
+#include "../word_index.hh"
+#include "../../util/file_stream.hh"
+#include "../../util/file.hh"
+#include "../../util/file_piece.hh"
+#include "../../util/murmur_hash.hh"
+#include "../../util/probing_hash_table.hh"
+#include "../../util/scoped.hh"
+#include "../../util/stream/chain.hh"
+#include "../../util/tokenize_piece.hh"
 
 #include <functional>
 

diff --git a/lm/builder/corpus_count.hh b/lm/builder/corpus_count.hh
@@ -1,9 +1,9 @@
 #ifndef LM_BUILDER_CORPUS_COUNT_H
 #define LM_BUILDER_CORPUS_COUNT_H
 
-#include "lm/lm_exception.hh"
-#include "lm/word_index.hh"
-#include "util/scoped.hh"
+#include "../lm_exception.hh"
+#include "../word_index.hh"
+#include "../../util/scoped.hh"
 
 #include <cstddef>
 #include <string>

diff --git a/lm/builder/corpus_count_test.cc b/lm/builder/corpus_count_test.cc
@@ -1,14 +1,14 @@
-#include "lm/builder/corpus_count.hh"
+#include "corpus_count.hh"
 
-#include "lm/builder/payload.hh"
-#include "lm/common/ngram_stream.hh"
-#include "lm/common/ngram.hh"
+#include "payload.hh"
+#include "../common/ngram_stream.hh"
+#include "../common/ngram.hh"
 
-#include "util/file.hh"
-#include "util/file_piece.hh"
-#include "util/tokenize_piece.hh"
-#include "util/stream/chain.hh"
-#include "util/stream/stream.hh"
+#include "../../util/file.hh"
+#include "../../util/file_piece.hh"
+#include "../../util/tokenize_piece.hh"
+#include "../../util/stream/chain.hh"
+#include "../../util/stream/stream.hh"
 
 #define BOOST_TEST_MODULE CorpusCountTest
 #include <boost/test/unit_test.hpp>

diff --git a/lm/builder/count_ngrams_main.cc b/lm/builder/count_ngrams_main.cc
@@ -1,12 +1,12 @@
-#include "lm/builder/combine_counts.hh"
-#include "lm/builder/corpus_count.hh"
-#include "lm/common/compare.hh"
-#include "util/stream/chain.hh"
-#include "util/stream/io.hh"
-#include "util/stream/sort.hh"
-#include "util/file.hh"
-#include "util/file_piece.hh"
-#include "util/usage.hh"
+#include "combine_counts.hh"
+#include "corpus_count.hh"
+#include "../common/compare.hh"
+#include "../../util/stream/chain.hh"
+#include "../../util/stream/io.hh"
+#include "../../util/stream/sort.hh"
+#include "../../util/file.hh"
+#include "../../util/file_piece.hh"
+#include "../../util/usage.hh"
 
 #include <boost/program_options.hpp>
 

diff --git a/lm/builder/debug_print.hh b/lm/builder/debug_print.hh
@@ -1,11 +1,11 @@
 #ifndef LM_BUILDER_DEBUG_PRINT_H
 #define LM_BUILDER_DEBUG_PRINT_H
 
-#include "lm/builder/payload.hh"
-#include "lm/common/print.hh"
-#include "lm/common/ngram_stream.hh"
-#include "util/file_stream.hh"
-#include "util/file.hh"
+#include "payload.hh"
+#include "../common/print.hh"
+#include "../common/ngram_stream.hh"
+#include "../../util/file_stream.hh"
+#include "../../util/file.hh"
 
 #include <boost/lexical_cast.hpp>
 

diff --git a/lm/builder/dump_counts_main.cc b/lm/builder/dump_counts_main.cc
@@ -1,7 +1,7 @@
-#include "lm/common/print.hh"
-#include "lm/word_index.hh"
-#include "util/file.hh"
-#include "util/read_compressed.hh"
+#include "../common/print.hh"
+#include "../word_index.hh"
+#include "../../util/file.hh"
+#include "../../util/read_compressed.hh"
 
 #include <boost/lexical_cast.hpp>
 

diff --git a/lm/builder/initial_probabilities.cc b/lm/builder/initial_probabilities.cc
@@ -1,15 +1,15 @@
-#include "lm/builder/initial_probabilities.hh"
-
-#include "lm/builder/discount.hh"
-#include "lm/builder/hash_gamma.hh"
-#include "lm/builder/payload.hh"
-#include "lm/common/special.hh"
-#include "lm/common/ngram_stream.hh"
-#include "util/murmur_hash.hh"
-#include "util/file.hh"
-#include "util/stream/chain.hh"
-#include "util/stream/io.hh"
-#include "util/stream/stream.hh"
+#include "initial_probabilities.hh"
+
+#include "discount.hh"
+#include "hash_gamma.hh"
+#include "payload.hh"
+#include "../common/special.hh"
+#include "../common/ngram_stream.hh"
+#include "../../util/murmur_hash.hh"
+#include "../../util/file.hh"
+#include "../../util/stream/chain.hh"
+#include "../../util/stream/io.hh"
+#include "../../util/stream/stream.hh"
 
 #include <vector>
 

diff --git a/lm/builder/initial_probabilities.hh b/lm/builder/initial_probabilities.hh
@@ -1,9 +1,9 @@
 #ifndef LM_BUILDER_INITIAL_PROBABILITIES_H
 #define LM_BUILDER_INITIAL_PROBABILITIES_H
 
-#include "lm/builder/discount.hh"
-#include "lm/word_index.hh"
-#include "util/stream/config.hh"
+#include "discount.hh"
+#include "../word_index.hh"
+#include "../../util/stream/config.hh"
 
 #include <vector>
 

diff --git a/lm/builder/interpolate.cc b/lm/builder/interpolate.cc
@@ -1,13 +1,13 @@
-#include "lm/builder/interpolate.hh"
-
-#include "lm/builder/hash_gamma.hh"
-#include "lm/builder/payload.hh"
-#include "lm/common/compare.hh"
-#include "lm/common/joint_order.hh"
-#include "lm/common/ngram_stream.hh"
-#include "lm/lm_exception.hh"
-#include "util/fixed_array.hh"
-#include "util/murmur_hash.hh"
+#include "interpolate.hh"
+
+#include "hash_gamma.hh"
+#include "payload.hh"
+#include "../common/compare.hh"
+#include "../common/joint_order.hh"
+#include "../common/ngram_stream.hh"
+#include "../lm_exception.hh"
+#include "../../util/fixed_array.hh"
+#include "../../util/murmur_hash.hh"
 
 #include <iostream>
 #include <cassert>

diff --git a/lm/builder/interpolate.hh b/lm/builder/interpolate.hh
@@ -1,9 +1,9 @@
 #ifndef LM_BUILDER_INTERPOLATE_H
 #define LM_BUILDER_INTERPOLATE_H
 
-#include "lm/common/special.hh"
-#include "lm/word_index.hh"
-#include "util/stream/multi_stream.hh"
+#include "../common/special.hh"
+#include "../word_index.hh"
+#include "../../util/stream/multi_stream.hh"
 
 #include <vector>
 

diff --git a/lm/builder/lmplz_main.cc b/lm/builder/lmplz_main.cc
@@ -1,10 +1,10 @@
-#include "lm/builder/output.hh"
-#include "lm/builder/pipeline.hh"
-#include "lm/common/size_option.hh"
-#include "lm/lm_exception.hh"
-#include "util/file.hh"
-#include "util/file_piece.hh"
-#include "util/usage.hh"
+#include "output.hh"
+#include "pipeline.hh"
+#include "../common/size_option.hh"
+#include "../lm_exception.hh"
+#include "../../util/file.hh"
+#include "../../util/file_piece.hh"
+#include "../../util/usage.hh"
 
 #include <iostream>
 

diff --git a/lm/builder/output.cc b/lm/builder/output.cc
@@ -1,9 +1,9 @@
-#include "lm/builder/output.hh"
+#include "output.hh"
 
-#include "lm/common/model_buffer.hh"
-#include "lm/common/print.hh"
-#include "util/file_stream.hh"
-#include "util/stream/multi_stream.hh"
+#include "../common/model_buffer.hh"
+#include "../common/print.hh"
+#include "../../util/file_stream.hh"
+#include "../../util/stream/multi_stream.hh"
 
 #include <iostream>
 

diff --git a/lm/builder/output.hh b/lm/builder/output.hh
@@ -1,9 +1,9 @@
 #ifndef LM_BUILDER_OUTPUT_H
 #define LM_BUILDER_OUTPUT_H
 
-#include "lm/builder/header_info.hh"
-#include "lm/common/model_buffer.hh"
-#include "util/file.hh"
+#include "header_info.hh"
+#include "../common/model_buffer.hh"
+#include "../../util/file.hh"
 
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/utility.hpp>