Skip to content

Commit acaf2e7

Browse files
committed
Fix submodules path in all files
1 parent 5da9f25 commit acaf2e7

File tree

7 files changed

+41
-41
lines changed

7 files changed

+41
-41
lines changed

Diff for: .github/workflows/build-and-test.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ jobs:
5454
- name: Install additional python requirements
5555
run: |
5656
pip3 install .[all]
57-
pip3 install ./bicleaner
58-
pip3 install ./bicleaner-ai
59-
pip3 install ./kenlm --install-option="--max_order 7"
60-
pip3 install ./bifixer
61-
pip3 install ./biroamer
57+
pip3 install ./third_party/bicleaner
58+
pip3 install ./third_party/bicleaner-ai
59+
pip3 install ./third_party/kenlm --install-option="--max_order 7"
60+
pip3 install ./third_party/bifixer
61+
pip3 install ./third_party/biroamer
6262
python3 -c "from flair.models import SequenceTagger; SequenceTagger.load('flair/ner-english-fast')"
63-
pip3 install ./neural-document-aligner
64-
pip3 install ./vecalign
63+
pip3 install ./third_party/neural-document-aligner
64+
pip3 install ./third_party/vecalign
6565
- name: Setup golang
6666
uses: actions/setup-go@v2
6767
with:

Diff for: .github/workflows/deferred.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ jobs:
5454
- name: Install additional python requirements
5555
run: |
5656
pip3 install .[all]
57-
pip3 install ./bifixer
58-
pip3 install ./bicleaner
59-
pip3 install ./kenlm --install-option="--max_order 7"
60-
pip3 install ./biroamer
57+
pip3 install ./third_party/bifixer
58+
pip3 install ./third_party/bicleaner
59+
pip3 install ./third_party/kenlm --install-option="--max_order 7"
60+
pip3 install ./third_party/biroamer
6161
python3 -c "from flair.models import SequenceTagger; SequenceTagger.load('flair/ner-english-fast')"
62-
pip3 install -r deferred-crawling/requirements.txt
62+
pip3 install -r ./third_party/deferred-crawling/requirements.txt
6363
- name: Setup golang
6464
uses: actions/setup-go@v2
6565
with:

Diff for: CMakeLists.txt

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD 11)
44

55
project(bitextor)
66

7-
set(PREPROCESS_PATH "${PROJECT_SOURCE_DIR}/preprocess")
7+
set(PREPROCESS_PATH "${PROJECT_SOURCE_DIR}/third_party/preprocess")
88
set(SKIP_PREPROCESS_BUILD ON) # avoid compiling preprocess a million times
99
set(CMAKE_BUILD_TYPE "Release")
1010
include(GNUInstallDirs)
@@ -15,26 +15,26 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
1515
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
1616

1717
if(NOT SKIP_PREPROCESS)
18-
add_subdirectory(${PROJECT_SOURCE_DIR}/preprocess preprocess)
18+
add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/preprocess preprocess)
1919
install(TARGETS b64filter cache docenc foldfilter mmhsum
2020
DESTINATION ${CMAKE_INSTALL_BINDIR}
2121
)
2222
endif()
2323

2424
if(NOT SKIP_WARC2TEXT)
25-
add_subdirectory(${PROJECT_SOURCE_DIR}/warc2text warc2text)
25+
add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/warc2text warc2text)
2626
endif()
2727

2828
if(NOT SKIP_PREVERTICAL2TEXT)
29-
add_subdirectory(${PROJECT_SOURCE_DIR}/prevertical2text prevertical2text)
29+
add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/prevertical2text prevertical2text)
3030
endif()
3131

3232
if(NOT SKIP_BLEUALIGN)
33-
add_subdirectory(${PROJECT_SOURCE_DIR}/bleualign-cpp bleualign-cpp)
33+
add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/bleualign-cpp bleualign-cpp)
3434
endif()
3535

3636
if (NOT SKIP_HUNALIGN)
37-
add_subdirectory(${PROJECT_SOURCE_DIR}/hunalign/src)
37+
add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/hunalign/src)
3838
install(PROGRAMS ${PROJECT_BINARY_DIR}/bin/hunalign
3939
DESTINATION ${CMAKE_INSTALL_BINDIR}
4040
)
@@ -46,14 +46,14 @@ if (NOT SKIP_DOCALIGN)
4646
endif()
4747

4848
if (NOT SKIP_BIROAMER)
49-
add_subdirectory(${PROJECT_SOURCE_DIR}/biroamer fast_align)
49+
add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/biroamer fast_align)
5050
endif()
5151

5252
if (NOT SKIP_MGIZA)
53-
add_subdirectory(${PROJECT_SOURCE_DIR}/mgiza/mgizapp mgizapp)
53+
add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/mgiza/mgizapp mgizapp)
5454
endif()
5555

