diff --git a/README.md b/README.md index c35a2b8..c961f85 100644 --- a/README.md +++ b/README.md @@ -40,14 +40,17 @@ To get started: - [/similarity](similarity#notebooks) -The utilities in [`utils_cv`](utils_cv) is `pip`-installable from the -main directory by `pip install .` or directly from the master branch -on GitHub (**NOTE** To build the wheel, `g++` is required): +As an alternative to the steps above, and if one wants to install only +the 'utils_cv' library (without creating a new conda environment), +this can be done by running ```bash pip install git+https://github.com/microsoft/ComputerVision.git@master#egg=utils_cv ``` +or by downloading the repo and then running `pip install .` in the +root directory. + ## Introduction diff --git a/environment.yml b/environment.yml index d4a2800..14bb0cd 100644 --- a/environment.yml +++ b/environment.yml @@ -13,16 +13,25 @@ name: cv channels: - defaults - conda-forge +- pytorch +- fastai dependencies: - python==3.6.8 +- pytorch==1.0.0 +- torchvision +- fastai==1.0.48 +- ipykernel>=4.6.1 - jupyter>=1.0.0 - pytest>=3.6.4 +- bqplot +- scikit-learn>=0.19.1 - pip>=19.0.3 - pip: - # NOTE: Make sure of syncing dependencies in `setup.py` - - . + - azureml-sdk[notebooks,contrib]>=1.0.30 - black>=18.6b4 + - papermill>=0.15.0 - ipywebrtc + - nvidia-ml-py3 - pre-commit>=1.14.4 - lxml>=4.3.2 - nteract-scrapbook diff --git a/setup.py b/setup.py index 8934158..d25a019 100644 --- a/setup.py +++ b/setup.py @@ -6,8 +6,6 @@ from os import path UTILS_CV = "utils_cv" # Utility folder name -# UTILS_CV_PATH = path.join(path.abspath(path.dirname(__file__)), UTILS_CV) -# README = path.join(UTILS_CV_PATH, "README.md") README = path.join(UTILS_CV, "README.md") exec(open(path.join(UTILS_CV, "__init__.py")).read()) @@ -37,8 +35,11 @@ setup( "Topic :: Software Development :: Libraries :: Python Modules", ], include_package_data=True, - # Not fully test the dependency coverage, please make sure to sync - # with environment.yml + # Make utils_cv pip-installable without environment.yml. + # * But keep environment.yml unchanged util final decision to + # incorporate utils_cv into environment.yml. + # * Make sure to sync with environment.yml if any dependencies or + # versions changed. install_requires=[ "azureml-sdk[notebooks,contrib]>=1.0.30", # requires ipykernel, papermill, jupyter-core, jupyter-client "bqplot", @@ -59,5 +60,5 @@ setup( ] ), packages=[UTILS_CV], - python_requires="==3.6.8", + python_requires=">=3.6", )