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

Jump to bottom

Build with fmt 10.1.1 and spdlog 1.12.0. #5640

Closed
wants to merge 8 commits into from
Closed

Build with fmt 10.1.1 and spdlog 1.12.0. #5640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2565477
Build with spdlog 1.12.0 and fmt 10.1.1.
bdice Nov 3, 2023
fa9b84a
Merge branch 'branch-24.02' into spdlog_1.12_fmt_10
bdice Nov 20, 2023
f75466c
Use upstream packages.
bdice Nov 22, 2023
b2cf4df
Use cumlprims_mg artifacts.
bdice Nov 27, 2023
33d30aa
Merge remote-tracking branch 'upstream/branch-24.02' into spdlog_1.12…
bdice Nov 30, 2023
9beca95
Drop cumlprims (no private repo access).
bdice Nov 30, 2023
984d691
Drop cumlprims_mg.
bdice Nov 30, 2023
c2e3142
Merge branch 'branch-24.02' into spdlog_1.12_fmt_10
bdice Nov 30, 2023
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
8 changes: 7 additions & 1 deletion ci/build_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,16 @@ export CMAKE_GENERATOR=Ninja

rapids-print-env

LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 cpp)
LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 cpp)

version=$(rapids-generate-version)

rapids-logger "Begin cpp build"

RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/libcuml
RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \
--channel "${LIBRMM_CHANNEL}" \
--channel "${LIBRAFT_CHANNEL}" \
conda/recipes/libcuml

rapids-upload-conda-to-s3 cpp
14 changes: 13 additions & 1 deletion ci/build_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,32 @@ package_dir="python"

version=$(rapids-generate-version)
git_commit=$(git rev-parse HEAD)
export RAPIDS_PACKAGE_VERSION=${version}
export RAPIDS_PACKAGE_VERSION=${version}

echo "${version}" > VERSION
sed -i "/^__git_commit__/ s/= .*/= \"${git_commit}\"/g" "${package_dir}/${package_name}/_version.py"

rapids-logger "Begin py build"

CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 cpp)
RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 python)
LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 cpp)
RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 python)
LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 cpp)
CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 python)

# TODO: Remove `--no-test` flag once importing on a CPU
# node works correctly
rapids-conda-retry mambabuild \
--no-test \
--channel "${CPP_CHANNEL}" \
--channel "${LIBRMM_CHANNEL}" \
--channel "${RMM_CHANNEL}" \
--channel "${LIBRAFT_CHANNEL}" \
--channel "${RAFT_CHANNEL}" \
--channel "${LIBCUDF_CHANNEL}" \
--channel "${CUDF_CHANNEL}" \
conda/recipes/cuml

# Build cuml-cpu only in CUDA 11 jobs since it only depends on python
Expand Down
4 changes: 4 additions & 0 deletions ci/test_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,17 @@ conda activate test
set -u

CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 cpp)
LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 cpp)
RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/
mkdir -p "${RAPIDS_TESTS_DIR}"

rapids-print-env

rapids-mamba-retry install \
--channel "${CPP_CHANNEL}" \
--channel "${LIBRMM_CHANNEL}" \
--channel "${LIBRAFT_CHANNEL}" \
libcuml libcuml-tests

rapids-logger "Check GPU usage"
Expand Down
12 changes: 12 additions & 0 deletions ci/test_python_common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ set -u
rapids-logger "Downloading artifacts from previous jobs"
CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 cpp)
RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 python)
LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 cpp)
RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1957 python)
LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 cpp)
CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 python)

RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}
RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"}
Expand All @@ -31,6 +37,12 @@ rapids-print-env
rapids-mamba-retry install \
--channel "${CPP_CHANNEL}" \
--channel "${PYTHON_CHANNEL}" \
--channel "${LIBRMM_CHANNEL}" \
--channel "${RMM_CHANNEL}" \
--channel "${LIBRAFT_CHANNEL}" \
--channel "${RAFT_CHANNEL}" \
--channel "${LIBCUDF_CHANNEL}" \
--channel "${CUDF_CHANNEL}" \
libcuml cuml

rapids-logger "Check GPU usage"
Expand Down
2 changes: 2 additions & 0 deletions fetch_rapids.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
# or implied. See the License for the specific language governing permissions and limitations under
# the License.
# =============================================================================
set(rapids-cmake-repo kkraus14/rapids-cmake)
set(rapids-cmake-branch spdlog_1.12_fmt_10)
if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/CUML_RAPIDS.cmake)
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.02/RAPIDS.cmake
${CMAKE_CURRENT_BINARY_DIR}/CUML_RAPIDS.cmake
Expand Down