diff --git a/build.sh b/build.sh index d9e088c765e..22a62df7182 100755 --- a/build.sh +++ b/build.sh @@ -315,9 +315,11 @@ if buildAll || hasArg libcudf; then LIBCUDF_FS=$(ls -lh ${LIB_BUILD_DIR}/libcudf.so | awk '{print $5}') MSG="${MSG}
libcudf.so size: $LIBCUDF_FS" fi - echo "$MSG" - python ${REPODIR}/cpp/scripts/sort_ninja_log.py ${LIB_BUILD_DIR}/.ninja_log --fmt html --msg "$MSG" > ${LIB_BUILD_DIR}/ninja_log.html - cp ${LIB_BUILD_DIR}/.ninja_log ${LIB_BUILD_DIR}/ninja.log + BMR_DIR=${RAPIDS_ARTIFACTS_DIR:-"${LIB_BUILD_DIR}"} + echo "Metrics output dir: [$BMR_DIR]" + mkdir -p ${BMR_DIR} + python ${REPODIR}/cpp/scripts/sort_ninja_log.py ${LIB_BUILD_DIR}/.ninja_log --fmt html --msg "$MSG" > ${BMR_DIR}/ninja_log.html + cp ${LIB_BUILD_DIR}/.ninja_log ${BMR_DIR}/ninja.log fi if [[ ${INSTALL_TARGET} != "" ]]; then diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 3b45b3ce2e7..b68c2bdbef6 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022, NVIDIA CORPORATION. +# Copyright (c) 2022-2023, NVIDIA CORPORATION. set -euo pipefail @@ -14,3 +14,29 @@ rapids-logger "Begin cpp build" rapids-mamba-retry mambabuild conda/recipes/libcudf rapids-upload-conda-to-s3 cpp + +echo "++++++++++++++++++++++++++++++++++++++++++++" + +if [[ -d $RAPIDS_ARTIFACTS_DIR ]]; then + ls -l ${RAPIDS_ARTIFACTS_DIR} +fi + +echo "++++++++++++++++++++++++++++++++++++++++++++" + +FILE=${RAPIDS_ARTIFACTS_DIR}/ninja.log +if [[ -f $FILE ]]; then + echo -e "\x1B[33;1m\x1B[48;5;240m Ninja log for this build available at the following link \x1B[0m" + UPLOAD_NAME=cpp_cuda${RAPIDS_CUDA_VERSION%%.*}_$(arch).ninja.log + rapids-upload-to-s3 "${UPLOAD_NAME}" "${FILE}" +fi + +echo "++++++++++++++++++++++++++++++++++++++++++++" + +FILE=${RAPIDS_ARTIFACTS_DIR}/ninja_log.html +if [[ -f $FILE ]]; then + echo -e "\x1B[33;1m\x1B[48;5;240m Build Metrics Report for this build available at the following link \x1B[0m" + UPLOAD_NAME=cpp_cuda${RAPIDS_CUDA_VERSION%%.*}_$(arch).BuildMetricsReport.html + rapids-upload-to-s3 "${UPLOAD_NAME}" "${FILE}" +fi + +echo "++++++++++++++++++++++++++++++++++++++++++++" diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 0be72486319..983a63d4ce9 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -66,21 +66,5 @@ for gt in "$CONDA_PREFIX"/bin/gtests/{libcudf,libcudf_kafka}/* ; do fi done -if [[ "${RAPIDS_BUILD_TYPE}" == "nightly" ]]; then - rapids-logger "Memcheck gtests with rmm_mode=cuda" - export GTEST_CUDF_RMM_MODE=cuda - COMPUTE_SANITIZER_CMD="compute-sanitizer --tool memcheck" - for gt in "$CONDA_PREFIX"/bin/gtests/{libcudf,libcudf_kafka}/* ; do - test_name=$(basename ${gt}) - if [[ "$test_name" == "ERROR_TEST" ]]; then - continue - fi - echo "Running gtest $test_name" - ${COMPUTE_SANITIZER_CMD} ${gt} | tee "${RAPIDS_TESTS_DIR}${test_name}.cs.log" - done - unset GTEST_CUDF_RMM_MODE - # TODO: test-results/*.cs.log are processed in CI -fi - rapids-logger "Test script exiting with value: $EXITCODE" exit ${EXITCODE} diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml index b0b86b427b7..fbfcf6e71a2 100644 --- a/conda/recipes/libcudf/meta.yaml +++ b/conda/recipes/libcudf/meta.yaml @@ -27,6 +27,7 @@ build: - SCCACHE_IDLE_TIMEOUT - AWS_ACCESS_KEY_ID - AWS_SECRET_ACCESS_KEY + - RAPIDS_ARTIFACTS_DIR requirements: build: