diff options
| -rw-r--r-- | scripts/python/example.py | 17 | ||||
| -rw-r--r-- | scripts/python/mariannmt_server.py | 53 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/python/CMakeLists.txt | 42 | ||||
| -rw-r--r-- | src/python/mariannmt.cpp | 44 |
5 files changed, 0 insertions, 160 deletions
diff --git a/scripts/python/example.py b/scripts/python/example.py deleted file mode 100644 index c0a70720..00000000 --- a/scripts/python/example.py +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env python - -import os -import sys - -sys.path.insert(0, os.path.abspath(os.path.dirname(__file__) + "../../build")) -import libmariannmt as nmt - -print >>sys.stderr, "marian-nmt version: ", nmt.version() - -if len(sys.argv) == 1: - print >>sys.stderr, "Specify s2s arguments" - exit(1) - -nmt.init(' '.join(sys.argv)) -for line in sys.stdin: - print nmt.translate([line.rstrip()]) diff --git a/scripts/python/mariannmt_server.py b/scripts/python/mariannmt_server.py deleted file mode 100644 index 9f9d2a53..00000000 --- a/scripts/python/mariannmt_server.py +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -import sys -import os -import argparse - -sys.path.insert(0, os.path.abspath(os.path.dirname(__file__) + "./../build")) -import libmariannmt as nmt - -from bottle import request, Bottle, abort - -app = Bottle() - - -@app.route('/translate') -def handle_websocket(): - wsock = request.environ.get('wsgi.websocket') - if not wsock: - abort(400, 'Expected WebSocket request.') - - while True: - try: - message = wsock.receive() - if message is not None: - # force potential unicode to str() for boost conversion - listSentences = str(message).split('\n') - numEle = len(listSentences) - if numEle > 0 and listSentences[numEle - 1] == "": - del listSentences[numEle - 1] - trans = nmt.translate(listSentences) - wsock.send('\n'.join(trans)) - except WebSocketError: - break - - -def parse_args(): - parser = argparse.ArgumentParser() - parser.add_argument("-c", dest="config") - parser.add_argument('-p', dest="port", default=8080, type=int) - return parser.parse_args() - - -if __name__ == "__main__": - args = parse_args() - nmt.init("-c {}".format(args.config)) - - from gevent.pywsgi import WSGIServer - from geventwebsocket import WebSocketError - from geventwebsocket.handler import WebSocketHandler - server = WSGIServer( - ("0.0.0.0", args.port), app, handler_class=WebSocketHandler) - server.serve_forever() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fc8cc8b3..6eb15383 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -146,10 +146,6 @@ endforeach(exec) #set_target_properties(align2steps PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}") -if(PYTHONLIBS_FOUND) -# add_subdirectory(python) -endif(PYTHONLIBS_FOUND) - if(COMPILE_TESTS) set(CATCH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party) add_library(Catch INTERFACE) diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt deleted file mode 100644 index 9d54c01a..00000000 --- a/src/python/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -cuda_add_library(pymarian SHARED - mariannmt.cpp - ../3rd_party/cnpy/cnpy.cpp - ../3rd_party/exception.cpp - ../3rd_party/svd/svd.cpp - ../graph/expression_graph.cpp - ../graph/expression_operators.cu - ../graph/node.cu - ../graph/node_operators.cu - ../tensors/tensor.cu - ../tensors/device.cpp - ../kernels/tensor_operators.cu - ../tensors/gpu/dropout.cu - ../tensors/cpu/dropout.cpp - ../kernels/sparse.cu - #../layers/param_initializers.cu - ../rnn/attention.cu - ../rnn/cells.cu - #../optimizers/clippers.cu - #../optimizers/optimizers.cu - ../common/utils.cpp - ../common/logging.cpp - ../common/config.cpp - ../common/config_parser.cpp - ../translator/history.cpp - ../translator/output_collector.cpp - ../translator/nth_element.cu - ../translator/helpers.cu - ../data/vocab.cpp - ../data/corpus.cpp - ../data/text_input.cpp - #../rescorer/score_collector.cpp - $<TARGET_OBJECTS:libyaml-cpp> -) - -set_target_properties(pymarian PROPERTIES EXCLUDE_FROM_ALL 1) -set_target_properties(pymarian PROPERTIES OUTPUT_NAME mariannmt) -set_target_properties(pymarian PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}") -set_target_properties(pymarian PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}") - -target_link_libraries(pymarian ${EXT_LIBS} marian) -cuda_add_cublas_to_target(pymarian) diff --git a/src/python/mariannmt.cpp b/src/python/mariannmt.cpp deleted file mode 100644 index d5bdd161..00000000 --- a/src/python/mariannmt.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include <cstdlib> -#include <iostream> -#include <string> - -#include <boost/python.hpp> - -#include "common/utils.h" -#include "common/version.h" -#include "translator/beam_search.h" -#include "translator/translator.h" - -using namespace marian; - -Ptr<TranslateServiceMultiGPU<BeamSearch>> task; - -void init(const std::string& argopts) { - auto options = New<Config>(argopts, ConfigMode::translating); - task = New<TranslateServiceMultiGPU<BeamSearch>>(options); - LOG(info, "Translator initialized"); -} - -boost::python::list translate(boost::python::list& pyinput) { - std::vector<std::string> input; - for(int i = 0; i < boost::python::len(pyinput); ++i) { - input.emplace_back( - boost::python::extract<std::string>(boost::python::object(pyinput[i]))); - } - - auto output = task->run(input); - - boost::python::list pyoutput; - pyoutput.append(Join(output, "\n")); - return pyoutput; -} - -std::string version() { - return PROJECT_VERSION; -} - -BOOST_PYTHON_MODULE(libmariannmt) { - boost::python::def("init", init); - boost::python::def("translate", translate); - boost::python::def("version", version); -} |