From 109252c2351f1dc1fcff20dba7552ba616cb664d Mon Sep 17 00:00:00 2001 From: Chuck Hastings Date: Wed, 1 May 2019 10:16:34 -0400 Subject: [PATCH] add pip to the install, remove nightly files, update readme --- README.md | 17 --------- conda/environments/cugraph_dev.yml | 1 + conda/environments/cugraph_dev_cuda10.yml | 1 + conda/environments/cugraph_nightly.yml | 37 ------------------- conda/environments/cugraph_nightly_cuda10.yml | 36 ------------------ 5 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 conda/environments/cugraph_nightly.yml delete mode 100644 conda/environments/cugraph_nightly_cuda10.yml diff --git a/README.md b/README.md index 0b70fdc5eda..ad996e7e89c 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,6 @@ To install cuGraph from source, ensure the dependencies are met and follow the s 2) Create the conda development environment -​ A) Building the `master` branch uses the `cugraph_dev` environment ```bash # create the conda environment (assuming in base `cugraph` directory) @@ -145,22 +144,6 @@ conda deactivate -​ B) Create the conda development environment `cugraph_nightly` - -If you are on the latest development branch then you must use the `cugraph_nightly` environment. The latest cuGraph code uses the latest cuDF features that might not yet be in the master branch. To work off of the latest development branch, which could be unstable, use the nightly build environment. - -```bash -# create the conda environment (assuming in base `cugraph` directory) -conda env create --name cugraph_nightly --file conda/environments/cugraph_nightly.yml - -# activate the environment -conda activate cugraph_nightly - -``` - - - - - The environment can be updated as development includes/changes the dependencies. To do so, run: diff --git a/conda/environments/cugraph_dev.yml b/conda/environments/cugraph_dev.yml index 91985351ad2..f419fe6dc7e 100644 --- a/conda/environments/cugraph_dev.yml +++ b/conda/environments/cugraph_dev.yml @@ -31,5 +31,6 @@ dependencies: - numpydoc - ipython - recommonmark +- pip - pip: - sphinx-markdown-tables diff --git a/conda/environments/cugraph_dev_cuda10.yml b/conda/environments/cugraph_dev_cuda10.yml index 4ee53a87c44..7827798d27b 100644 --- a/conda/environments/cugraph_dev_cuda10.yml +++ b/conda/environments/cugraph_dev_cuda10.yml @@ -31,5 +31,6 @@ dependencies: - numpydoc - ipython - recommonmark +- pip - pip: - sphinx-markdown-tables diff --git a/conda/environments/cugraph_nightly.yml b/conda/environments/cugraph_nightly.yml deleted file mode 100644 index 9c68b1a1f26..00000000000 --- a/conda/environments/cugraph_nightly.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: cugraph_0.6 -channels: -- nvidia -- rapidsai-nightly -- rapidsai -- numba -- conda-forge -- defaults -dependencies: -- cudf=0.7.* -- rmm=0.7.* -- scipy -- networkx -- python-louvain -- cudatoolkit -- cmake>=3.12 -- python>=3.6,<3.8 -- numba>=0.40 -- pandas>=0.23.4 -- pyarrow=0.12.1 -- notebook>=0.5.0 -- boost -- nvstrings>=0.3,<0.4 -- cffi>=1.10.0 -- distributed>=1.23.0 -- cython>=0.29,<0.30 -- pytest -- sphinx -- sphinx_rtd_theme -- sphinxcontrib-websupport -- nbsphinx -- numpydoc -- ipython -- recommonmark -- pandoc=<2.0.0 -- pip: - - sphinx-markdown-tables diff --git a/conda/environments/cugraph_nightly_cuda10.yml b/conda/environments/cugraph_nightly_cuda10.yml deleted file mode 100644 index c550fa2336c..00000000000 --- a/conda/environments/cugraph_nightly_cuda10.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: cugraph_0.6 -channels: -- nvidia/label/cuda10.0 -- rapidsai-nightly/label/cuda10.0 -- rapidsai/label/cuda10.0 -- numba -- conda-forge -- defaults -dependencies: -- cudf=0.7.* -- rmm=0.7.* -- scipy -- networkx -- python-louvain -- cudatoolkit -- cmake>=3.12 -- python>=3.6,<3.8 -- numba>=0.40 -- pandas>=0.23.4 -- pyarrow=0.12.1 -- notebook>=0.5.0 -- boost -- nvstrings>=0.3,<0.4 -- cffi>=1.10.0 -- distributed>=1.23.0 -- cython>=0.29,<0.30 -- pytest -- sphinx -- sphinx_rtd_theme -- sphinxcontrib-websupport -- nbsphinx -- numpydoc -- ipython -- recommonmark -- pip: - - sphinx-markdown-tables