5656
if (NOT SKIP_KENLM)
5757
set(KENLM_MAX_ORDER 7)
58-
add_subdirectory(${PROJECT_SOURCE_DIR}/kenlm kenlm)
58+
add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/kenlm kenlm)
5959
endif()

Diff for: Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@ RUN pip3 install --upgrade pip
8383
## bitextor
8484
RUN pip3 install .[all]
8585
## bicleaner
86-
RUN pip3 install ./bicleaner
87-
RUN pip3 install ./bicleaner-ai
88-
RUN pip3 install ./kenlm --install-option="--max_order=7"
86+
RUN pip3 install ./third_party/bicleaner
87+
RUN pip3 install ./third_party/bicleaner-ai
88+
RUN pip3 install ./third_party/kenlm --install-option="--max_order=7"
8989
## bifixer
90-
RUN pip3 install ./bifixer
90+
RUN pip3 install ./third_party/bifixer
9191
## biroamer
92-
RUN pip3 install ./biroamer
92+
RUN pip3 install ./third_party/biroamer
9393
RUN python3 -c "from flair.models import SequenceTagger; SequenceTagger.load('flair/ner-english-fast')"
9494
## cld3
9595
RUN pip3 install Cython

Diff for: conda-build/build.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ $PYTHON -m pip install .[all]
2727
### FastSpell (bicleaner-hardrules)
2828
INCLUDE_PATH="$PREFIX/include" $PYTHON -m pip install hunspell
2929
### Bicleaner, Bicleaner AI and KenLM
30-
$PYTHON -m pip install ./bicleaner
31-
$PYTHON -m pip install ./bicleaner-ai
32-
$PYTHON -m pip install ./kenlm --install-option="--max_order 7"
30+
$PYTHON -m pip install ./third_party/bicleaner
31+
$PYTHON -m pip install ./third_party/bicleaner-ai
32+
$PYTHON -m pip install ./third_party/kenlm --install-option="--max_order 7"
3333
### Bifixer
34-
$PYTHON -m pip install ./bifixer
34+
$PYTHON -m pip install ./third_party/bifixer
3535
### Biroamer and model
36-
$PYTHON -m pip install ./biroamer && \
36+
$PYTHON -m pip install ./third_party/biroamer && \
3737
$PYTHON -c "from flair.models import SequenceTagger; SequenceTagger.load('flair/ner-english-fast')"
3838
### Neural Document Aligner
39-
$PYTHON -m pip install ./neural-document-aligner
40-
$PYTHON -m pip install ./vecalign
39+
$PYTHON -m pip install ./third_party/neural-document-aligner
40+
$PYTHON -m pip install ./third_party/vecalign
4141
## CLD3
4242
$PYTHON -m pip install Cython
4343
$PYTHON -m pip install pycld3

Diff for: docs/INSTALL.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,15 @@ pip3 install --upgrade pip
169169
# bitextor (mandatory dependencies):
170170
pip3 install .
171171
# additional dependencies:
172-
pip3 install ./bifixer
173-
pip3 install ./bicleaner
174-
pip3 install ./bicleaner-ai
175-
pip3 install ./kenlm --install-option="--max_order 7" # Bicleaner and Bicleaner AI dependency
176-
pip3 install ./biroamer && \
172+
pip3 install ./third_party/bifixer
173+
pip3 install ./third_party/bicleaner
174+
pip3 install ./third_party/bicleaner-ai
175+
pip3 install ./third_party/kenlm --install-option="--max_order 7" # Bicleaner and Bicleaner AI dependency
176+
pip3 install ./third_party/biroamer && \
177177
python3 -c "from flair.models import SequenceTagger; SequenceTagger.load('flair/ner-english-fast')"
178178
## neural
179-
pip3 install ./neural-document-aligner
180-
pip3 install ./vecalign
179+
pip3 install ./third_party/neural-document-aligner
180+
pip3 install ./third_party/vecalign
181181
```
182182

183183
If you don't want to install all Python requirements in `requirements.txt` because you don't expect to run some of Bitextor modules, you can comment those `*.txt` in `requirements.txt` and rerun Bitextor installation. Also, there are different optional packages that you can choose depending on your needs instead of install all of them:

Diff for: setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def get_extras_require():
5252
opt_requirements = get_extras_require()
5353

5454
# Copy necessary files so they will be available when the package is built
55-
copytree("preprocess/moses", os.path.join(wd, "bitextor/data/moses"))
55+
copytree("third_party/preprocess/moses", os.path.join(wd, "bitextor/data/moses"))
5656

5757
setuptools.setup(
5858
name="bitextor",

0 commit comments

Comments
 (0)