diff --git a/ci/batch/docker/Dockerfile b/ci/batch/docker/Dockerfile index 8403bc5f47..8cc64125b5 100644 --- a/ci/batch/docker/Dockerfile +++ b/ci/batch/docker/Dockerfile @@ -24,5 +24,4 @@ FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu18.04 ENV PATH /opt/conda/bin:$PATH RUN git clone https://github.com/dmlc/gluon-nlp WORKDIR gluon-nlp - RUN /bin/bash -c 'CONDA_ENVS_PATH=$PWD/conda CONDA_PKGS_DIRS=$PWD/conda/pkgs conda init bash && source /root/.bashrc && conda env update --prune -p conda/gpu/py3 -f env/gpu/py3.yml && source activate ./conda/gpu/py3 && pip install -v -e . && pip install awscli && python -m spacy download en && python -m spacy download de && python -m nltk.downloader all' ADD gluon_nlp_job.sh . diff --git a/env/cpu/py3-master.yml b/env/cpu/py3-master.yml index 4f2baf61a6..8564276c07 100644 --- a/env/cpu/py3-master.yml +++ b/env/cpu/py3-master.yml @@ -19,7 +19,7 @@ dependencies: - scipy=1.3.1 - pip: - pylint-quotes==0.2.1 - - mxnet-mkl>=1.6.0b20191006 + - mxnet-cu100>=1.6.0b20191027 - sacremoses - sentencepiece<0.2 - sphinx-autodoc-typehints==1.7.0 diff --git a/env/docker/py3.yml b/env/docker/py3.yml index bc32afc9e3..6f9edf93c0 100644 --- a/env/docker/py3.yml +++ b/env/docker/py3.yml @@ -30,7 +30,7 @@ dependencies: - scikit-learn=0.21.3 - pip: - pylint-quotes<0.2 - - mxnet-cu101mkl>=1.6.0b20191006 + - mxnet-cu100>=1.6.0b20191027 - sacremoses - sentencepiece<0.2 - https://github.com/szha/mx-theme/tarball/master diff --git a/env/gpu/py3-master.yml b/env/gpu/py3-master.yml index a060e89526..336b86af41 100644 --- a/env/gpu/py3-master.yml +++ b/env/gpu/py3-master.yml @@ -29,7 +29,7 @@ dependencies: - scipy=1.3.1 - pip: - pylint-quotes<0.2 - - mxnet-cu101mkl>=1.6.0b20191006 + - mxnet-cu100>=1.6.0b20191027 - sacremoses - sentencepiece<0.2 - https://github.com/szha/mx-theme/tarball/master diff --git a/scripts/parsing/parser/biaffine_parser.py b/scripts/parsing/parser/biaffine_parser.py index 3ff99431ee..5c9dfdd5ed 100644 --- a/scripts/parsing/parser/biaffine_parser.py +++ b/scripts/parsing/parser/biaffine_parser.py @@ -322,7 +322,7 @@ def flatten_numpy(arr): return arc_accuracy, rel_accuracy, overall_accuracy, outputs return outputs - def save_parameters(self, filename): + def save_parameters(self, filename): # pylint: disable=arguments-differ """Save model Parameters diff --git a/src/gluonnlp/model/train/cache.py b/src/gluonnlp/model/train/cache.py index 22db651628..f1fea9a9c1 100644 --- a/src/gluonnlp/model/train/cache.py +++ b/src/gluonnlp/model/train/cache.py @@ -69,15 +69,19 @@ def __init__(self, lm_model, vocab_size, window, theta, lambdas, **kwargs): with self.name_scope(): self.lm_model = lm_model - def save_parameters(self, filename): + def save_parameters(self, filename, deduplicate=False): """Save parameters to file. filename : str Path to file. + deduplicate : bool, default False + If True, save shared parameters only once. Otherwise, if a Block + contains multiple sub-blocks that share parameters, each of the + shared parameters will be separately saved for every sub-block. """ - self.lm_model.save_parameters(filename) + self.lm_model.save_parameters(filename, deduplicate=deduplicate) - def load_parameters(self, filename, ctx=mx.cpu()): # pylint: disable=arguments-differ + def load_parameters(self, filename, ctx=mx.cpu()): # pylint: disable=arguments-differ """Load parameters from file. filename : str