Skip to content
This repository was archived by the owner on Apr 28, 2023. It is now read-only.

Commit 44e2ecc

Browse files
author
Sven Verdoolaege
committed
deduplicate THIRD_PARTY_INSTALL_PREFIX
THIRD_PARTY_INSTALL_PREFIX was being used both for finding specific packages and for installing third-party submodules. Introduce specific variables for finding specific packages such that THIRD_PARTY_INSTALL_PREFIX is only used for installing third-party submodules.
1 parent 86c571e commit 44e2ecc

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,11 @@ set(ISL_LIBRARIES isl-static)
236236
# Halide
237237
################################################################################
238238
message(STATUS "Finding Halide")
239-
find_path(HALIDE_INCLUDE_DIR REQUIRED NAMES Halide PATHS ${THIRD_PARTY_INSTALL_PREFIX} PATH_SUFFIXES include NO_DEFAULT_PATH)
239+
find_path(HALIDE_INCLUDE_DIR REQUIRED NAMES Halide PATHS ${HALIDE_PREFIX} PATH_SUFFIXES include NO_DEFAULT_PATH)
240240
message(STATUS "HALIDE_INCLUDE_DIRS: ${HALIDE_INCLUDE_DIR}")
241241
include_directories(AFTER ${HALIDE_INCLUDE_DIR})
242242
include_directories(AFTER ${HALIDE_INCLUDE_DIR}/Halide)
243-
find_library(HALIDE_LIBRARIES REQUIRED NAMES Halide PATHS ${THIRD_PARTY_INSTALL_PREFIX} PATH_SUFFIXES lib lib64 NO_DEFAULT_PATH)
243+
find_library(HALIDE_LIBRARIES REQUIRED NAMES Halide PATHS ${HALIDE_PREFIX} PATH_SUFFIXES lib lib64 NO_DEFAULT_PATH)
244244
message(STATUS "Found Halide.so file: ${HALIDE_LIBRARIES}")
245245

246246
################################################################################
@@ -304,14 +304,14 @@ else()
304304
endif()
305305

306306
if (WITH_CAFFE2 AND WITH_CUDA)
307-
find_path(EIGEN_INCLUDE_DIR REQUIRED NAMES Eigen PATHS ${THIRD_PARTY_INSTALL_PREFIX} PATH_SUFFIXES include/eigen3 NO_DEFAULT_PATH)
307+
find_path(EIGEN_INCLUDE_DIR REQUIRED NAMES Eigen PATHS ${EIGEN_PREFIX} PATH_SUFFIXES include/eigen3 NO_DEFAULT_PATH)
308308
message(STATUS "Found, EIGEN_INCLUDE_DIR: " ${EIGEN_INCLUDE_DIR})
309309
find_library(CAFFE2_CPU_LIBRARY REQUIRED NAMES caffe2
310-
PATHS ${THIRD_PARTY_INSTALL_PREFIX} PATH_SUFFIXES lib lib64 NO_DEFAULT_PATH)
310+
PATHS ${CAFFE2_PREFIX} PATH_SUFFIXES lib lib64 NO_DEFAULT_PATH)
311311
find_library(CAFFE2_GPU_LIBRARY REQUIRED NAMES caffe2_gpu
312-
PATHS ${THIRD_PARTY_INSTALL_PREFIX} PATH_SUFFIXES lib lib64 NO_DEFAULT_PATH)
312+
PATHS ${CAFFE2_PREFIX} PATH_SUFFIXES lib lib64 NO_DEFAULT_PATH)
313313
set(CAFFE2_LIBRARIES ${CAFFE2_CPU_LIBRARY} ${CAFFE2_GPU_LIBRARY})
314-
find_path(CAFFE2_INCLUDE_DIR REQUIRED NAMES caffe2 PATHS ${THIRD_PARTY_INSTALL_PREFIX} PATH_SUFFIXES include NO_DEFAULT_PATH)
314+
find_path(CAFFE2_INCLUDE_DIR REQUIRED NAMES caffe2 PATHS ${CAFFE2_PREFIX} PATH_SUFFIXES include NO_DEFAULT_PATH)
315315
message(STATUS "Found, CAFFE2_INCLUDE_DIR: " ${CAFFE2_INCLUDE_DIR})
316316

317317
add_definitions(-DCAFFE2_USE_GOOGLE_GLOG)

build.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ WITH_TAPIR=${WITH_TAPIR:=ON}
2323

2424
CUDNN_ROOT_DIR=${CUDNN_ROOT_DIR:=${CONDA_PREFIX}}
2525
CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH:=${CONDA_PREFIX}/lib/cmake}
26+
HALIDE_PREFIX=${HALIDE_PREFIX:=${CONDA_PREFIX}}
27+
EIGEN_PREFIX=${EIGEN_PREFIX:=${CONDA_PREFIX}}
28+
CAFFE2_PREFIX=${CAFFE2_PREFIX:=${CONDA_PREFIX}}
2629

2730
THIRD_PARTY_INSTALL_PREFIX=${CONDA_PREFIX}
2831

@@ -47,6 +50,9 @@ cmake -DWITH_CAFFE2=${WITH_CAFFE2} \
4750
-DPYTHON_EXECUTABLE=${PYTHON} \
4851
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
4952
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} \
53+
-DHALIDE_PREFIX=${HALIDE_PREFIX} \
54+
-DEIGEN_PREFIX=${EIGEN_PREFIX} \
55+
-DCAFFE2_PREFIX=${CAFFE2_PREFIX} \
5056
-DTHIRD_PARTY_INSTALL_PREFIX=${THIRD_PARTY_INSTALL_PREFIX} \
5157
-DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
5258
-DCLANG_PREFIX=${CLANG_PREFIX} \

0 commit comments

Comments
 (0)