Permalink
Browse files

Dir structure (#4)

change directory structure into a more common one
  • Loading branch information...
hendrikmuhs committed Nov 5, 2017
1 parent c6135ac commit 2a8fe0da408bbc32fd12d774b51f4df90d04f833
Showing with 40 additions and 41 deletions.
  1. +7 −7 CMakeLists.txt
  2. +1 −1 README.md
  3. +4 −4 doc/usage/Crashcourse.md
  4. 0 keyvi/{src/cpp → bin}/keyvicompiler/keyvicompiler.cpp
  5. 0 keyvi/{src/cpp → bin}/keyviinspector/keyviinspector.cpp
  6. 0 keyvi/{src/cpp → bin}/keyvimerger/keyvimerger.cpp
  7. 0 keyvi/{src/cpp → include/keyvi}/compression/compression_selector.h
  8. 0 keyvi/{src/cpp → include/keyvi}/compression/compression_strategy.h
  9. 0 keyvi/{src/cpp → include/keyvi}/compression/fsa_predictive_compression.h
  10. 0 keyvi/{src/cpp → include/keyvi}/compression/predictive_compression.h
  11. 0 keyvi/{src/cpp → include/keyvi}/compression/snappy_compression_strategy.h
  12. 0 keyvi/{src/cpp → include/keyvi}/compression/zlib_compression_strategy.h
  13. 0 keyvi/{src/cpp → include/keyvi}/dictionary/compilation/compilation_utils.h
  14. 0 keyvi/{src/cpp → include/keyvi}/dictionary/completion/forward_backward_completion.h
  15. 0 keyvi/{src/cpp → include/keyvi}/dictionary/completion/multiword_completion.h
  16. 0 keyvi/{src/cpp → include/keyvi}/dictionary/completion/prefix_completion.h
  17. 0 keyvi/{src/cpp → include/keyvi}/dictionary/dictionary.h
  18. 0 keyvi/{src/cpp → include/keyvi}/dictionary/dictionary_compiler.h
  19. 0 keyvi/{src/cpp → include/keyvi}/dictionary/dictionary_loader.h
  20. 0 keyvi/{src/cpp → include/keyvi}/dictionary/dictionary_merger.h
  21. 0 keyvi/{src/cpp → include/keyvi}/dictionary/dictionary_merger_fwd.h
  22. 0 keyvi/{src/cpp → include/keyvi}/dictionary/dictionary_types.h
  23. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/automata.h
  24. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/bounded_weighted_state_traverser.h
  25. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/codepoint_state_traverser.h
  26. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/entry_iterator.h
  27. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/generator.h
  28. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/generator_adapter.h
  29. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/bit_vector.h
  30. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/bit_vector_64.h
  31. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/constants.h
  32. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/int_inner_weights_value_store.h
  33. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/int_value_store.h
  34. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/intrinsics.h
  35. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/ivalue_store.h
  36. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/json_value_store.h
  37. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/lru_generation_cache.h
  38. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/memory_map_flags.h
  39. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/memory_map_manager.h
  40. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/minimization_hash.h
  41. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/null_value_store.h
  42. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/packed_state.h
  43. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/serialization_utils.h
  44. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/sliding_window_bit_vector_position_tracker.h
  45. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/sparse_array_builder.h
  46. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/sparse_array_persistence.h
  47. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/string_value_store.h
  48. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/unpacked_state.h
  49. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/unpacked_state_stack.h
  50. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/value_store_factory.h
  51. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/internal/value_store_persistence.h
  52. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/state_traverser.h
  53. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/traversal/bounded_weighted_traversal.h
  54. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/traversal/near_traversal.h
  55. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/traversal/traversal_base.h
  56. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/traversal/weighted_traversal.h
  57. 0 keyvi/{src/cpp → include/keyvi}/dictionary/fsa/traverser_types.h
  58. 0 keyvi/{src/cpp → include/keyvi}/dictionary/keyvi_file.h
  59. 0 keyvi/{src/cpp → include/keyvi}/dictionary/match.h
  60. 0 keyvi/{src/cpp → include/keyvi}/dictionary/match_iterator.h
  61. 0 keyvi/{src/cpp → include/keyvi}/dictionary/sort/in_memory_sorter.h
  62. 0 keyvi/{src/cpp → include/keyvi}/dictionary/sort/sorter_common.h
  63. 0 keyvi/{src/cpp → include/keyvi}/dictionary/sort/tpie_sorter.h
  64. 0 keyvi/{src/cpp → include/keyvi}/dictionary/testing/temp_dictionary.h
  65. 0 keyvi/{src/cpp → include/keyvi}/dictionary/util/bounded_priority_queue.h
  66. 0 keyvi/{src/cpp → include/keyvi}/dictionary/util/configuration.h
  67. 0 keyvi/{src/cpp → include/keyvi}/dictionary/util/endian.h
  68. 0 keyvi/{src/cpp → include/keyvi}/dictionary/util/iterator_utils.h
  69. 0 keyvi/{src/cpp → include/keyvi}/dictionary/util/json_value.h
  70. 0 keyvi/{src/cpp → include/keyvi}/dictionary/util/jump_consistent_hash.h
  71. 0 keyvi/{src/cpp → include/keyvi}/dictionary/util/msgpack_util.h
  72. 0 keyvi/{src/cpp → include/keyvi}/dictionary/util/single_producer_consumer_ringbuffer.h
  73. 0 keyvi/{src/cpp → include/keyvi}/dictionary/util/tpie_initializer.h
  74. 0 keyvi/{src/cpp → include/keyvi}/dictionary/util/trace.h
  75. 0 keyvi/{src/cpp → include/keyvi}/dictionary/util/transform.h
  76. 0 keyvi/{src/cpp → include/keyvi}/dictionary/util/utf8_utils.h
  77. 0 keyvi/{src/cpp → include/keyvi}/dictionary/util/vint.h
  78. 0 keyvi/{src/cpp → include/keyvi}/stringdistance/costfunctions/damerau_levenshtein.h
  79. 0 keyvi/{src/cpp → include/keyvi}/stringdistance/distance_matrix.h
  80. 0 keyvi/{src/cpp → include/keyvi}/stringdistance/levenshtein.h
  81. 0 keyvi/{src/cpp → include/keyvi}/stringdistance/needleman_wunsch.h
  82. 0 keyvi/{src/cpp → include/keyvi}/transform/fsa_transform.h
  83. 0 keyvi/tests/{cpp → keyvi}/compression/fsa_predictive_compression_test.cpp
  84. 0 keyvi/tests/{cpp → keyvi}/dictionary/completion/prefix_completion_test.cpp
  85. 0 keyvi/tests/{cpp → keyvi}/dictionary/dictionary_compiler_test.cpp
  86. 0 keyvi/tests/{cpp → keyvi}/dictionary/dictionary_merger_test.cpp
  87. 0 keyvi/tests/{cpp → keyvi}/dictionary/dictionary_test.cpp
  88. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/automata_test.cpp
  89. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/codepoint_state_traverser_test.cpp
  90. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/entry_iterator_test.cpp
  91. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/generator_test.cpp
  92. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/internal/bit_vector_test.cpp
  93. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/internal/json_value_store_test.cpp
  94. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/internal/lru_generation_cache_test.cpp
  95. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/internal/memory_map_flags_test.cpp
  96. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/internal/memory_map_manager_test.cpp
  97. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/internal/minimization_hash_test.cpp
  98. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/internal/packed_state_test.cpp
  99. 0 ...i/tests/{cpp → keyvi}/dictionary/fsa/internal/sliding_window_bit_vector_position_tracker_test.cpp
  100. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/internal/sparse_array_builder_test.cpp
  101. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/internal/sparse_array_persistence_test.cpp
  102. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/internal/string_value_store_test.cpp
  103. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/internal/unpacked_state_stack_test.cpp
  104. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/internal/unpacked_state_test.cpp
  105. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/state_traverser_test.cpp
  106. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/traversal/near_traversal_test.cpp
  107. 0 keyvi/tests/{cpp → keyvi}/dictionary/fsa/weighted_state_traverser_test.cpp
  108. 0 keyvi/tests/{cpp → keyvi}/dictionary/util/bounded_priority_queue_test.cpp
  109. 0 keyvi/tests/{cpp → keyvi}/dictionary/util/configuration_test.cpp
  110. 0 keyvi/tests/{cpp → keyvi}/dictionary/util/json_value_test.cpp
  111. 0 keyvi/tests/{cpp → keyvi}/dictionary/util/jump_consistent_hash_test.cpp
  112. 0 keyvi/tests/{cpp → keyvi}/dictionary/util/md5_test.cpp
  113. 0 keyvi/tests/{cpp → keyvi}/dictionary/util/single_producer_consumer_ringbuffer_test.cpp
  114. 0 keyvi/tests/{cpp → keyvi}/dictionary/util/transform_test.cpp
  115. 0 keyvi/tests/{cpp → keyvi}/dictionary/util/vint_test.cpp
  116. 0 keyvi/tests/{cpp → keyvi}/stringdistance/levenshtein_test.cpp
  117. 0 keyvi/tests/{cpp → keyvi}/stringdistance/needleman_wunsch_test.cpp
  118. 0 keyvi/tests/{cpp → keyvi}/transform/fsa_transform_test.cpp
  119. 0 keyvi/tests/{cpp → keyvi}/unit_tests_all.cpp
  120. +3 −3 packaging/debian/rules
  121. 0 {pykeyvi → python}/.gitignore
  122. 0 {pykeyvi → python}/LICENSE.txt
  123. +1 −1 {pykeyvi → python}/MANIFEST.in
  124. 0 {pykeyvi → python}/README.md
  125. 0 {pykeyvi → python}/autowrap_includes/autowrap_tools.hpp
  126. 0 {pykeyvi → python}/bin/keyvi
  127. 0 {pykeyvi → python}/examples/completion/completion-nw.tsv
  128. 0 {pykeyvi → python}/examples/completion/completion.tsv
  129. 0 {pykeyvi → python}/examples/completion/multiword_completion_tester.py
  130. 0 {pykeyvi → python}/examples/completion/multiword_completion_writer.py
  131. 0 {pykeyvi → python}/examples/completion/prefix_completion_fuzzy_tester.py
  132. 0 {pykeyvi → python}/examples/completion/prefix_completion_tester.py
  133. 0 {pykeyvi → python}/examples/lookup/cities.tsv
  134. 0 {pykeyvi → python}/examples/lookup/compile_json.py
  135. 0 {pykeyvi → python}/examples/lookup/text_lookup_tester.py
  136. 0 {pykeyvi → python}/examples/lookup/value_lookup_tester.py
  137. 0 {pykeyvi → python}/examples/normalization/normalization.tsv
  138. 0 {pykeyvi → python}/examples/normalization/normalize.py
  139. 0 {pykeyvi → python}/examples/normalization/sample.txt
  140. 0 {pykeyvi → python}/integration-tests/dictionary/dictionary_leak_test.py
  141. 0 {pykeyvi → python}/ipython-pykeyvi-mac.sh
  142. 0 {pykeyvi → python}/ipython-pykeyvi.sh
  143. 0 {pykeyvi → python}/keyvicli/__init__.py
  144. 0 {pykeyvi → python}/keyvicli/cli.py
  145. 0 {pykeyvi → python}/requirements.txt
  146. 0 {pykeyvi → python}/scripts/compile_json.py
  147. 0 {pykeyvi → python}/setup.cfg
  148. +1 −1 {pykeyvi → python}/setup.py
  149. 0 {pykeyvi → python}/src/addons/CompletionDictionaryCompiler.pyx
  150. 0 {pykeyvi → python}/src/addons/CompletionDictionaryMerger.pyx
  151. 0 {pykeyvi → python}/src/addons/Dictionary.pyx
  152. 0 {pykeyvi → python}/src/addons/IntDictionaryCompiler.pyx
  153. 0 {pykeyvi → python}/src/addons/IntDictionaryMerger.pyx
  154. 0 {pykeyvi → python}/src/addons/JsonDictionaryCompiler.pyx
  155. 0 {pykeyvi → python}/src/addons/JsonDictionaryCompilerSmallData.pyx
  156. 0 {pykeyvi → python}/src/addons/JsonDictionaryMerger.pyx
  157. 0 {pykeyvi → python}/src/addons/KeyOnlyDictionaryCompiler.pyx
  158. 0 {pykeyvi → python}/src/addons/KeyOnlyDictionaryMerger.pyx
  159. 0 {pykeyvi → python}/src/addons/Match.pyx
  160. 0 {pykeyvi → python}/src/addons/StringDictionaryCompiler.pyx
  161. 0 {pykeyvi → python}/src/addons/StringDictionaryMerger.pyx
  162. 0 {pykeyvi → python}/src/addons/autwrap_workarounds.pyx
  163. 0 {pykeyvi → python}/src/addons/match_iterator.pyx
  164. 0 {pykeyvi → python}/src/converters/__init__.py
  165. 0 {pykeyvi → python}/src/converters/pykeyvi_autowrap_conversion_providers.py
  166. +2 −2 {pykeyvi → python}/src/extra/attributes_converter.h
  167. 0 {pykeyvi → python}/src/pxds/cluster.pxd
  168. 0 {pykeyvi → python}/src/pxds/dictionary.pxd
  169. 0 {pykeyvi → python}/src/pxds/dictionary_compiler.pxd
  170. 0 {pykeyvi → python}/src/pxds/dictionary_merger.pxd
  171. 0 {pykeyvi → python}/src/pxds/forward_backward_completion.pxd
  172. 0 {pykeyvi → python}/src/pxds/generator.pxd
  173. 0 {pykeyvi → python}/src/pxds/match.pxd
  174. 0 {pykeyvi → python}/src/pxds/match_iterator.pxd
  175. 0 {pykeyvi → python}/src/pxds/multi_word_completion.pxd
  176. 0 {pykeyvi → python}/src/pxds/normalization.pxd
  177. 0 {pykeyvi → python}/src/pxds/predictive_compression.pxd
  178. 0 {pykeyvi → python}/src/pxds/prefix_completion.pxd
  179. 0 {pykeyvi → python}/src/pxds/std_smart_ptr.pxd
  180. 0 {pykeyvi → python}/tests/completion/multiword_completion_test.py
  181. 0 {pykeyvi → python}/tests/dictionary/dictionary_merger_test.py
  182. 0 {pykeyvi → python}/tests/dictionary/int_dictionary_merger_test.py
  183. 0 {pykeyvi → python}/tests/dictionary/iterators_test.py
  184. 0 {pykeyvi → python}/tests/dictionary/key_only_dictionary_merger_test.py
  185. 0 {pykeyvi → python}/tests/dictionary/loading_test.py
  186. 0 {pykeyvi → python}/tests/dictionary/near_test.py
  187. 0 {pykeyvi → python}/tests/dictionary/string_dictionary_merger_test.py
  188. 0 {pykeyvi → python}/tests/dictionary/unicode_test.py
  189. 0 {pykeyvi → python}/tests/dictionary/zerobyte_test.py
  190. 0 {pykeyvi → python}/tests/dictionary_compiler_test.py
  191. 0 {pykeyvi → python}/tests/int/int_dictionary_test.py
  192. 0 {pykeyvi → python}/tests/json/json_dictionary_test.py
  193. 0 {pykeyvi → python}/tests/match_object_test.py
  194. 0 {pykeyvi → python}/tests/statistics_test.py
  195. 0 {pykeyvi → python}/tests/test_tools.py
  196. +2 −2 travis/build_linux.sh
  197. +2 −2 travis/build_manylinux_package.sh
  198. +1 −1 travis/build_manylinux_wheels.sh
  199. +2 −2 travis/build_osx_package.sh
  200. +1 −1 travis/build_sdist_package.sh
  201. +11 −12 travis/coverage.sh
  202. +1 −1 travis/setup_pyenv.sh
  203. +1 −1 travis/upload_packages.sh
@@ -36,7 +36,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
endif ()
include_directories(keyvi/src/cpp)
include_directories(keyvi/include/keyvi)
include_directories(keyvi/3rdparty/tpie)
include_directories(keyvi/3rdparty/utf8)
include_directories(keyvi/3rdparty/misc)
@@ -46,14 +46,14 @@ include_directories(keyvi/3rdparty/xchange/src)
include_directories(${CMAKE_BINARY_DIR}/keyvi/3rdparty/tpie)
FILE(GLOB_RECURSE UNIT_TEST_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} keyvi/tests/cpp/*.cpp)
FILE(GLOB_RECURSE UNIT_TEST_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} keyvi/tests/keyvi/*.cpp)
add_executable(keyvicompiler keyvi/src/cpp/keyvicompiler/keyvicompiler.cpp)
add_executable(keyviinspector keyvi/src/cpp/keyviinspector/keyviinspector.cpp)
add_executable(keyvimerger keyvi/src/cpp/keyvimerger/keyvimerger.cpp)
add_executable(units_test_all ${UNIT_TEST_SOURCES})
add_executable(keyvicompiler keyvi/bin/keyvicompiler/keyvicompiler.cpp)
add_executable(keyviinspector keyvi/bin/keyviinspector/keyviinspector.cpp)
add_executable(keyvimerger keyvi/bin/keyvimerger/keyvimerger.cpp)
add_executable(unit_test_all ${UNIT_TEST_SOURCES})
target_link_libraries(keyvicompiler tpie ${Boost_LIBRARIES} ${ZLIB_LIBRARIES})
target_link_libraries(keyviinspector tpie ${Boost_LIBRARIES} ${ZLIB_LIBRARIES})
target_link_libraries(keyvimerger tpie ${Boost_LIBRARIES} ${ZLIB_LIBRARIES})
target_link_libraries(units_test_all tpie ${Boost_LIBRARIES} ${ZLIB_LIBRARIES})
target_link_libraries(unit_test_all tpie ${Boost_LIBRARIES} ${ZLIB_LIBRARIES})
@@ -30,7 +30,7 @@ Precompiled binary wheels are available for OS X and Linux on [PyPi](https://pyp
The core part is a C++ header-only library, but the TPIE 3rdparty library needs to be compiled once. The commandline
tools are also part of the C++ code. For instructions check the [Readme](/keyvi/README.md) file.
For the python extension of keyvi check the [Readme](/pykeyvi/README.md) file in the pykeyvi subfolder.
For the python extension of keyvi check the [Readme](/python/README.md) file in the python subfolder.
## Usage
@@ -98,7 +98,7 @@ Similarly with python, on the `keyvi.Dictionary` object `d` the call `d.GetStati
### Lookup and Extraction
Go to [lookup examples](/pykeyvi/examples/lookup)
Go to [lookup examples](/python/examples/lookup)
Compile cities.tsv and run the tester:
@@ -109,7 +109,7 @@ Try queries like: "Fahrradwerkstatt München", "Berlin Alexanderplatz", "San Fra
#### Build your own index
Try pykeyvi/scripts/compile_json.py and compile your own JSON. The format should be:
Try python/scripts/compile_json.py and compile your own JSON. The format should be:
key {"city": "Munich", "state": "Germany"}
@@ -133,7 +133,7 @@ With sharding (for distributed data indexes):
### Completion
Go to [completion examples](/pykeyvi/examples/completion)
Go to [completion examples](/python/examples/completion)
#### Prefix completion
@@ -185,7 +185,7 @@ Check questions:
### Normalization
Go to [normalization examples](/pykeyvi/examples/normalization)
Go to [normalization examples](/python/examples/normalization)
Compile with:
@@ -9,16 +9,16 @@ DEB_DESTDIR=$(PWD)/debian/tmp
override_dh_auto_build:
cd keyvi && $(SCONS) mode=release
cd pykeyvi && python setup.py build
cd python && python setup.py build
override_dh_auto_clean:
dh_auto_clean
cd keyvi && $(SCONS) mode=release -c && rm -f .sconsign.dblite
cd pykeyvi && rm -rf build && rm -rf keyvi.egg-info
cd python && rm -rf build && rm -rf keyvi.egg-info
rm -rf $(DEB_DESTDIR)
rm -f debian/*.substvars
rm -f debian/files
rm -f debian/*.debhelper*
override_dh_auto_install:
cd keyvi && $(SCONS) mode=release install --prefix=$(DEB_DESTDIR)/usr
cd pykeyvi && python setup.py install --install-layout=deb --root $(DEB_DESTDIR)
cd python && python setup.py install --install-layout=deb --root $(DEB_DESTDIR)
File renamed without changes.
File renamed without changes.
@@ -2,7 +2,7 @@ recursive-include autowrap_includes *.hpp
graft src
include keyvi.cpp
recursive-include keyvi/src/cpp *.h
recursive-include keyvi/include/keyvi *.h
recursive-include keyvi/3rdparty *.h
recursive-include keyvi/3rdparty *.inl
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -210,7 +210,7 @@ def run(self):
ext_modules = [Extension('keyvi',
include_dirs=[autowrap_data_dir,
tpie_include_dir,
path.join(dictionary_sources, 'src/cpp'),
path.join(dictionary_sources, 'include/keyvi'),
path.join(dictionary_sources, '3rdparty/rapidjson/include'),
path.join(dictionary_sources, '3rdparty/msgpack-c/include'),
path.join(dictionary_sources, '3rdparty/utf8'),
@@ -12,7 +12,7 @@
#include <boost/variant.hpp>
namespace keyvi {
namespace pykeyvitionary {
namespace python {
class attributes_visitor : public boost::static_visitor<PyObject*>
{
@@ -33,7 +33,7 @@ inline PyObject* Convert (dictionary::Match& m, const std::string& key) {
return boost::apply_visitor( attributes_visitor(), result );
}
} /* namespace pykeyvitionary */
} /* namespace python */
} /* namespace keyvi */
#endif /* ATTRIBUTES_CONVERTER_H_ */
File renamed without changes.
File renamed without changes.
@@ -5,9 +5,9 @@ mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=$CONF ..
make -j 4
./units_test_all
./unit_test_all
cd ../pykeyvi
cd ../python
python setup.py build --mode $CONF
python setup.py install --user
py.test tests
@@ -3,5 +3,5 @@ set -ev
docker run -e "PYTHON_VERSION=$PYTHON_VERSION" --rm -v `pwd`:/keyvi $DOCKER_IMAGE /keyvi/travis/build_manylinux_wheels.sh
pip install pykeyvi/wheelhouse/keyvi*.whl
py.test pykeyvi/tests/
pip install python/wheelhouse/keyvi*.whl
py.test python/tests/
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -ev
cd /keyvi/pykeyvi/
cd /keyvi/python/
case "${PYTHON_VERSION}" in
27)
@@ -5,7 +5,7 @@ mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=release ..
make -j 4
./units_test_all
./unit_test_all
cd ..
# use python from pyenv
@@ -14,7 +14,7 @@ PATH="$PYENV_ROOT/bin:$PYENV_ROOT/shims:$PATH"
export TMPDIR=/Volumes/ram-disk
cd pykeyvi
cd python
python setup.py bdist_wheel -d wheelhouse
sudo -H pip install wheelhouse/*.whl
py.test tests
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -ev
cd pykeyvi
cd python
python setup.py sdist -d wheelhouse
pip uninstall -y autowrap
@@ -3,29 +3,28 @@ set -ev
coveralls -r . -b build/ -i keyvi \
--gcov /usr/bin/gcov-4.8 --gcov-options '\-lp' \
-e build/keyvi/3rdparty -e keyvi/3rdparty -e pykeyvi \
-E '.*/tests/*.cpp' \
-E '.*/src/cpp/keyvicompiler/keyvicompiler.cpp' \
-E '.*/src/cpp/keyviinspector/keyviinspector.cpp' \
-E '.*/src/cpp/keyvimerger/keyvimerger.cpp' \
-E '.*/keyvi/3rdparty/.*' \
-e python \
-E '.*/keyvi/tests/.*' \
-E '.*/keyvi/bin/.*' \
--dump keyvi.cov_report > /dev/null
# workaround for coverage measurement: symlink keyvi
cd pykeyvi/
cd python/
ln -s ../keyvi keyvi
cd ..
coveralls -r . -b pykeyvi/ -i pykeyvi \
coveralls -r . -b python/ -i python \
--gcov /usr/bin/gcov-4.8 --gcov-options '\-lp' \
-e pykeyvi/keyvi/3rdparty -e build \
-e python/keyvi/3rdparty -e build \
-E '.*/autowrap_includes/autowrap_tools.hpp' \
-E '.*/src/extra/attributes_converter.h' \
-E '.*/keyvi.cpp' \
--dump pykeyvi.cov_report_tmp > /dev/null
--dump python.cov_report_tmp > /dev/null
# workaround: remove 'pykeyvi' from source path before merge
sed s/"pykeyvi\/keyvi"/"keyvi"/g pykeyvi.cov_report_tmp > pykeyvi.cov_report
# workaround: remove 'python' from source path before merge
sed s/"python\/keyvi"/"keyvi"/g python.cov_report_tmp > python.cov_report
export COVERALLS_REPO_TOKEN=${COVERALLS_REPO_TOKEN}
coveralls-merge keyvi.cov_report pykeyvi.cov_report
coveralls-merge keyvi.cov_report python.cov_report
@@ -53,5 +53,5 @@ python -c "import distutils.util; print(distutils.util.get_platform())"
# install other python deps
pip install --upgrade pip
pip install --user -r pykeyvi/requirements.txt
pip install --user -r python/requirements.txt
if [ "$CC" = "gcc" ] && [ "$CONF" = "coverage" ]; then pip install coveralls-merge cpp-coveralls ; fi
@@ -5,7 +5,7 @@ set -ev
PYENV_ROOT="$HOME/.pyenv"
PATH="$PYENV_ROOT/bin:$PYENV_ROOT/shims:$PATH"
cd pykeyvi
cd python
if [ -n "$(ls -A wheelhouse)" ]; then
twine upload --config-file ../travis/pypirc -u $PYPI_USERNAME -p $PYPI_PASSWORD wheelhouse/*
fi

0 comments on commit 2a8fe0d

Please sign in to comment.