From d5a6083a3fd05e15825d3a8b13dd9452b692915e Mon Sep 17 00:00:00 2001 From: Lawrence Mitchell Date: Fri, 8 Sep 2023 11:00:10 +0100 Subject: [PATCH 1/3] Use mamba build rather than mamba mambabuild Since Conda 23.7.3, the plugin mechanism changed, and mambabuild broke. Adapt to this change, following the fix in mamba (mamba-org/mamba#2732) --- ci/build_cpp.sh | 3 ++- ci/build_python.sh | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 3bd18a88139..95802d3aa32 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -11,7 +11,8 @@ rapids-print-env rapids-logger "Begin cpp build" -rapids-mamba-retry mambabuild \ +# With boa installed mamba build forward to boa +rapids-mamba-retry build \ conda/recipes/libcudf rapids-upload-conda-to-s3 cpp diff --git a/ci/build_python.sh b/ci/build_python.sh index ec34d63b282..9b70b5b96be 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -15,24 +15,25 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) # TODO: Remove `--no-test` flag once importing on a CPU # node works correctly -rapids-mamba-retry mambabuild \ +# With boa install mamba build forwards to the boa builder +rapids-mamba-retry build \ --no-test \ --channel "${CPP_CHANNEL}" \ conda/recipes/cudf -rapids-mamba-retry mambabuild \ +rapids-mamba-retry build \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ conda/recipes/dask-cudf -rapids-mamba-retry mambabuild \ +rapids-mamba-retry build \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ conda/recipes/cudf_kafka -rapids-mamba-retry mambabuild \ +rapids-mamba-retry build \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ From da278231c1fd63b550ab39cb796bcefceb555fd7 Mon Sep 17 00:00:00 2001 From: Lawrence Mitchell Date: Fri, 8 Sep 2023 11:45:36 +0100 Subject: [PATCH 2/3] Use conda build to work around mamba-org/mamba#2821 With boa installed, conda build forwards to the boa "mambabuild" command, so this is still using the mamba solver. --- ci/build_cpp.sh | 4 ++-- ci/build_python.sh | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 95802d3aa32..2005fc0afcc 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -11,8 +11,8 @@ rapids-print-env rapids-logger "Begin cpp build" -# With boa installed mamba build forward to boa -rapids-mamba-retry build \ +# With boa installed conda build forward to boa +rapids-conda-retry build \ conda/recipes/libcudf rapids-upload-conda-to-s3 cpp diff --git a/ci/build_python.sh b/ci/build_python.sh index 9b70b5b96be..07334d6b7b0 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -15,25 +15,25 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) # TODO: Remove `--no-test` flag once importing on a CPU # node works correctly -# With boa install mamba build forwards to the boa builder -rapids-mamba-retry build \ +# With boa installed conda build forwards to the boa builder +rapids-conda-retry build \ --no-test \ --channel "${CPP_CHANNEL}" \ conda/recipes/cudf -rapids-mamba-retry build \ +rapids-conda-retry build \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ conda/recipes/dask-cudf -rapids-mamba-retry build \ +rapids-conda-retry build \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ conda/recipes/cudf_kafka -rapids-mamba-retry build \ +rapids-conda-retry build \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ From dff0476648f43be873dc82c126f9f9c5aab70c46 Mon Sep 17 00:00:00 2001 From: Lawrence Mitchell Date: Fri, 8 Sep 2023 15:27:10 +0100 Subject: [PATCH 3/3] Try with conda mambabuild Solve seems to be a little slow. --- ci/build_cpp.sh | 2 +- ci/build_python.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 2005fc0afcc..8b757fecf5a 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -12,7 +12,7 @@ rapids-print-env rapids-logger "Begin cpp build" # With boa installed conda build forward to boa -rapids-conda-retry build \ +rapids-conda-retry mambabuild \ conda/recipes/libcudf rapids-upload-conda-to-s3 cpp diff --git a/ci/build_python.sh b/ci/build_python.sh index 07334d6b7b0..61f160b25f5 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -16,24 +16,24 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) # TODO: Remove `--no-test` flag once importing on a CPU # node works correctly # With boa installed conda build forwards to the boa builder -rapids-conda-retry build \ +rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ conda/recipes/cudf -rapids-conda-retry build \ +rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ conda/recipes/dask-cudf -rapids-conda-retry build \ +rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ conda/recipes/cudf_kafka -rapids-conda-retry build \ +rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \