Merge pull request #485 from facebookresearch/pr/install

clean up THIRD_PARTY_INSTALL_PREFIX  uses

Author: nicolasvasilache

CMakeLists.txt

@@ -236,11 +236,11 @@ set(ISL_LIBRARIES isl-static)
 # Halide
 ################################################################################
 message(STATUS "Finding Halide")
-find_path(HALIDE_INCLUDE_DIR REQUIRED NAMES Halide PATHS ${THIRD_PARTY_INSTALL_PREFIX} PATH_SUFFIXES include NO_DEFAULT_PATH)
+find_path(HALIDE_INCLUDE_DIR REQUIRED NAMES Halide PATHS ${HALIDE_PREFIX} PATH_SUFFIXES include NO_DEFAULT_PATH)
 message(STATUS "HALIDE_INCLUDE_DIRS: ${HALIDE_INCLUDE_DIR}")
 include_directories(AFTER ${HALIDE_INCLUDE_DIR})
 include_directories(AFTER ${HALIDE_INCLUDE_DIR}/Halide)
-find_library(HALIDE_LIBRARIES REQUIRED NAMES Halide PATHS ${THIRD_PARTY_INSTALL_PREFIX} PATH_SUFFIXES lib lib64 NO_DEFAULT_PATH)
+find_library(HALIDE_LIBRARIES REQUIRED NAMES Halide PATHS ${HALIDE_PREFIX} PATH_SUFFIXES lib lib64 NO_DEFAULT_PATH)
 message(STATUS "Found Halide.so file: ${HALIDE_LIBRARIES}")
 
 ################################################################################
@@ -304,14 +304,14 @@ else()
 endif()
 
 if (WITH_CAFFE2 AND WITH_CUDA)
-   find_path(EIGEN_INCLUDE_DIR REQUIRED NAMES Eigen PATHS ${THIRD_PARTY_INSTALL_PREFIX} PATH_SUFFIXES include/eigen3 NO_DEFAULT_PATH)
+   find_path(EIGEN_INCLUDE_DIR REQUIRED NAMES Eigen PATHS ${EIGEN_PREFIX} PATH_SUFFIXES include/eigen3 NO_DEFAULT_PATH)
    message(STATUS "Found, EIGEN_INCLUDE_DIR: " ${EIGEN_INCLUDE_DIR})
    find_library(CAFFE2_CPU_LIBRARY REQUIRED NAMES caffe2
-                PATHS ${THIRD_PARTY_INSTALL_PREFIX} PATH_SUFFIXES lib lib64 NO_DEFAULT_PATH)
+                PATHS ${CAFFE2_PREFIX} PATH_SUFFIXES lib lib64 NO_DEFAULT_PATH)
    find_library(CAFFE2_GPU_LIBRARY REQUIRED NAMES caffe2_gpu
-                PATHS ${THIRD_PARTY_INSTALL_PREFIX} PATH_SUFFIXES lib lib64 NO_DEFAULT_PATH)
+                PATHS ${CAFFE2_PREFIX} PATH_SUFFIXES lib lib64 NO_DEFAULT_PATH)
    set(CAFFE2_LIBRARIES ${CAFFE2_CPU_LIBRARY} ${CAFFE2_GPU_LIBRARY})
-   find_path(CAFFE2_INCLUDE_DIR REQUIRED NAMES caffe2 PATHS ${THIRD_PARTY_INSTALL_PREFIX} PATH_SUFFIXES include NO_DEFAULT_PATH)
+   find_path(CAFFE2_INCLUDE_DIR REQUIRED NAMES caffe2 PATHS ${CAFFE2_PREFIX} PATH_SUFFIXES include NO_DEFAULT_PATH)
    message(STATUS "Found, CAFFE2_INCLUDE_DIR: " ${CAFFE2_INCLUDE_DIR})
 
    add_definitions(-DCAFFE2_USE_GOOGLE_GLOG)

build.sh

@@ -22,8 +22,12 @@ WITH_CAFFE2=${WITH_CAFFE2:=OFF}
 WITH_TAPIR=${WITH_TAPIR:=ON}
 
 CUDNN_ROOT_DIR=${CUDNN_ROOT_DIR:=${CONDA_PREFIX}}
+CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH:=${CONDA_PREFIX}/lib/cmake}
+HALIDE_PREFIX=${HALIDE_PREFIX:=${CONDA_PREFIX}}
+EIGEN_PREFIX=${EIGEN_PREFIX:=${CONDA_PREFIX}}
+CAFFE2_PREFIX=${CAFFE2_PREFIX:=${CONDA_PREFIX}}
 
-THIRD_PARTY_INSTALL_PREFIX=${CONDA_PREFIX}
+THIRD_PARTY_INSTALL_PREFIX=${TC_DIR}/third-party-install
 
 INSTALL_PREFIX=${INSTALL_PREFIX:=${TC_DIR}/install}
 mkdir -p ${INSTALL_PREFIX}
@@ -45,7 +49,10 @@ cmake -DWITH_CAFFE2=${WITH_CAFFE2} \
        -DWITH_TAPIR=${WITH_TAPIR} \
        -DPYTHON_EXECUTABLE=${PYTHON} \
        -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-       -DCMAKE_PREFIX_PATH=${THIRD_PARTY_INSTALL_PREFIX}/lib/cmake \
+       -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} \
+       -DHALIDE_PREFIX=${HALIDE_PREFIX} \
+       -DEIGEN_PREFIX=${EIGEN_PREFIX} \
+       -DCAFFE2_PREFIX=${CAFFE2_PREFIX} \
        -DTHIRD_PARTY_INSTALL_PREFIX=${THIRD_PARTY_INSTALL_PREFIX} \
        -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
        -DCLANG_PREFIX=${CLANG_PREFIX} \