Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating cpu job in hopes it speeds up python cpu builds #828

Merged
merged 5 commits into from
Sep 15, 2022
Merged

Updating cpu job in hopes it speeds up python cpu builds #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fbed42f
Updating cpu job in hopes it speeds up python cpu builds
cjnolet Sep 14, 2022
61f8a50
Merge remote-tracking branch 'rapidsai/branch-22.10' into fixing_slow…
cjnolet Sep 14, 2022
a2f1846
Trying different directory
cjnolet Sep 14, 2022
fa35aae
Trying to set FIND_RAFT_CPP on by default
cjnolet Sep 15, 2022
9db8d7f
Don't auto-build dists by default for pylibraft
cjnolet Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ if hasArg --compile-nn || hasArg --compile-libs || (( ${NUMARGS} == 0 )); then
CMAKE_TARGET="${CMAKE_TARGET};raft_nn_lib"
fi

if hasArg --compile-dist || hasArg --compile-libs || hasArg pylibraft || (( ${NUMARGS} == 0 )); then
if hasArg --compile-dist || hasArg --compile-libs || (( ${NUMARGS} == 0 )); then
COMPILE_DIST_LIBRARY=ON
CMAKE_TARGET="${CMAKE_TARGET};raft_distance_lib"
fi
Expand Down Expand Up @@ -252,7 +252,7 @@ fi

################################################################################
# Configure for building all C++ targets
if (( ${NUMARGS} == 0 )) || hasArg libraft || hasArg pylibraft || hasArg docs || hasArg tests || hasArg bench; then
if (( ${NUMARGS} == 0 )) || hasArg libraft || hasArg docs || hasArg tests || hasArg bench; then
if (( ${BUILD_ALL_GPU_ARCH} == 0 )); then
RAFT_CMAKE_CUDA_ARCHITECTURES="NATIVE"
echo "Building for the architecture of the GPU in the system..."
Expand Down
14 changes: 9 additions & 5 deletions ci/cpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,22 +94,26 @@ if [ "$BUILD_LIBRAFT" == "1" ]; then
sccache --show-stats
else
gpuci_logger "SKIPPING build of conda packages for libraft-nn, libraft-distance, libraft-headers and libraft-tests"

# Install pre-built conda packages from previous CI step
gpuci_logger "Install libraft conda packages from CPU job"
CONDA_ARTIFACT_PATH=${WORKSPACE}/ci/artifacts/raft/cpu/.conda-bld/ # notice there is no `linux-64` here
gpuci_mamba_retry install -y -c ${CONDA_ARTIFACT_PATH} libraft-headers libraft-distance libraft-nn libraft-tests
fi

if [ "$BUILD_RAFT" == '1' ]; then
gpuci_logger "Building Python conda packages for raft"
if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
gpuci_conda_retry mambabuild --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/raft-dask --python=$PYTHON
gpuci_conda_retry mambabuild --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/pylibraft --python=$PYTHON
gpuci_conda_retry mambabuild --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/raft-dask --python=$PYTHON
else
gpuci_conda_retry mambabuild --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/raft-dask -c ${CONDA_LOCAL_CHANNEL} --dirty --no-remove-work-dir --python=$PYTHON
mkdir -p ${CONDA_BLD_DIR}/raft-dask/work
mv ${CONDA_BLD_DIR}/work ${CONDA_BLD_DIR}/raft-dask/work

gpuci_conda_retry mambabuild --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/pylibraft -c ${CONDA_LOCAL_CHANNEL} --dirty --no-remove-work-dir --python=$PYTHON
mkdir -p ${CONDA_BLD_DIR}/pylibraft/work
mv ${CONDA_BLD_DIR}/work ${CONDA_BLD_DIR}/pylibraft/work

gpuci_conda_retry mambabuild --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/raft-dask -c ${CONDA_LOCAL_CHANNEL} --dirty --no-remove-work-dir --python=$PYTHON
mkdir -p ${CONDA_BLD_DIR}/raft-dask/work
mv ${CONDA_BLD_DIR}/work ${CONDA_BLD_DIR}/raft-dask/work
fi
else
gpuci_logger "SKIPPING build of Python conda packages for raft"
Expand Down
4 changes: 2 additions & 2 deletions python/pylibraft/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ project(
C
CXX)

option(FIND_RAFT_CPP "Search for existing RAFT C++ installations before defaulting to local files"
OFF)
option(FIND_RAFT_CPP "Search for existing RAFT C++ installations before defaulting to local files" ON)

# If the user requested it we attempt to find RAFT.
if(FIND_RAFT_CPP)
find_package(raft ${pylibraft_version} REQUIRED COMPONENTS distance)
if(NOT TARGET raft::raft_distance_lib)
message(FATAL_ERROR "Building against a preexisting libraft library requires the distance components of that library to have been built!")

endif()
else()
set(raft_FOUND OFF)
Expand Down