diff options
| author | Kenneth Heafield <kpu@users.noreply.github.com> | 2021-06-08 15:59:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-08 15:59:36 +0300 |
| commit | bbf4fc511266c5d4515047055d7bdec659a6e158 (patch) | |
| tree | 06198e6b9168d90a0c41c107b5432078a0e288d4 | |
| parent | 6438318c6b70bc5610379bd839f30df8030d1d1b (diff) | |
| parent | a5f86a37cd4cf98b5f857a23c90805214602a2eb (diff) | |
Merge pull request #344 from kpu/relative-headers
Use relative header paths
186 files changed, 737 insertions, 740 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e303872..b482c50 100644 --- 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 index 4262b61..21be0cb 100644 --- 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 index 36438f1..808b6d0 100644 --- 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 index 802943f..0ae0e53 100644 --- 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 index ff99b95..73d9fcc 100644 --- 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 index cd377b0..e39ffa7 100644 --- 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 index c02e648..b3ae119 100644 --- 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 index 29319ba..cd8adab 100644 --- 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 index fff551f..47134c2 100644 --- 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 index 2eda517..e8e81f9 100644 --- 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 index 0761cdf..814a4d6 100644 --- 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 index 951bf53..417f097 100644 --- 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 index 3626222..eabaaaa 100644 --- 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 index 066be77..b20f68f 100644 --- 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 index 4b9f306..cbb0def 100644 --- 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 index 26078d0..709e2ee 100644 --- 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 index 5b8d86d..9696086 100644 --- 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 index caeea58..34c23ae 100644 --- 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 index a62ef43..285e669 100644 --- 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 index d20cd54..a0c9905 100644 --- 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 index 3c2dff8..e87a236 100644 --- 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 index 604fa22..1aa1522 100644 --- 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 index 69d6c6d..490dd33 100644 --- 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> diff --git a/lm/builder/payload.hh b/lm/builder/payload.hh index 1f1fa88..86a657e 100644 --- a/lm/builder/payload.hh +++ b/lm/builder/payload.hh @@ -1,8 +1,8 @@ #ifndef LM_BUILDER_PAYLOAD_H #define LM_BUILDER_PAYLOAD_H -#include "lm/weights.hh" -#include "lm/word_index.hh" +#include "../weights.hh" +#include "../word_index.hh" #include <stdint.h> namespace lm { namespace builder { diff --git a/lm/builder/pipeline.cc b/lm/builder/pipeline.cc index d131636..7831196 100644 --- a/lm/builder/pipeline.cc +++ b/lm/builder/pipeline.cc @@ -1,21 +1,21 @@ -#include "lm/builder/pipeline.hh" - -#include "lm/builder/adjust_counts.hh" -#include "lm/builder/combine_counts.hh" -#include "lm/builder/corpus_count.hh" -#include "lm/builder/hash_gamma.hh" -#include "lm/builder/initial_probabilities.hh" -#include "lm/builder/interpolate.hh" -#include "lm/builder/output.hh" -#include "lm/common/compare.hh" -#include "lm/common/renumber.hh" - -#include "lm/sizes.hh" -#include "lm/vocab.hh" - -#include "util/exception.hh" -#include "util/file.hh" -#include "util/stream/io.hh" +#include "pipeline.hh" + +#include "adjust_counts.hh" +#include "combine_counts.hh" +#include "corpus_count.hh" +#include "hash_gamma.hh" +#include "initial_probabilities.hh" +#include "interpolate.hh" +#include "output.hh" +#include "../common/compare.hh" +#include "../common/renumber.hh" + +#include "../sizes.hh" +#include "../vocab.hh" + +#include "../../util/exception.hh" +#include "../../util/file.hh" +#include "../../util/stream/io.hh" #include <algorithm> #include <iostream> diff --git a/lm/builder/pipeline.hh b/lm/builder/pipeline.hh index 66f1fd9..c8bdde1 100644 --- a/lm/builder/pipeline.hh +++ b/lm/builder/pipeline.hh @@ -1,13 +1,13 @@ #ifndef LM_BUILDER_PIPELINE_H #define LM_BUILDER_PIPELINE_H -#include "lm/builder/adjust_counts.hh" -#include "lm/builder/initial_probabilities.hh" -#include "lm/builder/header_info.hh" -#include "lm/lm_exception.hh" -#include "lm/word_index.hh" -#include "util/stream/config.hh" -#include "util/file_piece.hh" +#include "adjust_counts.hh" +#include "initial_probabilities.hh" +#include "header_info.hh" +#include "../lm_exception.hh" +#include "../word_index.hh" +#include "../../util/stream/config.hh" +#include "../../util/file_piece.hh" #include <string> #include <cstddef> diff --git a/lm/common/compare.hh b/lm/common/compare.hh index 2adaba4..bae4362 100644 --- a/lm/common/compare.hh +++ b/lm/common/compare.hh @@ -1,8 +1,8 @@ #ifndef LM_COMMON_COMPARE_H #define LM_COMMON_COMPARE_H -#include "lm/common/ngram.hh" -#include "lm/word_index.hh" +#include "ngram.hh" +#include "../word_index.hh" #include <functional> #include <string> diff --git a/lm/common/joint_order.hh b/lm/common/joint_order.hh index 6113bb8..dce0b1c 100644 --- a/lm/common/joint_order.hh +++ b/lm/common/joint_order.hh @@ -1,11 +1,11 @@ #ifndef LM_COMMON_JOINT_ORDER_H #define LM_COMMON_JOINT_ORDER_H -#include "lm/common/ngram_stream.hh" -#include "lm/lm_exception.hh" +#include "ngram_stream.hh" +#include "../lm_exception.hh" #ifdef DEBUG -#include "util/fixed_array.hh" +#include "../../util/fixed_array.hh" #include <iostream> #endif diff --git a/lm/common/model_buffer.cc b/lm/common/model_buffer.cc index 82d28af..d1fcdb1 100644 --- a/lm/common/model_buffer.cc +++ b/lm/common/model_buffer.cc @@ -1,14 +1,14 @@ -#include "lm/common/model_buffer.hh" - -#include "lm/common/compare.hh" -#include "lm/state.hh" -#include "lm/weights.hh" -#include "util/exception.hh" -#include "util/file_stream.hh" -#include "util/file.hh" -#include "util/file_piece.hh" -#include "util/stream/io.hh" -#include "util/stream/multi_stream.hh" +#include "model_buffer.hh" + +#include "compare.hh" +#include "../state.hh" +#include "../weights.hh" +#include "../../util/exception.hh" +#include "../../util/file_stream.hh" +#include "../../util/file.hh" +#include "../../util/file_piece.hh" +#include "../../util/stream/io.hh" +#include "../../util/stream/multi_stream.hh" #include <boost/lexical_cast.hpp> diff --git a/lm/common/model_buffer.hh b/lm/common/model_buffer.hh index f7674af..b808642 100644 --- a/lm/common/model_buffer.hh +++ b/lm/common/model_buffer.hh @@ -4,10 +4,10 @@ /* Format with separate files in suffix order. Each file contains * n-grams of the same order. */ -#include "lm/word_index.hh" -#include "util/file.hh" -#include "util/fixed_array.hh" -#include "util/string_piece.hh" +#include "../word_index.hh" +#include "../../util/file.hh" +#include "../../util/fixed_array.hh" +#include "../../util/string_piece.hh" #include <string> #include <vector> diff --git a/lm/common/model_buffer_test.cc b/lm/common/model_buffer_test.cc index ce103a1..396b396 100644 --- a/lm/common/model_buffer_test.cc +++ b/lm/common/model_buffer_test.cc @@ -1,6 +1,6 @@ -#include "lm/common/model_buffer.hh" -#include "lm/model.hh" -#include "lm/state.hh" +#include "model_buffer.hh" +#include "../model.hh" +#include "../state.hh" #define BOOST_TEST_MODULE ModelBufferTest #include <boost/test/unit_test.hpp> diff --git a/lm/common/ngram.hh b/lm/common/ngram.hh index 7a6d1c3..c601316 100644 --- a/lm/common/ngram.hh +++ b/lm/common/ngram.hh @@ -1,8 +1,8 @@ #ifndef LM_COMMON_NGRAM_H #define LM_COMMON_NGRAM_H -#include "lm/weights.hh" -#include "lm/word_index.hh" +#include "../weights.hh" +#include "../word_index.hh" #include <cstddef> #include <cassert> diff --git a/lm/common/ngram_stream.hh b/lm/common/ngram_stream.hh index 8bdf36e..0ce701c 100644 --- a/lm/common/ngram_stream.hh +++ b/lm/common/ngram_stream.hh @@ -1,10 +1,10 @@ #ifndef LM_BUILDER_NGRAM_STREAM_H #define LM_BUILDER_NGRAM_STREAM_H -#include "lm/common/ngram.hh" -#include "util/stream/chain.hh" -#include "util/stream/multi_stream.hh" -#include "util/stream/stream.hh" +#include "ngram.hh" +#include "../../util/stream/chain.hh" +#include "../../util/stream/multi_stream.hh" +#include "../../util/stream/stream.hh" #include <cstddef> diff --git a/lm/common/print.cc b/lm/common/print.cc index 518b62f..91a56d7 100644 --- a/lm/common/print.cc +++ b/lm/common/print.cc @@ -1,10 +1,10 @@ -#include "lm/common/print.hh" +#include "print.hh" -#include "lm/common/ngram_stream.hh" -#include "util/file_stream.hh" -#include "util/file.hh" -#include "util/mmap.hh" -#include "util/scoped.hh" +#include "ngram_stream.hh" +#include "../../util/file_stream.hh" +#include "../../util/file.hh" +#include "../../util/mmap.hh" +#include "../../util/scoped.hh" #include <sstream> #include <cstring> diff --git a/lm/common/print.hh b/lm/common/print.hh index 6aa08b3..cfd9800 100644 --- a/lm/common/print.hh +++ b/lm/common/print.hh @@ -1,9 +1,9 @@ #ifndef LM_COMMON_PRINT_H #define LM_COMMON_PRINT_H -#include "lm/word_index.hh" -#include "util/mmap.hh" -#include "util/string_piece.hh" +#include "../word_index.hh" +#include "../../util/mmap.hh" +#include "../../util/string_piece.hh" #include <cassert> #include <vector> diff --git a/lm/common/renumber.cc b/lm/common/renumber.cc index 0632a14..20295b3 100644 --- a/lm/common/renumber.cc +++ b/lm/common/renumber.cc @@ -1,7 +1,7 @@ -#include "lm/common/renumber.hh" -#include "lm/common/ngram.hh" +#include "renumber.hh" +#include "ngram.hh" -#include "util/stream/stream.hh" +#include "../../util/stream/stream.hh" namespace lm { diff --git a/lm/common/renumber.hh b/lm/common/renumber.hh index ca25c4d..03e7d48 100644 --- a/lm/common/renumber.hh +++ b/lm/common/renumber.hh @@ -4,7 +4,7 @@ #ifndef LM_COMMON_RENUMBER_H #define LM_COMMON_RENUMBER_H -#include "lm/word_index.hh" +#include "../word_index.hh" #include <cstddef> diff --git a/lm/common/size_option.cc b/lm/common/size_option.cc index 46a920e..af108b8 100644 --- a/lm/common/size_option.cc +++ b/lm/common/size_option.cc @@ -1,5 +1,5 @@ #include <boost/program_options.hpp> -#include "util/usage.hh" +#include "../../util/usage.hh" namespace lm { diff --git a/lm/common/special.hh b/lm/common/special.hh index 0677cd7..c10fde5 100644 --- a/lm/common/special.hh +++ b/lm/common/special.hh @@ -1,7 +1,7 @@ #ifndef LM_COMMON_SPECIAL_H #define LM_COMMON_SPECIAL_H -#include "lm/word_index.hh" +#include "../word_index.hh" namespace lm { diff --git a/lm/config.cc b/lm/config.cc index 6c695ed..d2c2d1a 100644 --- a/lm/config.cc +++ b/lm/config.cc @@ -1,4 +1,4 @@ -#include "lm/config.hh" +#include "config.hh" #include <iostream> diff --git a/lm/config.hh b/lm/config.hh index 21b9e7e..0d16b79 100644 --- a/lm/config.hh +++ b/lm/config.hh @@ -1,8 +1,8 @@ #ifndef LM_CONFIG_H #define LM_CONFIG_H -#include "lm/lm_exception.hh" -#include "util/mmap.hh" +#include "lm_exception.hh" +#include "../util/mmap.hh" #include <iosfwd> #include <string> diff --git a/lm/enumerate_vocab.hh b/lm/enumerate_vocab.hh index f4c94cd..47709df 100644 --- a/lm/enumerate_vocab.hh +++ b/lm/enumerate_vocab.hh @@ -1,8 +1,8 @@ #ifndef LM_ENUMERATE_VOCAB_H #define LM_ENUMERATE_VOCAB_H -#include "lm/word_index.hh" -#include "util/string_piece.hh" +#include "word_index.hh" +#include "../util/string_piece.hh" namespace lm { diff --git a/lm/facade.hh b/lm/facade.hh index 325ef15..b2b83f6 100644 --- a/lm/facade.hh +++ b/lm/facade.hh @@ -1,8 +1,8 @@ #ifndef LM_FACADE_H #define LM_FACADE_H -#include "lm/virtual_interface.hh" -#include "util/string_piece.hh" +#include "virtual_interface.hh" +#include "../util/string_piece.hh" #include <string> diff --git a/lm/filter/arpa_io.cc b/lm/filter/arpa_io.cc index 54c1fcc..add610a 100644 --- a/lm/filter/arpa_io.cc +++ b/lm/filter/arpa_io.cc @@ -1,6 +1,6 @@ -#include "lm/filter/arpa_io.hh" -#include "util/file_piece.hh" -#include "util/string_stream.hh" +#include "arpa_io.hh" +#include "../../util/file_piece.hh" +#include "../../util/string_stream.hh" #include <iostream> #include <ostream> diff --git a/lm/filter/arpa_io.hh b/lm/filter/arpa_io.hh index 4756af5..bb39c6a 100644 --- a/lm/filter/arpa_io.hh +++ b/lm/filter/arpa_io.hh @@ -2,11 +2,11 @@ #define LM_FILTER_ARPA_IO_H /* Input and output for ARPA format language model files. */ -#include "lm/read_arpa.hh" -#include "util/exception.hh" -#include "util/file_stream.hh" -#include "util/string_piece.hh" -#include "util/tokenize_piece.hh" +#include "../read_arpa.hh" +#include "../../util/exception.hh" +#include "../../util/file_stream.hh" +#include "../../util/string_piece.hh" +#include "../../util/tokenize_piece.hh" #include <boost/noncopyable.hpp> #include <boost/scoped_array.hpp> diff --git a/lm/filter/count_io.hh b/lm/filter/count_io.hh index 143ed25..a350f47 100644 --- a/lm/filter/count_io.hh +++ b/lm/filter/count_io.hh @@ -5,9 +5,9 @@ #include <iostream> #include <string> -#include "util/file_stream.hh" -#include "util/file.hh" -#include "util/file_piece.hh" +#include "../../util/file_stream.hh" +#include "../../util/file.hh" +#include "../../util/file_piece.hh" namespace lm { diff --git a/lm/filter/filter_main.cc b/lm/filter/filter_main.cc index 6e89d1f..ec083da 100644 --- a/lm/filter/filter_main.cc +++ b/lm/filter/filter_main.cc @@ -1,13 +1,13 @@ -#include "lm/filter/arpa_io.hh" -#include "lm/filter/format.hh" -#include "lm/filter/phrase.hh" +#include "arpa_io.hh" +#include "format.hh" +#include "phrase.hh" #ifndef NTHREAD -#include "lm/filter/thread.hh" +#include "thread.hh" #endif -#include "lm/filter/vocab.hh" -#include "lm/filter/wrapper.hh" -#include "util/exception.hh" -#include "util/file_piece.hh" +#include "vocab.hh" +#include "wrapper.hh" +#include "../../util/exception.hh" +#include "../../util/file_piece.hh" #include <boost/ptr_container/ptr_vector.hpp> diff --git a/lm/filter/format.hh b/lm/filter/format.hh index d453f05..38b494f 100644 --- a/lm/filter/format.hh +++ b/lm/filter/format.hh @@ -1,8 +1,8 @@ #ifndef LM_FILTER_FORMAT_H #define LM_FILTER_FORMAT_H -#include "lm/filter/arpa_io.hh" -#include "lm/filter/count_io.hh" +#include "arpa_io.hh" +#include "count_io.hh" #include <boost/lexical_cast.hpp> #include <boost/ptr_container/ptr_vector.hpp> diff --git a/lm/filter/phrase.cc b/lm/filter/phrase.cc index d8260d5..ce82bf2 100644 --- a/lm/filter/phrase.cc +++ b/lm/filter/phrase.cc @@ -1,6 +1,6 @@ -#include "lm/filter/phrase.hh" +#include "phrase.hh" -#include "lm/filter/format.hh" +#include "format.hh" #include <algorithm> #include <functional> diff --git a/lm/filter/phrase.hh b/lm/filter/phrase.hh index 5227ab2..bfc3208 100644 --- a/lm/filter/phrase.hh +++ b/lm/filter/phrase.hh @@ -1,9 +1,9 @@ #ifndef LM_FILTER_PHRASE_H #define LM_FILTER_PHRASE_H -#include "util/murmur_hash.hh" -#include "util/string_piece.hh" -#include "util/tokenize_piece.hh" +#include "../../util/murmur_hash.hh" +#include "../../util/string_piece.hh" +#include "../../util/tokenize_piece.hh" #include <boost/unordered_map.hpp> diff --git a/lm/filter/phrase_table_vocab_main.cc b/lm/filter/phrase_table_vocab_main.cc index 9ffa35f..c11b046 100644 --- a/lm/filter/phrase_table_vocab_main.cc +++ b/lm/filter/phrase_table_vocab_main.cc @@ -1,10 +1,10 @@ -#include "util/file_stream.hh" -#include "util/file_piece.hh" -#include "util/murmur_hash.hh" -#include "util/pool.hh" -#include "util/string_piece.hh" -#include "util/string_piece_hash.hh" -#include "util/tokenize_piece.hh" +#include "../../util/file_stream.hh" +#include "../../util/file_piece.hh" +#include "../../util/murmur_hash.hh" +#include "../../util/pool.hh" +#include "../../util/string_piece.hh" +#include "../../util/string_piece_hash.hh" +#include "../../util/tokenize_piece.hh" #include <boost/unordered_map.hpp> #include <boost/unordered_set.hpp> diff --git a/lm/filter/thread.hh b/lm/filter/thread.hh index 88e069c..9bbc8e8 100644 --- a/lm/filter/thread.hh +++ b/lm/filter/thread.hh @@ -1,7 +1,7 @@ #ifndef LM_FILTER_THREAD_H #define LM_FILTER_THREAD_H -#include "util/thread_pool.hh" +#include "../../util/thread_pool.hh" #include <boost/utility/in_place_factory.hpp> diff --git a/lm/filter/vocab.cc b/lm/filter/vocab.cc index 2aca4fc..e0b97c7 100644 --- a/lm/filter/vocab.cc +++ b/lm/filter/vocab.cc @@ -1,4 +1,4 @@ -#include "lm/filter/vocab.hh" +#include "vocab.hh" #include <istream> #include <iostream> diff --git a/lm/filter/vocab.hh b/lm/filter/vocab.hh index 397a932..4bb1d19 100644 --- a/lm/filter/vocab.hh +++ b/lm/filter/vocab.hh @@ -3,10 +3,10 @@ // Vocabulary-based filters for language models. -#include "util/multi_intersection.hh" -#include "util/string_piece.hh" -#include "util/string_piece_hash.hh" -#include "util/tokenize_piece.hh" +#include "../../util/multi_intersection.hh" +#include "../../util/string_piece.hh" +#include "../../util/string_piece_hash.hh" +#include "../../util/tokenize_piece.hh" #include <boost/noncopyable.hpp> #include <boost/range/iterator_range.hpp> diff --git a/lm/filter/wrapper.hh b/lm/filter/wrapper.hh index 227ec8e..ef292e6 100644 --- a/lm/filter/wrapper.hh +++ b/lm/filter/wrapper.hh @@ -1,7 +1,7 @@ #ifndef LM_FILTER_WRAPPER_H #define LM_FILTER_WRAPPER_H -#include "util/string_piece.hh" +#include "../../util/string_piece.hh" #include <algorithm> #include <string> diff --git a/lm/fragment_main.cc b/lm/fragment_main.cc index 0267cd4..cc4d4c2 100644 --- a/lm/fragment_main.cc +++ b/lm/fragment_main.cc @@ -1,7 +1,7 @@ -#include "lm/binary_format.hh" -#include "lm/model.hh" -#include "lm/left.hh" -#include "util/tokenize_piece.hh" +#include "binary_format.hh" +#include "model.hh" +#include "left.hh" +#include "../util/tokenize_piece.hh" template <class Model> void Query(const char *name) { Model model(name); diff --git a/lm/interpolate/backoff_reunification.cc b/lm/interpolate/backoff_reunification.cc index 348c73d..7885f9a 100644 --- a/lm/interpolate/backoff_reunification.cc +++ b/lm/interpolate/backoff_reunification.cc @@ -1,8 +1,8 @@ -#include "lm/interpolate/backoff_reunification.hh" -#include "lm/common/model_buffer.hh" -#include "lm/common/ngram_stream.hh" -#include "lm/common/ngram.hh" -#include "lm/common/compare.hh" +#include "backoff_reunification.hh" +#include "../common/model_buffer.hh" +#include "../common/ngram_stream.hh" +#include "../common/ngram.hh" +#include "../common/compare.hh" #include <algorithm> #include <cassert> diff --git a/lm/interpolate/backoff_reunification.hh b/lm/interpolate/backoff_reunification.hh index 327db65..1c70d74 100644 --- a/lm/interpolate/backoff_reunification.hh +++ b/lm/interpolate/backoff_reunification.hh @@ -1,8 +1,8 @@ #ifndef KENLM_INTERPOLATE_BACKOFF_REUNIFICATION_ #define KENLM_INTERPOLATE_BACKOFF_REUNIFICATION_ -#include "util/stream/stream.hh" -#include "util/stream/multi_stream.hh" +#include "../../util/stream/stream.hh" +#include "../../util/stream/multi_stream.hh" namespace lm { namespace interpolate { diff --git a/lm/interpolate/backoff_reunification_test.cc b/lm/interpolate/backoff_reunification_test.cc index e1ec517..9b66740 100644 --- a/lm/interpolate/backoff_reunification_test.cc +++ b/lm/interpolate/backoff_reunification_test.cc @@ -1,5 +1,5 @@ -#include "lm/interpolate/backoff_reunification.hh" -#include "lm/common/ngram_stream.hh" +#include "backoff_reunification.hh" +#include "../common/ngram_stream.hh" #define BOOST_TEST_MODULE InterpolateBackoffReunificationTest #include <boost/test/unit_test.hpp> diff --git a/lm/interpolate/bounded_sequence_encoding.cc b/lm/interpolate/bounded_sequence_encoding.cc index aca8ed7..17d3823 100644 --- a/lm/interpolate/bounded_sequence_encoding.cc +++ b/lm/interpolate/bounded_sequence_encoding.cc @@ -1,4 +1,4 @@ -#include "lm/interpolate/bounded_sequence_encoding.hh" +#include "bounded_sequence_encoding.hh" #include <algorithm> diff --git a/lm/interpolate/bounded_sequence_encoding.hh b/lm/interpolate/bounded_sequence_encoding.hh index 8ae803a..5b6f21b 100644 --- a/lm/interpolate/bounded_sequence_encoding.hh +++ b/lm/interpolate/bounded_sequence_encoding.hh @@ -7,8 +7,8 @@ * add. */ -#include "util/exception.hh" -#include "util/fixed_array.hh" +#include "../../util/exception.hh" +#include "../../util/fixed_array.hh" #include <algorithm> #include <cstring> diff --git a/lm/interpolate/bounded_sequence_encoding_test.cc b/lm/interpolate/bounded_sequence_encoding_test.cc index d608b71..1a5be9e 100644 --- a/lm/interpolate/bounded_sequence_encoding_test.cc +++ b/lm/interpolate/bounded_sequence_encoding_test.cc @@ -1,6 +1,6 @@ -#include "lm/interpolate/bounded_sequence_encoding.hh" +#include "bounded_sequence_encoding.hh" -#include "util/scoped.hh" +#include "../../util/scoped.hh" #define BOOST_TEST_MODULE BoundedSequenceEncodingTest #include <boost/test/unit_test.hpp> diff --git a/lm/interpolate/interpolate_main.cc b/lm/interpolate/interpolate_main.cc index 06161c5..a8c9383 100644 --- a/lm/interpolate/interpolate_main.cc +++ b/lm/interpolate/interpolate_main.cc @@ -1,10 +1,10 @@ -#include "lm/common/model_buffer.hh" -#include "lm/common/size_option.hh" -#include "lm/interpolate/pipeline.hh" -#include "lm/interpolate/tune_instances.hh" -#include "lm/interpolate/tune_weights.hh" -#include "util/fixed_array.hh" -#include "util/usage.hh" +#include "../common/model_buffer.hh" +#include "../common/size_option.hh" +#include "pipeline.hh" +#include "tune_instances.hh" +#include "tune_weights.hh" +#include "../../util/fixed_array.hh" +#include "../../util/usage.hh" #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wpragmas" // Older gcc doesn't have "-Wunused-local-typedefs" and complains. diff --git a/lm/interpolate/merge_probabilities.cc b/lm/interpolate/merge_probabilities.cc index 1351079..491810d 100644 --- a/lm/interpolate/merge_probabilities.cc +++ b/lm/interpolate/merge_probabilities.cc @@ -1,7 +1,7 @@ -#include "lm/interpolate/merge_probabilities.hh" -#include "lm/common/ngram_stream.hh" -#include "lm/interpolate/bounded_sequence_encoding.hh" -#include "lm/interpolate/interpolate_info.hh" +#include "merge_probabilities.hh" +#include "../common/ngram_stream.hh" +#include "bounded_sequence_encoding.hh" +#include "interpolate_info.hh" #include <algorithm> #include <limits> diff --git a/lm/interpolate/merge_probabilities.hh b/lm/interpolate/merge_probabilities.hh index 61940e3..33a4c23 100644 --- a/lm/interpolate/merge_probabilities.hh +++ b/lm/interpolate/merge_probabilities.hh @@ -1,10 +1,10 @@ #ifndef LM_INTERPOLATE_MERGE_PROBABILITIES_H #define LM_INTERPOLATE_MERGE_PROBABILITIES_H -#include "lm/common/ngram.hh" -#include "lm/interpolate/bounded_sequence_encoding.hh" -#include "util/fixed_array.hh" -#include "util/stream/multi_stream.hh" +#include "../common/ngram.hh" +#include "bounded_sequence_encoding.hh" +#include "../../util/fixed_array.hh" +#include "../../util/stream/multi_stream.hh" #include <stdint.h> diff --git a/lm/interpolate/merge_vocab.cc b/lm/interpolate/merge_vocab.cc index 077403f..1b6c876 100644 --- a/lm/interpolate/merge_vocab.cc +++ b/lm/interpolate/merge_vocab.cc @@ -1,10 +1,10 @@ -#include "lm/interpolate/merge_vocab.hh" +#include "merge_vocab.hh" -#include "lm/enumerate_vocab.hh" -#include "lm/interpolate/universal_vocab.hh" -#include "lm/lm_exception.hh" -#include "lm/vocab.hh" -#include "util/file_piece.hh" +#include "../enumerate_vocab.hh" +#include "universal_vocab.hh" +#include "../lm_exception.hh" +#include "../vocab.hh" +#include "../../util/file_piece.hh" #include <queue> #include <string> diff --git a/lm/interpolate/merge_vocab.hh b/lm/interpolate/merge_vocab.hh index 8807568..fa6135a 100644 --- a/lm/interpolate/merge_vocab.hh +++ b/lm/interpolate/merge_vocab.hh @@ -1,9 +1,9 @@ #ifndef LM_INTERPOLATE_MERGE_VOCAB_H #define LM_INTERPOLATE_MERGE_VOCAB_H -#include "lm/word_index.hh" -#include "util/file.hh" -#include "util/fixed_array.hh" +#include "../word_index.hh" +#include "../../util/file.hh" +#include "../../util/fixed_array.hh" namespace lm { diff --git a/lm/interpolate/merge_vocab_test.cc b/lm/interpolate/merge_vocab_test.cc index c2642a4..b9b7d49 100644 --- a/lm/interpolate/merge_vocab_test.cc +++ b/lm/interpolate/merge_vocab_test.cc @@ -1,16 +1,16 @@ #define BOOST_TEST_MODULE InterpolateMergeVocabTest #include <boost/test/unit_test.hpp> -#include "lm/enumerate_vocab.hh" -#include "lm/interpolate/merge_vocab.hh" -#include "lm/interpolate/universal_vocab.hh" -#include "lm/lm_exception.hh" -#include "lm/vocab.hh" -#include "lm/word_index.hh" -#include "util/file.hh" -#include "util/file_piece.hh" -#include "util/file_stream.hh" -#include "util/tokenize_piece.hh" +#include "../enumerate_vocab.hh" +#include "merge_vocab.hh" +#include "universal_vocab.hh" +#include "../lm_exception.hh" +#include "../vocab.hh" +#include "../word_index.hh" +#include "../../util/file.hh" +#include "../../util/file_piece.hh" +#include "../../util/file_stream.hh" +#include "../../util/tokenize_piece.hh" #include <algorithm> #include <cstring> diff --git a/lm/interpolate/normalize.cc b/lm/interpolate/normalize.cc index ceeb6c2..3be18b8 100644 --- a/lm/interpolate/normalize.cc +++ b/lm/interpolate/normalize.cc @@ -1,17 +1,17 @@ -#include "lm/interpolate/normalize.hh" - -#include "lm/common/compare.hh" -#include "lm/common/ngram_stream.hh" -#include "lm/interpolate/backoff_matrix.hh" -#include "lm/interpolate/bounded_sequence_encoding.hh" -#include "lm/interpolate/interpolate_info.hh" -#include "lm/interpolate/merge_probabilities.hh" -#include "lm/weights.hh" -#include "lm/word_index.hh" -#include "util/fixed_array.hh" -#include "util/scoped.hh" -#include "util/stream/stream.hh" -#include "util/stream/rewindable_stream.hh" +#include "normalize.hh" + +#include "../common/compare.hh" +#include "../common/ngram_stream.hh" +#include "backoff_matrix.hh" +#include "bounded_sequence_encoding.hh" +#include "interpolate_info.hh" +#include "merge_probabilities.hh" +#include "../weights.hh" +#include "../word_index.hh" +#include "../../util/fixed_array.hh" +#include "../../util/scoped.hh" +#include "../../util/stream/stream.hh" +#include "../../util/stream/rewindable_stream.hh" #include <functional> #include <queue> diff --git a/lm/interpolate/normalize.hh b/lm/interpolate/normalize.hh index dd26b25..335bc5d 100644 --- a/lm/interpolate/normalize.hh +++ b/lm/interpolate/normalize.hh @@ -1,7 +1,7 @@ #ifndef LM_INTERPOLATE_NORMALIZE_H #define LM_INTERPOLATE_NORMALIZE_H -#include "util/fixed_array.hh" +#include "../../util/fixed_array.hh" /* Pass 2: * - Multiply backoff weights by the backed off probabilities from pass 1. diff --git a/lm/interpolate/normalize_test.cc b/lm/interpolate/normalize_test.cc index fe220f3..bec2549 100644 --- a/lm/interpolate/normalize_test.cc +++ b/lm/interpolate/normalize_test.cc @@ -1,10 +1,10 @@ -#include "lm/interpolate/normalize.hh" +#include "normalize.hh" -#include "lm/interpolate/interpolate_info.hh" -#include "lm/interpolate/merge_probabilities.hh" -#include "lm/common/ngram_stream.hh" -#include "util/stream/chain.hh" -#include "util/stream/multi_stream.hh" +#include "interpolate_info.hh" +#include "merge_probabilities.hh" +#include "../common/ngram_stream.hh" +#include "../../util/stream/chain.hh" +#include "../../util/stream/multi_stream.hh" #define BOOST_TEST_MODULE NormalizeTest #include <boost/test/unit_test.hpp> diff --git a/lm/interpolate/pipeline.cc b/lm/interpolate/pipeline.cc index da7f857..c96f6e5 100644 --- a/lm/interpolate/pipeline.cc +++ b/lm/interpolate/pipeline.cc @@ -1,21 +1,21 @@ -#include "lm/interpolate/pipeline.hh" - -#include "lm/common/compare.hh" -#include "lm/common/print.hh" -#include "lm/common/renumber.hh" -#include "lm/vocab.hh" -#include "lm/interpolate/backoff_reunification.hh" -#include "lm/interpolate/interpolate_info.hh" -#include "lm/interpolate/merge_probabilities.hh" -#include "lm/interpolate/merge_vocab.hh" -#include "lm/interpolate/normalize.hh" -#include "lm/interpolate/universal_vocab.hh" -#include "util/stream/chain.hh" -#include "util/stream/count_records.hh" -#include "util/stream/io.hh" -#include "util/stream/multi_stream.hh" -#include "util/stream/sort.hh" -#include "util/fixed_array.hh" +#include "pipeline.hh" + +#include "../common/compare.hh" +#include "../common/print.hh" +#include "../common/renumber.hh" +#include "../vocab.hh" +#include "backoff_reunification.hh" +#include "interpolate_info.hh" +#include "merge_probabilities.hh" +#include "merge_vocab.hh" +#include "normalize.hh" +#include "universal_vocab.hh" +#include "../../util/stream/chain.hh" +#include "../../util/stream/count_records.hh" +#include "../../util/stream/io.hh" +#include "../../util/stream/multi_stream.hh" +#include "../../util/stream/sort.hh" +#include "../../util/fixed_array.hh" namespace lm { namespace interpolate { namespace { diff --git a/lm/interpolate/pipeline.hh b/lm/interpolate/pipeline.hh index b200248..a2b8e1c 100644 --- a/lm/interpolate/pipeline.hh +++ b/lm/interpolate/pipeline.hh @@ -1,9 +1,9 @@ #ifndef LM_INTERPOLATE_PIPELINE_H #define LM_INTERPOLATE_PIPELINE_H -#include "lm/common/model_buffer.hh" -#include "util/fixed_array.hh" -#include "util/stream/config.hh" +#include "../common/model_buffer.hh" +#include "../../util/fixed_array.hh" +#include "../../util/stream/config.hh" #include <cstddef> #include <string> diff --git a/lm/interpolate/split_worker.cc b/lm/interpolate/split_worker.cc index e777bf0..01291e1 100644 --- a/lm/interpolate/split_worker.cc +++ b/lm/interpolate/split_worker.cc @@ -1,5 +1,5 @@ -#include "lm/interpolate/split_worker.hh" -#include "lm/common/ngram.hh" +#include "split_worker.hh" +#include "../common/ngram.hh" namespace lm { namespace interpolate { diff --git a/lm/interpolate/split_worker.hh b/lm/interpolate/split_worker.hh index 15fae68..89db372 100644 --- a/lm/interpolate/split_worker.hh +++ b/lm/interpolate/split_worker.hh @@ -1,8 +1,8 @@ #ifndef KENLM_INTERPOLATE_SPLIT_WORKER_H_ #define KENLM_INTERPOLATE_SPLIT_WORKER_H_ -#include "util/stream/chain.hh" -#include "util/stream/stream.hh" +#include "../../util/stream/chain.hh" +#include "../../util/stream/stream.hh" namespace lm { namespace interpolate { diff --git a/lm/interpolate/streaming_example_main.cc b/lm/interpolate/streaming_example_main.cc index 1f543cb..274c9f5 100644 --- a/lm/interpolate/streaming_example_main.cc +++ b/lm/interpolate/streaming_example_main.cc @@ -1,10 +1,10 @@ -#include "lm/common/compare.hh" -#include "lm/common/model_buffer.hh" -#include "lm/common/ngram.hh" -#include "util/stream/chain.hh" -#include "util/stream/multi_stream.hh" -#include "util/stream/sort.hh" -#include "lm/interpolate/split_worker.hh" +#include "../common/compare.hh" +#include "../common/model_buffer.hh" +#include "../common/ngram.hh" +#include "../../util/stream/chain.hh" +#include "../../util/stream/multi_stream.hh" +#include "../../util/stream/sort.hh" +#include "split_worker.hh" #include <boost/program_options.hpp> #include <boost/version.hpp> diff --git a/lm/interpolate/tune_derivatives.cc b/lm/interpolate/tune_derivatives.cc index 7cd915a..cddcc8f 100644 --- a/lm/interpolate/tune_derivatives.cc +++ b/lm/interpolate/tune_derivatives.cc @@ -1,9 +1,9 @@ -#include "lm/interpolate/tune_derivatives.hh" +#include "tune_derivatives.hh" -#include "lm/interpolate/tune_instances.hh" -#include "lm/interpolate/tune_matrix.hh" -#include "util/stream/chain.hh" -#include "util/stream/typed_stream.hh" +#include "tune_instances.hh" +#include "tune_matrix.hh" +#include "../../util/stream/chain.hh" +#include "../../util/stream/typed_stream.hh" #include <Eigen/Core> diff --git a/lm/interpolate/tune_derivatives.hh b/lm/interpolate/tune_derivatives.hh index e3bedd3..af874d4 100644 --- a/lm/interpolate/tune_derivatives.hh +++ b/lm/interpolate/tune_derivatives.hh @@ -1,7 +1,7 @@ #ifndef LM_INTERPOLATE_TUNE_DERIVATIVES_H #define LM_INTERPOLATE_TUNE_DERIVATIVES_H -#include "lm/interpolate/tune_matrix.hh" +#include "tune_matrix.hh" #include <Eigen/Core> #include <cmath> diff --git a/lm/interpolate/tune_derivatives_test.cc b/lm/interpolate/tune_derivatives_test.cc index 2a43abf..cfa69ec 100644 --- a/lm/interpolate/tune_derivatives_test.cc +++ b/lm/interpolate/tune_derivatives_test.cc @@ -1,11 +1,11 @@ -#include "lm/interpolate/tune_derivatives.hh" +#include "tune_derivatives.hh" -#include "lm/interpolate/tune_instances.hh" +#include "tune_instances.hh" -#include "util/stream/config.hh" -#include "util/stream/chain.hh" -#include "util/stream/io.hh" -#include "util/stream/typed_stream.hh" +#include "../../util/stream/config.hh" +#include "../../util/stream/chain.hh" +#include "../../util/stream/io.hh" +#include "../../util/stream/typed_stream.hh" #define BOOST_TEST_MODULE DerivativeTest #include <boost/test/unit_test.hpp> diff --git a/lm/interpolate/tune_instances.cc b/lm/interpolate/tune_instances.cc index 6f41bd2..240c46f 100644 --- a/lm/interpolate/tune_instances.cc +++ b/lm/interpolate/tune_instances.cc @@ -15,23 +15,23 @@ * (tune_derivatives.hh) takes a stream of extensions ordered by tuning * instance, the word v, and the model the extension came from. */ -#include "lm/interpolate/tune_instances.hh" - -#include "lm/common/compare.hh" -#include "lm/common/joint_order.hh" -#include "lm/common/model_buffer.hh" -#include "lm/common/ngram_stream.hh" -#include "lm/common/renumber.hh" -#include "lm/enumerate_vocab.hh" -#include "lm/interpolate/merge_vocab.hh" -#include "lm/interpolate/universal_vocab.hh" -#include "lm/lm_exception.hh" -#include "util/file_piece.hh" -#include "util/murmur_hash.hh" -#include "util/stream/chain.hh" -#include "util/stream/io.hh" -#include "util/stream/sort.hh" -#include "util/tokenize_piece.hh" +#include "tune_instances.hh" + +#include "../common/compare.hh" +#include "../common/joint_order.hh" +#include "../common/model_buffer.hh" +#include "../common/ngram_stream.hh" +#include "../common/renumber.hh" +#include "../enumerate_vocab.hh" +#include "merge_vocab.hh" +#include "universal_vocab.hh" +#include "../lm_exception.hh" +#include "../../util/file_piece.hh" +#include "../../util/murmur_hash.hh" +#include "../../util/stream/chain.hh" +#include "../../util/stream/io.hh" +#include "../../util/stream/sort.hh" +#include "../../util/tokenize_piece.hh" #include <boost/shared_ptr.hpp> #include <boost/unordered_map.hpp> diff --git a/lm/interpolate/tune_instances.hh b/lm/interpolate/tune_instances.hh index 3ecde6b..7d80327 100644 --- a/lm/interpolate/tune_instances.hh +++ b/lm/interpolate/tune_instances.hh @@ -1,11 +1,11 @@ #ifndef LM_INTERPOLATE_TUNE_INSTANCE_H #define LM_INTERPOLATE_TUNE_INSTANCE_H -#include "lm/interpolate/tune_matrix.hh" -#include "lm/word_index.hh" -#include "util/scoped.hh" -#include "util/stream/config.hh" -#include "util/string_piece.hh" +#include "tune_matrix.hh" +#include "../word_index.hh" +#include "../../util/scoped.hh" +#include "../../util/stream/config.hh" +#include "../../util/string_piece.hh" #include <boost/optional.hpp> diff --git a/lm/interpolate/tune_instances_test.cc b/lm/interpolate/tune_instances_test.cc index 73a4620..8bce84c 100644 --- a/lm/interpolate/tune_instances_test.cc +++ b/lm/interpolate/tune_instances_test.cc @@ -1,11 +1,11 @@ -#include "lm/interpolate/tune_instances.hh" - -#include "util/file.hh" -#include "util/file_stream.hh" -#include "util/stream/chain.hh" -#include "util/stream/config.hh" -#include "util/stream/typed_stream.hh" -#include "util/string_piece.hh" +#include "tune_instances.hh" + +#include "../../util/file.hh" +#include "../../util/file_stream.hh" +#include "../../util/stream/chain.hh" +#include "../../util/stream/config.hh" +#include "../../util/stream/typed_stream.hh" +#include "../../util/string_piece.hh" #define BOOST_TEST_MODULE InstanceTest #include <boost/test/unit_test.hpp> diff --git a/lm/interpolate/tune_weights.cc b/lm/interpolate/tune_weights.cc index 72c93da..0d1667e 100644 --- a/lm/interpolate/tune_weights.cc +++ b/lm/interpolate/tune_weights.cc @@ -1,7 +1,7 @@ -#include "lm/interpolate/tune_weights.hh" +#include "tune_weights.hh" -#include "lm/interpolate/tune_derivatives.hh" -#include "lm/interpolate/tune_instances.hh" +#include "tune_derivatives.hh" +#include "tune_instances.hh" #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wpragmas" // Older gcc doesn't have "-Wunused-local-typedefs" and complains. diff --git a/lm/interpolate/tune_weights.hh b/lm/interpolate/tune_weights.hh index 43e7e1a..3c435ef 100644 --- a/lm/interpolate/tune_weights.hh +++ b/lm/interpolate/tune_weights.hh @@ -1,7 +1,7 @@ #ifndef LM_INTERPOLATE_TUNE_WEIGHTS_H #define LM_INTERPOLATE_TUNE_WEIGHTS_H -#include "util/string_piece.hh" +#include "../../util/string_piece.hh" #include <vector> diff --git a/lm/interpolate/universal_vocab.cc b/lm/interpolate/universal_vocab.cc index 5cdf41e..fcf323f 100644 --- a/lm/interpolate/universal_vocab.cc +++ b/lm/interpolate/universal_vocab.cc @@ -1,4 +1,4 @@ -#include "lm/interpolate/universal_vocab.hh" +#include "universal_vocab.hh" namespace lm { namespace interpolate { diff --git a/lm/interpolate/universal_vocab.hh b/lm/interpolate/universal_vocab.hh index 61af27a..8386fda 100644 --- a/lm/interpolate/universal_vocab.hh +++ b/lm/interpolate/universal_vocab.hh @@ -1,7 +1,7 @@ #ifndef LM_INTERPOLATE_UNIVERSAL_VOCAB_H #define LM_INTERPOLATE_UNIVERSAL_VOCAB_H -#include "lm/word_index.hh" +#include "../word_index.hh" #include <vector> #include <cstddef> diff --git a/lm/kenlm_benchmark_main.cc b/lm/kenlm_benchmark_main.cc index 3b048e3..93196ec 100644 --- a/lm/kenlm_benchmark_main.cc +++ b/lm/kenlm_benchmark_main.cc @@ -1,9 +1,9 @@ -#include "lm/model.hh" -#include "util/file_stream.hh" -#include "util/file.hh" -#include "util/file_piece.hh" -#include "util/usage.hh" -#include "util/thread_pool.hh" +#include "model.hh" +#include "../util/file_stream.hh" +#include "../util/file.hh" +#include "../util/file_piece.hh" +#include "../util/usage.hh" +#include "../util/thread_pool.hh" #include <boost/range/iterator_range.hpp> #include <boost/program_options.hpp> @@ -38,11 +38,11 @@ #ifndef LM_LEFT_H #define LM_LEFT_H -#include "lm/max_order.hh" -#include "lm/state.hh" -#include "lm/return.hh" +#include "max_order.hh" +#include "state.hh" +#include "return.hh" -#include "util/murmur_hash.hh" +#include "../util/murmur_hash.hh" #include <algorithm> diff --git a/lm/left_test.cc b/lm/left_test.cc index fdb6416..6272715 100644 --- a/lm/left_test.cc +++ b/lm/left_test.cc @@ -1,7 +1,7 @@ -#include "lm/left.hh" -#include "lm/model.hh" +#include "left.hh" +#include "model.hh" -#include "util/tokenize_piece.hh" +#include "../util/tokenize_piece.hh" #include <vector> diff --git a/lm/lm_exception.cc b/lm/lm_exception.cc index 58d468f..8a82aa8 100644 --- a/lm/lm_exception.cc +++ b/lm/lm_exception.cc @@ -1,4 +1,4 @@ -#include "lm/lm_exception.hh" +#include "lm_exception.hh" #include <cerrno> #include <cstdio> diff --git a/lm/lm_exception.hh b/lm/lm_exception.hh index 85a5738..0081b05 100644 --- a/lm/lm_exception.hh +++ b/lm/lm_exception.hh @@ -3,8 +3,8 @@ // Named to avoid conflict with util/exception.hh. -#include "util/exception.hh" -#include "util/string_piece.hh" +#include "../util/exception.hh" +#include "../util/string_piece.hh" #include <exception> #include <string> diff --git a/lm/model.cc b/lm/model.cc index a5a16bf..b968edd 100644 --- a/lm/model.cc +++ b/lm/model.cc @@ -1,12 +1,12 @@ -#include "lm/model.hh" - -#include "lm/blank.hh" -#include "lm/lm_exception.hh" -#include "lm/search_hashed.hh" -#include "lm/search_trie.hh" -#include "lm/read_arpa.hh" -#include "util/have.hh" -#include "util/murmur_hash.hh" +#include "model.hh" + +#include "blank.hh" +#include "lm_exception.hh" +#include "search_hashed.hh" +#include "search_trie.hh" +#include "read_arpa.hh" +#include "../util/have.hh" +#include "../util/murmur_hash.hh" #include <algorithm> #include <functional> diff --git a/lm/model.hh b/lm/model.hh index b2bbe39..db43d8b 100644 --- a/lm/model.hh +++ b/lm/model.hh @@ -1,19 +1,19 @@ #ifndef LM_MODEL_H #define LM_MODEL_H -#include "lm/bhiksha.hh" -#include "lm/binary_format.hh" -#include "lm/config.hh" -#include "lm/facade.hh" -#include "lm/quantize.hh" -#include "lm/search_hashed.hh" -#include "lm/search_trie.hh" -#include "lm/state.hh" -#include "lm/value.hh" -#include "lm/vocab.hh" -#include "lm/weights.hh" - -#include "util/murmur_hash.hh" +#include "bhiksha.hh" +#include "binary_format.hh" +#include "config.hh" +#include "facade.hh" +#include "quantize.hh" +#include "search_hashed.hh" +#include "search_trie.hh" +#include "state.hh" +#include "value.hh" +#include "vocab.hh" +#include "weights.hh" + +#include "../util/murmur_hash.hh" #include <algorithm> #include <vector> diff --git a/lm/model_test.cc b/lm/model_test.cc index d408d6f..9eb219d 100644 --- a/lm/model_test.cc +++ b/lm/model_test.cc @@ -1,4 +1,4 @@ -#include "lm/model.hh" +#include "model.hh" #include <cstdlib> #include <cstring> diff --git a/lm/ngram_query.hh b/lm/ngram_query.hh index 4430841..431a67f 100644 --- a/lm/ngram_query.hh +++ b/lm/ngram_query.hh @@ -1,11 +1,11 @@ #ifndef LM_NGRAM_QUERY_H #define LM_NGRAM_QUERY_H -#include "lm/enumerate_vocab.hh" -#include "lm/model.hh" -#include "util/file_stream.hh" -#include "util/file_piece.hh" -#include "util/usage.hh" +#include "enumerate_vocab.hh" +#include "model.hh" +#include "../util/file_stream.hh" +#include "../util/file_piece.hh" +#include "../util/usage.hh" #include <cstdlib> #include <string> diff --git a/lm/partial.hh b/lm/partial.hh index 9e4e352..2fda17b 100644 --- a/lm/partial.hh +++ b/lm/partial.hh @@ -1,8 +1,8 @@ #ifndef LM_PARTIAL_H #define LM_PARTIAL_H -#include "lm/return.hh" -#include "lm/state.hh" +#include "return.hh" +#include "state.hh" #include <algorithm> #include <cassert> diff --git a/lm/partial_test.cc b/lm/partial_test.cc index adb644f..5d06c6d 100644 --- a/lm/partial_test.cc +++ b/lm/partial_test.cc @@ -1,8 +1,8 @@ -#include "lm/partial.hh" +#include "partial.hh" -#include "lm/left.hh" -#include "lm/model.hh" -#include "util/tokenize_piece.hh" +#include "left.hh" +#include "model.hh" +#include "../util/tokenize_piece.hh" #define BOOST_TEST_MODULE PartialTest #include <boost/test/unit_test.hpp> diff --git a/lm/quantize.cc b/lm/quantize.cc index 02b5dbc..75d3ce5 100644 --- a/lm/quantize.cc +++ b/lm/quantize.cc @@ -6,11 +6,11 @@ * tional Linguistics. */ -#include "lm/quantize.hh" +#include "quantize.hh" -#include "lm/binary_format.hh" -#include "lm/lm_exception.hh" -#include "util/file.hh" +#include "binary_format.hh" +#include "lm_exception.hh" +#include "../util/file.hh" #include <algorithm> #include <numeric> diff --git a/lm/quantize.hh b/lm/quantize.hh index 1faac37..2754f5c 100644 --- a/lm/quantize.hh +++ b/lm/quantize.hh @@ -1,11 +1,11 @@ #ifndef LM_QUANTIZE_H #define LM_QUANTIZE_H -#include "lm/blank.hh" -#include "lm/config.hh" -#include "lm/max_order.hh" -#include "lm/model_type.hh" -#include "util/bit_packing.hh" +#include "blank.hh" +#include "config.hh" +#include "max_order.hh" +#include "model_type.hh" +#include "../util/bit_packing.hh" #include <algorithm> #include <vector> diff --git a/lm/query_main.cc b/lm/query_main.cc index d8de84f..4941128 100644 --- a/lm/query_main.cc +++ b/lm/query_main.cc @@ -1,8 +1,8 @@ -#include "lm/ngram_query.hh" -#include "util/getopt.hh" +#include "ngram_query.hh" +#include "../util/getopt.hh" #ifdef WITH_NPLM -#include "lm/wrappers/nplm.hh" +#include "wrappers/nplm.hh" #endif #include <stdlib.h> diff --git a/lm/read_arpa.cc b/lm/read_arpa.cc index 51a3a61..2825cdd 100644 --- a/lm/read_arpa.cc +++ b/lm/read_arpa.cc @@ -1,7 +1,7 @@ -#include "lm/read_arpa.hh" +#include "read_arpa.hh" -#include "lm/blank.hh" -#include "util/file.hh" +#include "blank.hh" +#include "../util/file.hh" #include <cmath> #include <cstdlib> diff --git a/lm/read_arpa.hh b/lm/read_arpa.hh index 64eeef3..84022d9 100644 --- a/lm/read_arpa.hh +++ b/lm/read_arpa.hh @@ -1,10 +1,10 @@ #ifndef LM_READ_ARPA_H #define LM_READ_ARPA_H -#include "lm/lm_exception.hh" -#include "lm/word_index.hh" -#include "lm/weights.hh" -#include "util/file_piece.hh" +#include "lm_exception.hh" +#include "word_index.hh" +#include "weights.hh" +#include "../util/file_piece.hh" #include <cstddef> #include <iosfwd> diff --git a/lm/search_hashed.cc b/lm/search_hashed.cc index 7e63e00..e53bf30 100644 --- a/lm/search_hashed.cc +++ b/lm/search_hashed.cc @@ -1,15 +1,15 @@ -#include "lm/search_hashed.hh" - -#include "lm/binary_format.hh" -#include "lm/blank.hh" -#include "lm/lm_exception.hh" -#include "lm/model.hh" -#include "lm/read_arpa.hh" -#include "lm/value.hh" -#include "lm/vocab.hh" - -#include "util/bit_packing.hh" -#include "util/file_piece.hh" +#include "search_hashed.hh" + +#include "binary_format.hh" +#include "blank.hh" +#include "lm_exception.hh" +#include "model.hh" +#include "read_arpa.hh" +#include "value.hh" +#include "vocab.hh" + +#include "../util/bit_packing.hh" +#include "../util/file_piece.hh" #include <string> diff --git a/lm/search_hashed.hh b/lm/search_hashed.hh index 9dc8445..7877744 100644 --- a/lm/search_hashed.hh +++ b/lm/search_hashed.hh @@ -1,14 +1,14 @@ #ifndef LM_SEARCH_HASHED_H #define LM_SEARCH_HASHED_H -#include "lm/model_type.hh" -#include "lm/config.hh" -#include "lm/read_arpa.hh" -#include "lm/return.hh" -#include "lm/weights.hh" - -#include "util/bit_packing.hh" -#include "util/probing_hash_table.hh" +#include "model_type.hh" +#include "config.hh" +#include "read_arpa.hh" +#include "return.hh" +#include "weights.hh" + +#include "../util/bit_packing.hh" +#include "../util/probing_hash_table.hh" #include <algorithm> #include <iostream> diff --git a/lm/search_trie.cc b/lm/search_trie.cc index 3d3f5d5..d4d28c9 100644 --- a/lm/search_trie.cc +++ b/lm/search_trie.cc @@ -1,22 +1,22 @@ /* This is where the trie is built. It's on-disk. */ -#include "lm/search_trie.hh" - -#include "lm/bhiksha.hh" -#include "lm/binary_format.hh" -#include "lm/blank.hh" -#include "lm/lm_exception.hh" -#include "lm/max_order.hh" -#include "lm/quantize.hh" -#include "lm/trie.hh" -#include "lm/trie_sort.hh" -#include "lm/vocab.hh" -#include "lm/weights.hh" -#include "lm/word_index.hh" -#include "util/ersatz_progress.hh" -#include "util/mmap.hh" -#include "util/proxy_iterator.hh" -#include "util/scoped.hh" -#include "util/sized_iterator.hh" +#include "search_trie.hh" + +#include "bhiksha.hh" +#include "binary_format.hh" +#include "blank.hh" +#include "lm_exception.hh" +#include "max_order.hh" +#include "quantize.hh" +#include "trie.hh" +#include "trie_sort.hh" +#include "vocab.hh" +#include "weights.hh" +#include "word_index.hh" +#include "../util/ersatz_progress.hh" +#include "../util/mmap.hh" +#include "../util/proxy_iterator.hh" +#include "../util/scoped.hh" +#include "../util/sized_iterator.hh" #include <algorithm> #include <cstring> diff --git a/lm/search_trie.hh b/lm/search_trie.hh index 1adba6e..4e44f34 100644 --- a/lm/search_trie.hh +++ b/lm/search_trie.hh @@ -1,14 +1,14 @@ #ifndef LM_SEARCH_TRIE_H #define LM_SEARCH_TRIE_H -#include "lm/config.hh" -#include "lm/model_type.hh" -#include "lm/return.hh" -#include "lm/trie.hh" -#include "lm/weights.hh" - -#include "util/file.hh" -#include "util/file_piece.hh" +#include "config.hh" +#include "model_type.hh" +#include "return.hh" +#include "trie.hh" +#include "weights.hh" + +#include "../util/file.hh" +#include "../util/file_piece.hh" #include <vector> #include <cstdlib> diff --git a/lm/sizes.cc b/lm/sizes.cc index dd831c5..f0f514a 100644 --- a/lm/sizes.cc +++ b/lm/sizes.cc @@ -1,6 +1,6 @@ -#include "lm/sizes.hh" -#include "lm/model.hh" -#include "util/file_piece.hh" +#include "sizes.hh" +#include "model.hh" +#include "../util/file_piece.hh" #include <vector> #include <iomanip> diff --git a/lm/state.hh b/lm/state.hh index 2195dee..249a834 100644 --- a/lm/state.hh +++ b/lm/state.hh @@ -1,9 +1,9 @@ #ifndef LM_STATE_H #define LM_STATE_H -#include "lm/max_order.hh" -#include "lm/word_index.hh" -#include "util/murmur_hash.hh" +#include "max_order.hh" +#include "word_index.hh" +#include "../util/murmur_hash.hh" #include <cstring> @@ -1,9 +1,9 @@ -#include "lm/trie.hh" +#include "trie.hh" -#include "lm/bhiksha.hh" -#include "util/bit_packing.hh" -#include "util/exception.hh" -#include "util/sorted_uniform.hh" +#include "bhiksha.hh" +#include "../util/bit_packing.hh" +#include "../util/exception.hh" +#include "../util/sorted_uniform.hh" #include <cassert> @@ -1,9 +1,9 @@ #ifndef LM_TRIE_H #define LM_TRIE_H -#include "lm/weights.hh" -#include "lm/word_index.hh" -#include "util/bit_packing.hh" +#include "weights.hh" +#include "word_index.hh" +#include "../util/bit_packing.hh" #include <cstddef> diff --git a/lm/trie_sort.cc b/lm/trie_sort.cc index 73728c1..8972bda 100644 --- a/lm/trie_sort.cc +++ b/lm/trie_sort.cc @@ -1,16 +1,16 @@ -#include "lm/trie_sort.hh" - -#include "lm/config.hh" -#include "lm/lm_exception.hh" -#include "lm/read_arpa.hh" -#include "lm/vocab.hh" -#include "lm/weights.hh" -#include "lm/word_index.hh" -#include "util/file_piece.hh" -#include "util/mmap.hh" -#include "util/pool.hh" -#include "util/proxy_iterator.hh" -#include "util/sized_iterator.hh" +#include "trie_sort.hh" + +#include "config.hh" +#include "lm_exception.hh" +#include "read_arpa.hh" +#include "vocab.hh" +#include "weights.hh" +#include "word_index.hh" +#include "../util/file_piece.hh" +#include "../util/mmap.hh" +#include "../util/pool.hh" +#include "../util/proxy_iterator.hh" +#include "../util/sized_iterator.hh" #include <algorithm> #include <cstring> diff --git a/lm/trie_sort.hh b/lm/trie_sort.hh index 594efee..1625643 100644 --- a/lm/trie_sort.hh +++ b/lm/trie_sort.hh @@ -3,11 +3,11 @@ #ifndef LM_TRIE_SORT_H #define LM_TRIE_SORT_H -#include "lm/max_order.hh" -#include "lm/word_index.hh" +#include "max_order.hh" +#include "word_index.hh" -#include "util/file.hh" -#include "util/scoped.hh" +#include "../util/file.hh" +#include "../util/scoped.hh" #include <cstddef> #include <functional> diff --git a/lm/value.hh b/lm/value.hh index d2425cc..6758834 100644 --- a/lm/value.hh +++ b/lm/value.hh @@ -1,11 +1,11 @@ #ifndef LM_VALUE_H #define LM_VALUE_H -#include "lm/config.hh" -#include "lm/model_type.hh" -#include "lm/value_build.hh" -#include "lm/weights.hh" -#include "util/bit_packing.hh" +#include "config.hh" +#include "model_type.hh" +#include "value_build.hh" +#include "weights.hh" +#include "../util/bit_packing.hh" #include <stdint.h> diff --git a/lm/value_build.cc b/lm/value_build.cc index ac623a6..9b06c9e 100644 --- a/lm/value_build.cc +++ b/lm/value_build.cc @@ -1,7 +1,7 @@ -#include "lm/value_build.hh" +#include "value_build.hh" -#include "lm/model.hh" -#include "lm/read_arpa.hh" +#include "model.hh" +#include "read_arpa.hh" namespace lm { namespace ngram { diff --git a/lm/value_build.hh b/lm/value_build.hh index 49989ab..d92578b 100644 --- a/lm/value_build.hh +++ b/lm/value_build.hh @@ -1,9 +1,9 @@ #ifndef LM_VALUE_BUILD_H #define LM_VALUE_BUILD_H -#include "lm/weights.hh" -#include "lm/word_index.hh" -#include "util/bit_packing.hh" +#include "weights.hh" +#include "word_index.hh" +#include "../util/bit_packing.hh" #include <vector> diff --git a/lm/virtual_interface.cc b/lm/virtual_interface.cc index 17a74c3..75ef8d9 100644 --- a/lm/virtual_interface.cc +++ b/lm/virtual_interface.cc @@ -1,6 +1,6 @@ -#include "lm/virtual_interface.hh" +#include "virtual_interface.hh" -#include "lm/lm_exception.hh" +#include "lm_exception.hh" namespace lm { namespace base { diff --git a/lm/virtual_interface.hh b/lm/virtual_interface.hh index ea491fb..8860653 100644 --- a/lm/virtual_interface.hh +++ b/lm/virtual_interface.hh @@ -1,9 +1,9 @@ #ifndef LM_VIRTUAL_INTERFACE_H #define LM_VIRTUAL_INTERFACE_H -#include "lm/return.hh" -#include "lm/word_index.hh" -#include "util/string_piece.hh" +#include "return.hh" +#include "word_index.hh" +#include "../util/string_piece.hh" #include <string> #include <cstring> diff --git a/lm/vocab.cc b/lm/vocab.cc index 7996ec7..93d223a 100644 --- a/lm/vocab.cc +++ b/lm/vocab.cc @@ -1,16 +1,16 @@ -#include "lm/vocab.hh" - -#include "lm/binary_format.hh" -#include "lm/enumerate_vocab.hh" -#include "lm/lm_exception.hh" -#include "lm/config.hh" -#include "lm/weights.hh" -#include "util/exception.hh" -#include "util/file_stream.hh" -#include "util/file.hh" -#include "util/joint_sort.hh" -#include "util/murmur_hash.hh" -#include "util/probing_hash_table.hh" +#include "vocab.hh" + +#include "binary_format.hh" +#include "enumerate_vocab.hh" +#include "lm_exception.hh" +#include "config.hh" +#include "weights.hh" +#include "../util/exception.hh" +#include "../util/file_stream.hh" +#include "../util/file.hh" +#include "../util/joint_sort.hh" +#include "../util/murmur_hash.hh" +#include "../util/probing_hash_table.hh" #include <cstring> #include <string> diff --git a/lm/vocab.hh b/lm/vocab.hh index f36e62c..66eda3a 100644 --- a/lm/vocab.hh +++ b/lm/vocab.hh @@ -1,15 +1,15 @@ #ifndef LM_VOCAB_H #define LM_VOCAB_H -#include "lm/enumerate_vocab.hh" -#include "lm/lm_exception.hh" -#include "lm/virtual_interface.hh" -#include "util/file_stream.hh" -#include "util/murmur_hash.hh" -#include "util/pool.hh" -#include "util/probing_hash_table.hh" -#include "util/sorted_uniform.hh" -#include "util/string_piece.hh" +#include "enumerate_vocab.hh" +#include "lm_exception.hh" +#include "virtual_interface.hh" +#include "../util/file_stream.hh" +#include "../util/murmur_hash.hh" +#include "../util/pool.hh" +#include "../util/probing_hash_table.hh" +#include "../util/sorted_uniform.hh" +#include "../util/string_piece.hh" #include <limits> #include <string> diff --git a/lm/wrappers/nplm.cc b/lm/wrappers/nplm.cc index 9bd7c1e..41ee612 100644 --- a/lm/wrappers/nplm.cc +++ b/lm/wrappers/nplm.cc @@ -1,6 +1,6 @@ -#include "lm/wrappers/nplm.hh" -#include "util/exception.hh" -#include "util/file.hh" +#include "nplm.hh" +#include "../../util/exception.hh" +#include "../../util/file.hh" #include <algorithm> #include <cstring> diff --git a/lm/wrappers/nplm.hh b/lm/wrappers/nplm.hh index 82b38fd..5d3b3c1 100644 --- a/lm/wrappers/nplm.hh +++ b/lm/wrappers/nplm.hh @@ -1,9 +1,9 @@ #ifndef LM_WRAPPERS_NPLM_H #define LM_WRAPPERS_NPLM_H -#include "lm/facade.hh" -#include "lm/max_order.hh" -#include "util/string_piece.hh" +#include "../facade.hh" +#include "../max_order.hh" +#include "../../util/string_piece.hh" #include <boost/thread/tss.hpp> #include <boost/scoped_ptr.hpp> diff --git a/util/bit_packing.cc b/util/bit_packing.cc index cffd9cf..043a801 100644 --- a/util/bit_packing.cc +++ b/util/bit_packing.cc @@ -1,5 +1,5 @@ -#include "util/bit_packing.hh" -#include "util/exception.hh" +#include "bit_packing.hh" +#include "exception.hh" #include <cstring> diff --git a/util/bit_packing_test.cc b/util/bit_packing_test.cc index c4494b6..9ab5616 100644 --- a/util/bit_packing_test.cc +++ b/util/bit_packing_test.cc @@ -1,4 +1,4 @@ -#include "util/bit_packing.hh" +#include "bit_packing.hh" #define BOOST_TEST_MODULE BitPackingTest #include <boost/test/unit_test.hpp> diff --git a/util/cat_compressed_main.cc b/util/cat_compressed_main.cc index 0c7cda9..eb4d23c 100644 --- a/util/cat_compressed_main.cc +++ b/util/cat_compressed_main.cc @@ -1,6 +1,6 @@ // Like cat but interprets compressed files. -#include "util/file.hh" -#include "util/read_compressed.hh" +#include "file.hh" +#include "read_compressed.hh" #include <cstring> #include <iostream> diff --git a/util/ersatz_progress.cc b/util/ersatz_progress.cc index 55c82e7..1d6dbcf 100644 --- a/util/ersatz_progress.cc +++ b/util/ersatz_progress.cc @@ -1,4 +1,4 @@ -#include "util/ersatz_progress.hh" +#include "ersatz_progress.hh" #include <algorithm> #include <ostream> diff --git a/util/exception.cc b/util/exception.cc index 01ff9a6..fa2620b 100644 --- a/util/exception.cc +++ b/util/exception.cc @@ -1,4 +1,4 @@ -#include "util/exception.hh" +#include "exception.hh" #ifdef __GXX_RTTI #include <typeinfo> diff --git a/util/exception.hh b/util/exception.hh index 614a88f..b765ae3 100644 --- a/util/exception.hh +++ b/util/exception.hh @@ -1,7 +1,7 @@ #ifndef UTIL_EXCEPTION_H #define UTIL_EXCEPTION_H -#include "util/string_stream.hh" +#include "string_stream.hh" #include <exception> #include <limits> diff --git a/util/fake_ostream.hh b/util/fake_ostream.hh index 203edf4..0f33654 100644 --- a/util/fake_ostream.hh +++ b/util/fake_ostream.hh @@ -1,9 +1,9 @@ #ifndef UTIL_FAKE_OSTREAM_H #define UTIL_FAKE_OSTREAM_H -#include "util/float_to_string.hh" -#include "util/integer_to_string.hh" -#include "util/string_piece.hh" +#include "float_to_string.hh" +#include "integer_to_string.hh" +#include "string_piece.hh" #include <cassert> #include <limits> diff --git a/util/file.cc b/util/file.cc index 1a70387..ea122ef 100644 --- a/util/file.cc +++ b/util/file.cc @@ -1,9 +1,9 @@ #define _LARGEFILE64_SOURCE #define _FILE_OFFSET_BITS 64 -#include "util/file.hh" +#include "file.hh" -#include "util/exception.hh" +#include "exception.hh" #include <algorithm> #include <cstdlib> diff --git a/util/file.hh b/util/file.hh index 4a50e73..155149d 100644 --- a/util/file.hh +++ b/util/file.hh @@ -1,9 +1,9 @@ #ifndef UTIL_FILE_H #define UTIL_FILE_H -#include "util/exception.hh" -#include "util/scoped.hh" -#include "util/string_piece.hh" +#include "exception.hh" +#include "scoped.hh" +#include "string_piece.hh" #include <cstddef> #include <cstdio> diff --git a/util/file_piece.cc b/util/file_piece.cc index 2428465..45bba9d 100644 --- a/util/file_piece.cc +++ b/util/file_piece.cc @@ -1,9 +1,9 @@ -#include "util/file_piece.hh" +#include "file_piece.hh" -#include "util/double-conversion/double-conversion.h" -#include "util/exception.hh" -#include "util/file.hh" -#include "util/mmap.hh" +#include "double-conversion/double-conversion.h" +#include "exception.hh" +#include "file.hh" +#include "mmap.hh" #if defined(_WIN32) || defined(_WIN64) #include <io.h> diff --git a/util/file_piece.hh b/util/file_piece.hh index fc60dd1..b5b1031 100644 --- a/util/file_piece.hh +++ b/util/file_piece.hh @@ -1,13 +1,13 @@ #ifndef UTIL_FILE_PIECE_H #define UTIL_FILE_PIECE_H -#include "util/ersatz_progress.hh" -#include "util/exception.hh" -#include "util/file.hh" -#include "util/mmap.hh" -#include "util/read_compressed.hh" -#include "util/spaces.hh" -#include "util/string_piece.hh" +#include "ersatz_progress.hh" +#include "exception.hh" +#include "file.hh" +#include "mmap.hh" +#include "read_compressed.hh" +#include "spaces.hh" +#include "string_piece.hh" #include <cstddef> #include <iosfwd> diff --git a/util/file_piece_test.cc b/util/file_piece_test.cc index 952eb59..8fb67c0 100644 --- a/util/file_piece_test.cc +++ b/util/file_piece_test.cc @@ -1,9 +1,9 @@ // Tests might fail if you have creative characters in your path. Sue me. -#include "util/file_piece.hh" +#include "file_piece.hh" -#include "util/file_stream.hh" -#include "util/file.hh" -#include "util/scoped.hh" +#include "file_stream.hh" +#include "file.hh" +#include "scoped.hh" #define BOOST_TEST_MODULE FilePieceTest #include <boost/test/unit_test.hpp> diff --git a/util/file_stream.hh b/util/file_stream.hh index 8b97171..cc23786 100644 --- a/util/file_stream.hh +++ b/util/file_stream.hh @@ -4,9 +4,9 @@ #ifndef UTIL_FILE_STREAM_H #define UTIL_FILE_STREAM_H -#include "util/fake_ostream.hh" -#include "util/file.hh" -#include "util/scoped.hh" +#include "fake_ostream.hh" +#include "file.hh" +#include "scoped.hh" #include <cassert> #include <cstring> diff --git a/util/fixed_array.hh b/util/fixed_array.hh index 3da9d13..bab87f5 100644 --- a/util/fixed_array.hh +++ b/util/fixed_array.hh @@ -1,7 +1,7 @@ #ifndef UTIL_FIXED_ARRAY_H #define UTIL_FIXED_ARRAY_H -#include "util/scoped.hh" +#include "scoped.hh" #include <cstddef> diff --git a/util/float_to_string.cc b/util/float_to_string.cc index 1e16d6f..76f1b8b 100644 --- a/util/float_to_string.cc +++ b/util/float_to_string.cc @@ -1,7 +1,7 @@ -#include "util/float_to_string.hh" +#include "float_to_string.hh" -#include "util/double-conversion/double-conversion.h" -#include "util/double-conversion/utils.h" +#include "double-conversion/double-conversion.h" +#include "double-conversion/utils.h" namespace util { namespace { diff --git a/util/float_to_string.hh b/util/float_to_string.hh index 9305327..c5fe74c 100644 --- a/util/float_to_string.hh +++ b/util/float_to_string.hh @@ -2,7 +2,7 @@ #define UTIL_FLOAT_TO_STRING_H // Just for ToStringBuf -#include "util/integer_to_string.hh" +#include "integer_to_string.hh" namespace util { diff --git a/util/integer_to_string.cc b/util/integer_to_string.cc index 19fd794..4a0d700 100644 --- a/util/integer_to_string.cc +++ b/util/integer_to_string.cc @@ -44,7 +44,7 @@ Which is based on: http://0x80.pl/snippets/asm/sse-utoa.c $Id$ */ -#include "util/integer_to_string.hh" +#include "integer_to_string.hh" #include <cassert> #include <stdint.h> diff --git a/util/integer_to_string_test.cc b/util/integer_to_string_test.cc index 136c88f..973d8e5 100644 --- a/util/integer_to_string_test.cc +++ b/util/integer_to_string_test.cc @@ -1,6 +1,6 @@ #define BOOST_LEXICAL_CAST_ASSUME_C_LOCALE -#include "util/integer_to_string.hh" -#include "util/string_piece.hh" +#include "integer_to_string.hh" +#include "string_piece.hh" #define BOOST_TEST_MODULE IntegerToStringTest #include <boost/test/unit_test.hpp> diff --git a/util/joint_sort.hh b/util/joint_sort.hh index de4b554..f43f862 100644 --- a/util/joint_sort.hh +++ b/util/joint_sort.hh @@ -5,7 +5,7 @@ * also permuting another range the same way. */ -#include "util/proxy_iterator.hh" +#include "proxy_iterator.hh" #include <algorithm> #include <functional> diff --git a/util/joint_sort_test.cc b/util/joint_sort_test.cc index b24c602..2d8574c 100644 --- a/util/joint_sort_test.cc +++ b/util/joint_sort_test.cc @@ -1,4 +1,4 @@ -#include "util/joint_sort.hh" +#include "joint_sort.hh" #define BOOST_TEST_MODULE JointSortTest #include <boost/test/unit_test.hpp> diff --git a/util/mmap.cc b/util/mmap.cc index 35bf382..5171cb6 100644 --- a/util/mmap.cc +++ b/util/mmap.cc @@ -2,11 +2,11 @@ * ARM and MinGW ports contributed by Hideo Okuma and Tomoyuki Yoshimura at * NICT. */ -#include "util/mmap.hh" +#include "mmap.hh" -#include "util/exception.hh" -#include "util/file.hh" -#include "util/scoped.hh" +#include "exception.hh" +#include "file.hh" +#include "scoped.hh" #include <iostream> diff --git a/util/multi_intersection_test.cc b/util/multi_intersection_test.cc index ee5af7d..f1fdb3c 100644 --- a/util/multi_intersection_test.cc +++ b/util/multi_intersection_test.cc @@ -1,4 +1,4 @@ -#include "util/multi_intersection.hh" +#include "multi_intersection.hh" #define BOOST_TEST_MODULE MultiIntersectionTest #include <boost/test/unit_test.hpp> diff --git a/util/murmur_hash.cc b/util/murmur_hash.cc index bf32498..c22507e 100644 --- a/util/murmur_hash.cc +++ b/util/murmur_hash.cc @@ -10,7 +10,7 @@ * ARM port from NICT */ -#include "util/murmur_hash.hh" +#include "murmur_hash.hh" #include <cstring> namespace util { diff --git a/util/parallel_read.cc b/util/parallel_read.cc index 6435eb8..5c6a2ea 100644 --- a/util/parallel_read.cc +++ b/util/parallel_read.cc @@ -1,9 +1,9 @@ -#include "util/parallel_read.hh" +#include "parallel_read.hh" -#include "util/file.hh" +#include "file.hh" #ifdef WITH_THREADS -#include "util/thread_pool.hh" +#include "thread_pool.hh" namespace util { namespace { diff --git a/util/pcqueue.hh b/util/pcqueue.hh index 05c868f..7f2e460 100644 --- a/util/pcqueue.hh +++ b/util/pcqueue.hh @@ -1,7 +1,7 @@ #ifndef UTIL_PCQUEUE_H #define UTIL_PCQUEUE_H -#include "util/exception.hh" +#include "exception.hh" #include <boost/interprocess/sync/interprocess_semaphore.hpp> #include <boost/scoped_array.hpp> diff --git a/util/pcqueue_test.cc b/util/pcqueue_test.cc index 22ed2c6..37b494e 100644 --- a/util/pcqueue_test.cc +++ b/util/pcqueue_test.cc @@ -1,4 +1,4 @@ -#include "util/pcqueue.hh" +#include "pcqueue.hh" #define BOOST_TEST_MODULE PCQueueTest #include <boost/test/unit_test.hpp> diff --git a/util/pool.cc b/util/pool.cc index 246417c..270f021 100644 --- a/util/pool.cc +++ b/util/pool.cc @@ -1,6 +1,6 @@ -#include "util/pool.hh" +#include "pool.hh" -#include "util/scoped.hh" +#include "scoped.hh" #include <cstdlib> diff --git a/util/probing_hash_table.hh b/util/probing_hash_table.hh index 1d45b61..20c67e2 100644 --- a/util/probing_hash_table.hh +++ b/util/probing_hash_table.hh @@ -1,8 +1,8 @@ #ifndef UTIL_PROBING_HASH_TABLE_H #define UTIL_PROBING_HASH_TABLE_H -#include "util/exception.hh" -#include "util/mmap.hh" +#include "exception.hh" +#include "mmap.hh" #include <algorithm> #include <cstddef> diff --git a/util/probing_hash_table_benchmark_main.cc b/util/probing_hash_table_benchmark_main.cc index 5b64e94..def1caf 100644 --- a/util/probing_hash_table_benchmark_main.cc +++ b/util/probing_hash_table_benchmark_main.cc @@ -1,8 +1,8 @@ -#include "util/file.hh" -#include "util/probing_hash_table.hh" -#include "util/mmap.hh" -#include "util/usage.hh" -#include "util/thread_pool.hh" +#include "file.hh" +#include "probing_hash_table.hh" +#include "mmap.hh" +#include "usage.hh" +#include "thread_pool.hh" #include <boost/thread/mutex.hpp> #include <boost/thread/locks.hpp> diff --git a/util/probing_hash_table_test.cc b/util/probing_hash_table_test.cc index 6ed5414..19fd6c9 100644 --- a/util/probing_hash_table_test.cc +++ b/util/probing_hash_table_test.cc @@ -1,7 +1,7 @@ -#include "util/probing_hash_table.hh" +#include "probing_hash_table.hh" -#include "util/murmur_hash.hh" -#include "util/scoped.hh" +#include "murmur_hash.hh" +#include "scoped.hh" #define BOOST_TEST_MODULE ProbingHashTableTest #include <boost/test/unit_test.hpp> diff --git a/util/read_compressed.cc b/util/read_compressed.cc index 1548030..c70f91a 100644 --- a/util/read_compressed.cc +++ b/util/read_compressed.cc @@ -1,8 +1,8 @@ -#include "util/read_compressed.hh" +#include "read_compressed.hh" -#include "util/file.hh" -#include "util/have.hh" -#include "util/scoped.hh" +#include "file.hh" +#include "have.hh" +#include "scoped.hh" #include <algorithm> #include <iostream> diff --git a/util/read_compressed.hh b/util/read_compressed.hh index abc6f04..51d6b07 100644 --- a/util/read_compressed.hh +++ b/util/read_compressed.hh @@ -1,8 +1,8 @@ #ifndef UTIL_READ_COMPRESSED_H #define UTIL_READ_COMPRESSED_H -#include "util/exception.hh" -#include "util/scoped.hh" +#include "exception.hh" +#include "scoped.hh" #include <cstddef> #include <stdint.h> diff --git a/util/read_compressed_test.cc b/util/read_compressed_test.cc index a983ca7..7199ff9 100644 --- a/util/read_compressed_test.cc +++ b/util/read_compressed_test.cc @@ -1,7 +1,7 @@ -#include "util/read_compressed.hh" +#include "read_compressed.hh" -#include "util/file.hh" -#include "util/have.hh" +#include "file.hh" +#include "have.hh" #define BOOST_TEST_MODULE ReadCompressedTest #include <boost/test/unit_test.hpp> diff --git a/util/scoped.cc b/util/scoped.cc index 817aa24..f877b23 100644 --- a/util/scoped.cc +++ b/util/scoped.cc @@ -1,4 +1,4 @@ -#include "util/scoped.hh" +#include "scoped.hh" #include <cstdlib> #if !defined(_WIN32) && !defined(_WIN64) diff --git a/util/scoped.hh b/util/scoped.hh index 23782b6..936015f 100644 --- a/util/scoped.hh +++ b/util/scoped.hh @@ -2,7 +2,7 @@ #define UTIL_SCOPED_H /* Other scoped objects in the style of scoped_ptr. */ -#include "util/exception.hh" +#include "exception.hh" #include <cstddef> #include <cstdlib> diff --git a/util/sized_iterator.hh b/util/sized_iterator.hh index e9fd7bf..8946322 100644 --- a/util/sized_iterator.hh +++ b/util/sized_iterator.hh @@ -1,8 +1,8 @@ #ifndef UTIL_SIZED_ITERATOR_H #define UTIL_SIZED_ITERATOR_H -#include "util/pool.hh" -#include "util/proxy_iterator.hh" +#include "pool.hh" +#include "proxy_iterator.hh" #include <algorithm> #include <functional> diff --git a/util/sized_iterator_test.cc b/util/sized_iterator_test.cc index 4db015d..45125d9 100644 --- a/util/sized_iterator_test.cc +++ b/util/sized_iterator_test.cc @@ -1,4 +1,4 @@ -#include "util/sized_iterator.hh" +#include "sized_iterator.hh" #define BOOST_TEST_MODULE SizedIteratorTest #include <boost/test/unit_test.hpp> diff --git a/util/sorted_uniform_test.cc b/util/sorted_uniform_test.cc index 39f05e5..a501dc4 100644 --- a/util/sorted_uniform_test.cc +++ b/util/sorted_uniform_test.cc @@ -1,4 +1,4 @@ -#include "util/sorted_uniform.hh" +#include "sorted_uniform.hh" #include <boost/random/mersenne_twister.hpp> #include <boost/random/uniform_int.hpp> diff --git a/util/spaces.cc b/util/spaces.cc index 7bc25bf..18eee90 100644 --- a/util/spaces.cc +++ b/util/spaces.cc @@ -1,4 +1,4 @@ -#include "util/spaces.hh" +#include "spaces.hh" namespace util { diff --git a/util/stream/chain.cc b/util/stream/chain.cc index 7d859cb..7c46819 100644 --- a/util/stream/chain.cc +++ b/util/stream/chain.cc @@ -1,9 +1,9 @@ -#include "util/stream/chain.hh" +#include "chain.hh" -#include "util/stream/io.hh" +#include "io.hh" -#include "util/exception.hh" -#include "util/pcqueue.hh" +#include "../exception.hh" +#include "../pcqueue.hh" #include <cstdlib> #include <new> diff --git a/util/stream/chain.hh b/util/stream/chain.hh index 5e3b4b9..5b231d3 100644 --- a/util/stream/chain.hh +++ b/util/stream/chain.hh @@ -1,10 +1,10 @@ #ifndef UTIL_STREAM_CHAIN_H #define UTIL_STREAM_CHAIN_H -#include "util/stream/block.hh" -#include "util/stream/config.hh" -#include "util/stream/multi_progress.hh" -#include "util/scoped.hh" +#include "block.hh" +#include "config.hh" +#include "multi_progress.hh" +#include "../scoped.hh" #include <boost/ptr_container/ptr_vector.hpp> #include <boost/thread/thread.hpp> diff --git a/util/stream/count_records.cc b/util/stream/count_records.cc index bdadad7..e6938f2 100644 --- a/util/stream/count_records.cc +++ b/util/stream/count_records.cc @@ -1,5 +1,5 @@ -#include "util/stream/count_records.hh" -#include "util/stream/chain.hh" +#include "count_records.hh" +#include "chain.hh" namespace util { namespace stream { diff --git a/util/stream/io.cc b/util/stream/io.cc index 53b3bab..1d771f5 100644 --- a/util/stream/io.cc +++ b/util/stream/io.cc @@ -1,7 +1,7 @@ -#include "util/stream/io.hh" +#include "io.hh" -#include "util/file.hh" -#include "util/stream/chain.hh" +#include "../file.hh" +#include "chain.hh" #include <cstddef> diff --git a/util/stream/io.hh b/util/stream/io.hh index d29b37c..bfbfacc 100644 --- a/util/stream/io.hh +++ b/util/stream/io.hh @@ -1,8 +1,8 @@ #ifndef UTIL_STREAM_IO_H #define UTIL_STREAM_IO_H -#include "util/exception.hh" -#include "util/file.hh" +#include "../exception.hh" +#include "../file.hh" namespace util { namespace stream { diff --git a/util/stream/io_test.cc b/util/stream/io_test.cc index 8210833..3d92a8d 100644 --- a/util/stream/io_test.cc +++ b/util/stream/io_test.cc @@ -1,7 +1,7 @@ -#include "util/stream/io.hh" +#include "io.hh" -#include "util/stream/chain.hh" -#include "util/file.hh" +#include "chain.hh" +#include "../file.hh" #define BOOST_TEST_MODULE IOTest #include <boost/test/unit_test.hpp> diff --git a/util/stream/line_input.cc b/util/stream/line_input.cc index 0ad8800..21775ab 100644 --- a/util/stream/line_input.cc +++ b/util/stream/line_input.cc @@ -1,9 +1,9 @@ -#include "util/stream/line_input.hh" +#include "line_input.hh" -#include "util/exception.hh" -#include "util/file.hh" -#include "util/read_compressed.hh" -#include "util/stream/chain.hh" +#include "../exception.hh" +#include "../file.hh" +#include "../read_compressed.hh" +#include "chain.hh" #include <algorithm> #include <vector> diff --git a/util/stream/multi_progress.cc b/util/stream/multi_progress.cc index 59750f5..5d2e477 100644 --- a/util/stream/multi_progress.cc +++ b/util/stream/multi_progress.cc @@ -1,7 +1,7 @@ -#include "util/stream/multi_progress.hh" +#include "multi_progress.hh" // TODO: merge some functionality with the simple progress bar? -#include "util/ersatz_progress.hh" +#include "../ersatz_progress.hh" #include <iostream> #include <limits> diff --git a/util/stream/multi_stream.hh b/util/stream/multi_stream.hh index 6381fc2..d860e14 100644 --- a/util/stream/multi_stream.hh +++ b/util/stream/multi_stream.hh @@ -1,10 +1,10 @@ #ifndef UTIL_STREAM_MULTI_STREAM_H #define UTIL_STREAM_MULTI_STREAM_H -#include "util/fixed_array.hh" -#include "util/scoped.hh" -#include "util/stream/chain.hh" -#include "util/stream/stream.hh" +#include "../fixed_array.hh" +#include "../scoped.hh" +#include "chain.hh" +#include "stream.hh" #include <cstddef> #include <new> diff --git a/util/stream/rewindable_stream.cc b/util/stream/rewindable_stream.cc index 726e2a7..811c626 100644 --- a/util/stream/rewindable_stream.cc +++ b/util/stream/rewindable_stream.cc @@ -1,5 +1,5 @@ -#include "util/stream/rewindable_stream.hh" -#include "util/pcqueue.hh" +#include "rewindable_stream.hh" +#include "../pcqueue.hh" #include <iostream> diff --git a/util/stream/rewindable_stream.hh b/util/stream/rewindable_stream.hh index 560825c..6a29758 100644 --- a/util/stream/rewindable_stream.hh +++ b/util/stream/rewindable_stream.hh @@ -1,7 +1,7 @@ #ifndef UTIL_STREAM_REWINDABLE_STREAM_H #define UTIL_STREAM_REWINDABLE_STREAM_H -#include "util/stream/chain.hh" +#include "chain.hh" #include <boost/noncopyable.hpp> diff --git a/util/stream/rewindable_stream_test.cc b/util/stream/rewindable_stream_test.cc index f8924c3..ece1db5 100644 --- a/util/stream/rewindable_stream_test.cc +++ b/util/stream/rewindable_stream_test.cc @@ -1,7 +1,7 @@ -#include "util/stream/io.hh" +#include "io.hh" -#include "util/stream/rewindable_stream.hh" -#include "util/file.hh" +#include "rewindable_stream.hh" +#include "../file.hh" #define BOOST_TEST_MODULE RewindableStreamTest #include <boost/test/unit_test.hpp> diff --git a/util/stream/sort.hh b/util/stream/sort.hh index 17b3839..c029676 100644 --- a/util/stream/sort.hh +++ b/util/stream/sort.hh @@ -18,15 +18,15 @@ #ifndef UTIL_STREAM_SORT_H #define UTIL_STREAM_SORT_H -#include "util/stream/chain.hh" -#include "util/stream/config.hh" -#include "util/stream/io.hh" -#include "util/stream/stream.hh" - -#include "util/file.hh" -#include "util/fixed_array.hh" -#include "util/scoped.hh" -#include "util/sized_iterator.hh" +#include "chain.hh" +#include "config.hh" +#include "io.hh" +#include "stream.hh" + +#include "../file.hh" +#include "../fixed_array.hh" +#include "../scoped.hh" +#include "../sized_iterator.hh" #include <algorithm> #include <iostream> diff --git a/util/stream/sort_test.cc b/util/stream/sort_test.cc index fc97ffd..a945cb0 100644 --- a/util/stream/sort_test.cc +++ b/util/stream/sort_test.cc @@ -1,4 +1,4 @@ -#include "util/stream/sort.hh" +#include "sort.hh" #define BOOST_TEST_MODULE SortTest #include <boost/test/unit_test.hpp> diff --git a/util/stream/stream.hh b/util/stream/stream.hh index ee1e9fa..9f14ef2 100644 --- a/util/stream/stream.hh +++ b/util/stream/stream.hh @@ -1,7 +1,7 @@ #ifndef UTIL_STREAM_STREAM_H #define UTIL_STREAM_STREAM_H -#include "util/stream/chain.hh" +#include "chain.hh" #include <boost/noncopyable.hpp> diff --git a/util/stream/stream_test.cc b/util/stream/stream_test.cc index 6575d50..07eb3fe 100644 --- a/util/stream/stream_test.cc +++ b/util/stream/stream_test.cc @@ -1,7 +1,7 @@ -#include "util/stream/io.hh" +#include "io.hh" -#include "util/stream/stream.hh" -#include "util/file.hh" +#include "stream.hh" +#include "../file.hh" #define BOOST_TEST_MODULE StreamTest #include <boost/test/unit_test.hpp> diff --git a/util/stream/typed_stream.hh b/util/stream/typed_stream.hh index 2da5b76..3f59bca 100644 --- a/util/stream/typed_stream.hh +++ b/util/stream/typed_stream.hh @@ -2,7 +2,7 @@ #define UTIL_STREAM_TYPED_STREAM_H // A typed wrapper to Stream for POD types. -#include "util/stream/stream.hh" +#include "stream.hh" namespace util { namespace stream { diff --git a/util/string_piece.cc b/util/string_piece.cc index 180b4e4..1f58929 100644 --- a/util/string_piece.cc +++ b/util/string_piece.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in string_piece.hh. -#include "util/string_piece.hh" +#include "string_piece.hh" #include <algorithm> #include <climits> diff --git a/util/string_piece.hh b/util/string_piece.hh index 9c47982..372c209 100644 --- a/util/string_piece.hh +++ b/util/string_piece.hh @@ -48,7 +48,7 @@ #ifndef UTIL_STRING_PIECE_H #define UTIL_STRING_PIECE_H -#include "util/have.hh" +#include "have.hh" #include <cstring> #include <iosfwd> diff --git a/util/string_piece_hash.hh b/util/string_piece_hash.hh index 6ff6f88..2da5456 100644 --- a/util/string_piece_hash.hh +++ b/util/string_piece_hash.hh @@ -1,8 +1,8 @@ #ifndef UTIL_STRING_PIECE_HASH_H #define UTIL_STRING_PIECE_HASH_H -#include "util/have.hh" -#include "util/string_piece.hh" +#include "have.hh" +#include "string_piece.hh" #include <boost/functional/hash.hpp> #include <boost/version.hpp> diff --git a/util/string_stream.hh b/util/string_stream.hh index 28fdd42..1bdf7ac 100644 --- a/util/string_stream.hh +++ b/util/string_stream.hh @@ -1,7 +1,7 @@ #ifndef UTIL_STRING_STREAM_H #define UTIL_STRING_STREAM_H -#include "util/fake_ostream.hh" +#include "fake_ostream.hh" #include <cassert> #include <string> diff --git a/util/string_stream_test.cc b/util/string_stream_test.cc index ad99655..8be25d7 100644 --- a/util/string_stream_test.cc +++ b/util/string_stream_test.cc @@ -1,7 +1,7 @@ #define BOOST_LEXICAL_CAST_ASSUME_C_LOCALE #define BOOST_TEST_MODULE FakeOStreamTest -#include "util/string_stream.hh" +#include "string_stream.hh" #include <boost/test/unit_test.hpp> #include <boost/lexical_cast.hpp> diff --git a/util/thread_pool.hh b/util/thread_pool.hh index 082fbf8..00731b8 100644 --- a/util/thread_pool.hh +++ b/util/thread_pool.hh @@ -1,7 +1,7 @@ #ifndef UTIL_THREAD_POOL_H #define UTIL_THREAD_POOL_H -#include "util/pcqueue.hh" +#include "pcqueue.hh" #include <boost/ptr_container/ptr_vector.hpp> #include <boost/optional.hpp> diff --git a/util/tokenize_piece.hh b/util/tokenize_piece.hh index 7064336..704d84d 100644 --- a/util/tokenize_piece.hh +++ b/util/tokenize_piece.hh @@ -1,9 +1,9 @@ #ifndef UTIL_TOKENIZE_PIECE_H #define UTIL_TOKENIZE_PIECE_H -#include "util/exception.hh" -#include "util/spaces.hh" -#include "util/string_piece.hh" +#include "exception.hh" +#include "spaces.hh" +#include "string_piece.hh" #include <algorithm> #include <cstring> diff --git a/util/tokenize_piece_test.cc b/util/tokenize_piece_test.cc index d856018..38aa31c 100644 --- a/util/tokenize_piece_test.cc +++ b/util/tokenize_piece_test.cc @@ -1,5 +1,5 @@ -#include "util/tokenize_piece.hh" -#include "util/string_piece.hh" +#include "tokenize_piece.hh" +#include "string_piece.hh" #define BOOST_TEST_MODULE TokenIteratorTest #include <boost/test/unit_test.hpp> diff --git a/util/usage.cc b/util/usage.cc index fdb5cda..ccc6285 100644 --- a/util/usage.cc +++ b/util/usage.cc @@ -1,6 +1,6 @@ -#include "util/usage.hh" +#include "usage.hh" -#include "util/exception.hh" +#include "exception.hh" #include <fstream> #include <ostream> |