Removed unused cmake flag, removed INSTALL_PREFIX, removed unneeded s…

…etup.py install options, updated docs accordingly.
oorliu · May 24, 2019 · c975cde · c975cde
1 parent 8e28bc1
commit c975cde
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -158,11 +158,11 @@ conda activate cugraph_dev
   ```
 The default installation locations are `$CMAKE_INSTALL_PREFIX/lib` and `$CMAKE_INSTALL_PREFIX/include/cugraph` respectively.
 
-As a convenience, a `build.sh` script is provided in `$CUGRAPH_HOME`. To execute the same build commands above, run the script as shown below.  Note that the libraries will be installed to the location set in `$INSTALL_PREFIX` if set (i.e. `export INSTALL_PREFIX=/install/path`), otherwise to `$CONDA_PREFIX`.
+As a convenience, a `build.sh` script is provided in `$CUGRAPH_HOME`. To execute the same build commands above, run the script as shown below.  Note that the libraries will be installed to the location set in `$PREFIX` if set (i.e. `export PREFIX=/install/path`), otherwise to `$CONDA_PREFIX`.
 ```bash
 $ cd $CUGRAPH_HOME
 $ ./build.sh libcugraph  # build the cuGraph libraries and install them to
-                         # $INSTALL_PREFIX if set, otherwise $CONDA_PREFIX
+                         # $PREFIX if set, otherwise $CONDA_PREFIX
 ```
 
 #### Building and installing the Python package
@@ -179,7 +179,7 @@ Like the `libcugraph` build step above, `build.sh` can also be used to build the
 ```bash
 $ cd $CUGRAPH_HOME
 $ ./build.sh cugraph  # build the cuGraph python bindings and install them
-                      # to $INSTALL_PREFIX if set, otherwise $CONDA_PREFIX
+                      # to $PREFIX if set, otherwise $CONDA_PREFIX
 ```
 
 Note: other `build.sh` options include:

diff --git a/build.sh b/build.sh
@@ -42,9 +42,9 @@ BUILD_TYPE=Release
 INSTALL_TARGET=install
 
 # Set defaults for vars that may not have been defined externally
-#  FIXME: if INSTALL_PREFIX is not set, check PREFIX, then check
-#         CONDA_PREFIX, but there is no fallback from there!
-INSTALL_PREFIX=${INSTALL_PREFIX:=${PREFIX:=${CONDA_PREFIX}}}
+#  FIXME: if PREFIX is not set, check CONDA_PREFIX, but there is no fallback
+#  from there!
+INSTALL_PREFIX=${PREFIX:=${CONDA_PREFIX}}
 PARALLEL_LEVEL=${PARALLEL_LEVEL:=""}
 BUILD_ABI=${BUILD_ABI:=ON}
 
@@ -100,7 +100,6 @@ if (( ${NUMARGS} == 0 )) || hasArg libcugraph; then
     cd ${LIBCUGRAPH_BUILD_DIR}
     cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
           -DCMAKE_CXX11_ABI=${BUILD_ABI} \
-          -DNVG_PLUGIN=True \
           -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ..
     make -j${PARALLEL_LEVEL} VERBOSE=${VERBOSE} ${INSTALL_TARGET}
 fi
@@ -111,7 +110,7 @@ if (( ${NUMARGS} == 0 )) || hasArg cugraph; then
     cd ${REPODIR}/python
     if [[ ${INSTALL_TARGET} != "" ]]; then
 	python setup.py build_ext --inplace
-	python setup.py install --single-version-externally-managed --record=record.txt
+	python setup.py install
     else
 	python setup.py build_ext --inplace --library-dir=${LIBCUGRAPH_BUILD_DIR}
     fi