diff --git a/Dockerfile b/Dockerfile index c999744dc96d6b0b2fb5b437eb89d824aa6a6125..672c41e05eda0c524997538b2cce74612c332907 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,65 +1,23 @@ -FROM clarinpl/builder AS builder - -WORKDIR /tmp - -RUN apt-get update && apt-get install -y libmysql++-dev - - - -#Poliqarp update for supermatrix -RUN git clone https://gitlab.clarin-pl.eu/analysers/corpus2.git && \ - cd corpus2 && \ - mkdir bin && \ - cd bin && \ - cmake -D CORPUS2_BUILD_POLIQARP:BOOL=True .. && \ - make -j && \ - make install DESTDIR="/install" && \ - ldconfig - -RUN apt-get install -y liblog4cxx-dev - -## Supermatrix -RUN git clone https://gitlab.clarin-pl.eu/libraries/supermatrix && \ - mkdir supermatrix/build && \ - cd supermatrix/build && \ - cmake -DCMAKE_BUILD_TYPE=Release .. && \ - make -j6 && \ - make install DESTDIR="/install" && \ - ldconfig - - - - - - - FROM clarinpl/python:2.7 -# STYLO -RUN apt-get update && apt-get install -y r-base +RUN apt-get update && apt-get install -y \ + libmysql++-dev \ + libboost-regex-dev \ + libboost-filesystem-dev \ + libopenmpi-dev \ + libboost-program-options-dev \ + supermatrix \ + r-base \ + liblog4cxx-dev + RUN R -e "install.packages('rjson',dependencies=TRUE, repos='http://cran.rstudio.com/')" && \ R -e "install.packages('versions',dependencies=TRUE, repos='http://cran.rstudio.com/')" && \ R -e "library('versions'); install.versions('stylo','0.6.4')" - -#python -RUN git clone http://nlp.pwr.wroc.pl/lexcsd.git -RUN cd lexcsd && \ - ./install.sh - COPY requirements.txt . RUN pip install -r requirements.txt - - -#Supermatrix dependencis -COPY --from=builder /install/usr/ /usr/ -COPY --from=builder /tmp/supermatrix/build /home/supermatrix -RUN cp /home/supermatrix/parallel/mpi_handler/*.so /usr/lib/ && \ - ldconfig - -RUN apt-get install -y libboost-filesystem-dev liblog4cxx-dev libboost-regex-dev libmysql++-dev libopenmpi-dev libboost-program-options-dev - + COPY module/ /home/worker/ WORKDIR /home/worker -CMD ["python2", "featfilt_worker.py"] +CMD ["python", "featfilt_worker.py"] diff --git a/config.ini b/config.ini index 7eddf767f8886e987e94e33ac8b59619c49f8ade..0356b4ef7f68c524a0a5e55f0705f6fde8abafe0 100644 --- a/config.ini +++ b/config.ini @@ -2,15 +2,15 @@ tool = featfilt2 root = /samba/requests/ -rabbit_host = rabbit.clarin.ws -rabbit_user = clarin -rabbit_password = clarin123 +rabbit_host = rabbitmq +rabbit_user = test +rabbit_password = test [tool] -workers_number = 6 -SM_WEIGHTER_BIN = /home/supermatrix/tools/matrix_weighter/weighter -SM_SIMILARITY_BIN = /home/supermatrix/parallel/similarity/parallelSimilarity -SM_CLUTOCONV_BIN = /home/supermatrix/tools/ClutoConv/ClutoConv +workers_number = 1 +SM_WEIGHTER_BIN = /opt/supermatrix/weighter +SM_SIMILARITY_BIN = /opt/supermatrix/parallelSimilarity +SM_CLUTOCONV_BIN = /opt/supermatrix/ClutoConv STYLO_PATH = twstylo.r [logging] diff --git a/requirements.txt b/requirements.txt index 47dd7d098856b61e50028a30cf63d23e73680821..5b3693f518abcf0f100e5e09703d858b3923007e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,12 @@ -nlp-ws +nlp-ws==0.6 numpy==1.14.3 scikit-learn==0.19.0 scipy==0.19.1 -sqlalchemy +sqlalchemy==1.3.23 rpy2==2.7.2 -gensim \ No newline at end of file +gensim==3.8.3 +ltcore==0.2.0 +ltlearn==0.1.0 +ltcluster==0.1.0 +wsdkb==0.1.0 +lexcsd==0.2.0