diff --git a/examples/text_summarization/abstractive_summarization_unilm_cnndm.ipynb b/examples/text_summarization/abstractive_summarization_unilm_cnndm.ipynb index 428d578..334cf90 100644 --- a/examples/text_summarization/abstractive_summarization_unilm_cnndm.ipynb +++ b/examples/text_summarization/abstractive_summarization_unilm_cnndm.ipynb @@ -32,22 +32,6 @@ "QUICK_RUN = True" ] }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Manually install the s2s-ft package from the [UniLM repo](https://github.com/microsoft/unilm) by running the following commands in your bash shell. \n", - "(We are working on making the s2s-ft package available on PyPI and this step will not be necessary in the future. )\n", - "\n", - "```\n", - "conda activate nlp_gpu\n", - "git clone https://github.com/microsoft/unilm.git\n", - "git checkout 7f931fcfb965bf60f0fbe2ddd37798f356e6ee5e\n", - "cd unilm/s2s-ft\n", - "pip install -e .\n", - "```" - ] - }, { "cell_type": "markdown", "metadata": {}, diff --git a/tests/integration/test_notebooks_unilm_abstractive_summarization.py b/tests/integration/test_notebooks_unilm_abstractive_summarization.py index 5e68058..8e84029 100644 --- a/tests/integration/test_notebooks_unilm_abstractive_summarization.py +++ b/tests/integration/test_notebooks_unilm_abstractive_summarization.py @@ -11,10 +11,6 @@ ABS_TOL = 0.02 @pytest.mark.gpu @pytest.mark.integration -@pytest.mark.skip( - reason="s2s-ft not available on PYPI and can not be included in " - "generate_conda_file.py" -) def test_unilm_abstractive_summarization(notebooks, tmp): notebook_path = notebooks["unilm_abstractive_summarization"] pm.execute_notebook( diff --git a/tools/generate_conda_file.py b/tools/generate_conda_file.py index 14f0ed2..fc2ef8e 100644 --- a/tools/generate_conda_file.py +++ b/tools/generate_conda_file.py @@ -96,6 +96,8 @@ PIP_BASE = { "Cython": "Cython>=0.29.13", "googledrivedownloader": "googledrivedownloader>=0.4", "methodtools": "methodtools", + "s2s-ft": "-e git+https://github.com/microsoft/unilm.git" + "@7f931fcfb965bf60f0fbe2ddd37798f356e6ee5e#egg=s2s-ft&subdirectory=s2s-ft", } PIP_GPU = {} @@ -150,7 +152,7 @@ if __name__ == "__main__": pip_packages = PIP_BASE # update conda and pip packages based on flags provided - CONDA_GPU["cudatoolkit"] = "cudatoolkit=" + args.cuda_version + CONDA_GPU["cudatoolkit"] = "cudatoolkit=" + args.cuda_version if args.gpu: conda_packages.update(CONDA_GPU) pip_packages.update(PIP_GPU)