From f22763a9850fe428a25df7c597cf4353e6696f79 Mon Sep 17 00:00:00 2001
From: Allard Hendriksen <ahendriksen@nvidia.com>
Date: Wed, 5 Apr 2023 11:27:24 +0200
Subject: [PATCH 1/5]  Use RMM artifacts deployed from PR 1241

---
 ci/build_cpp.sh          |  4 +++-
 ci/build_python.sh       | 14 ++++++++++++++
 ci/test_cpp_common.sh    |  3 +++
 ci/test_python_common.sh |  6 ++++++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
index bc27e7d76b0..1ee70712785 100755
--- a/ci/build_cpp.sh
+++ b/ci/build_cpp.sh
@@ -11,6 +11,8 @@ rapids-print-env
 
 rapids-logger "Begin cpp build"
 
-rapids-mamba-retry mambabuild conda/recipes/libcudf
+LIBRMM_CHANNEL=$(rapids-get-artifact ci/rmm/pull-request/1241/1fd0b84/rmm_conda_cpp_cuda11_$(arch).tar.gz)
+
+rapids-mamba-retry mambabuild  --channel "${LIBRMM_CHANNEL}" conda/recipes/libcudf
 
 rapids-upload-conda-to-s3 cpp
diff --git a/ci/build_python.sh b/ci/build_python.sh
index ec34d63b282..1e265ee7540 100755
--- a/ci/build_python.sh
+++ b/ci/build_python.sh
@@ -13,28 +13,42 @@ rapids-logger "Begin py build"
 
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 
+PY_VER=${RAPIDS_PY_VERSION//./}
+
+LIBRMM_CHANNEL=$(rapids-get-artifact ci/rmm/pull-request/1241/1fd0b84/rmm_conda_cpp_cuda11_$(arch).tar.gz)
+RMM_CHANNEL=$(rapids-get-artifact ci/rmm/pull-request/1241/1fd0b84/rmm_conda_python_cuda11__${PY_VER}_$(arch).tar.gz)
+
+
 # TODO: Remove `--no-test` flag once importing on a CPU
 # node works correctly
 rapids-mamba-retry mambabuild \
   --no-test \
   --channel "${CPP_CHANNEL}" \
+  --channel "${LIBRMM_CHANNEL}" \
+  --channel "${RMM_CHANNEL}" \
   conda/recipes/cudf
 
 rapids-mamba-retry mambabuild \
   --no-test \
   --channel "${CPP_CHANNEL}" \
   --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
+  --channel "${LIBRMM_CHANNEL}" \
+  --channel "${RMM_CHANNEL}" \
   conda/recipes/dask-cudf
 
 rapids-mamba-retry mambabuild \
   --no-test \
   --channel "${CPP_CHANNEL}" \
+  --channel "${LIBRMM_CHANNEL}" \
+  --channel "${RMM_CHANNEL}" \
   --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
   conda/recipes/cudf_kafka
 
 rapids-mamba-retry mambabuild \
   --no-test \
   --channel "${CPP_CHANNEL}" \
+  --channel "${LIBRMM_CHANNEL}" \
+  --channel "${RMM_CHANNEL}" \
   --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
   conda/recipes/custreamz
 
diff --git a/ci/test_cpp_common.sh b/ci/test_cpp_common.sh
index c7c095dc4df..b643babbdf6 100644
--- a/ci/test_cpp_common.sh
+++ b/ci/test_cpp_common.sh
@@ -19,6 +19,8 @@ conda activate test
 set -u
 
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
+LIBRMM_CHANNEL=$(rapids-get-artifact ci/rmm/pull-request/1241/1fd0b84/rmm_conda_cpp_cuda11_$(arch).tar.gz)
+
 RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/
 mkdir -p "${RAPIDS_TESTS_DIR}"
 
@@ -26,6 +28,7 @@ rapids-print-env
 
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
+  --channel "${LIBRMM_CHANNEL}" \
   libcudf libcudf_kafka libcudf-tests
 
 rapids-logger "Check GPU usage"
diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh
index 0e922c105dd..50796244de0 100755
--- a/ci/test_python_common.sh
+++ b/ci/test_python_common.sh
@@ -23,6 +23,10 @@ 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)
+PY_VER=${RAPIDS_PY_VERSION//./}
+LIBRMM_CHANNEL=$(rapids-get-artifact ci/rmm/pull-request/1241/1fd0b84/rmm_conda_cpp_cuda11_$(arch).tar.gz)
+RMM_CHANNEL=$(rapids-get-artifact ci/rmm/pull-request/1241/1fd0b84/rmm_conda_python_cuda11__${PY_VER}_$(arch).tar.gz)
+
 
 RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}
 RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"}
@@ -33,4 +37,6 @@ rapids-print-env
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
   --channel "${PYTHON_CHANNEL}" \
+  --channel "${LIBRMM_CHANNEL}" \
+  --channel "${RMM_CHANNEL}" \
   cudf libcudf

From 4a260e4d52325414827b39fe5847a4e9237be06f Mon Sep 17 00:00:00 2001
From: Allard Hendriksen <ahendriksen@nvidia.com>
Date: Wed, 5 Apr 2023 14:49:49 +0200
Subject: [PATCH 2/5] Fix tests/identify_stream_usage.cpp

---
 cpp/tests/utilities/identify_stream_usage.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cpp/tests/utilities/identify_stream_usage.cpp b/cpp/tests/utilities/identify_stream_usage.cpp
index a4d19a8f552..e500466a10f 100644
--- a/cpp/tests/utilities/identify_stream_usage.cpp
+++ b/cpp/tests/utilities/identify_stream_usage.cpp
@@ -21,6 +21,7 @@
 
 #include <cstdlib>
 #include <cxxabi.h>
+#include <cstring>
 #include <dlfcn.h>
 #include <execinfo.h>
 #include <iostream>

From 5d0fa44c4b3514dbacf8d5c218a29c655dd2e45c Mon Sep 17 00:00:00 2001
From: Allard Hendriksen <ahendriksen@nvidia.com>
Date: Wed, 5 Apr 2023 14:56:40 +0200
Subject: [PATCH 3/5] Fix typo in python pin

---
 ci/build_python.sh       | 2 +-
 ci/test_python_common.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/build_python.sh b/ci/build_python.sh
index 1e265ee7540..50e061a02df 100755
--- a/ci/build_python.sh
+++ b/ci/build_python.sh
@@ -16,7 +16,7 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 PY_VER=${RAPIDS_PY_VERSION//./}
 
 LIBRMM_CHANNEL=$(rapids-get-artifact ci/rmm/pull-request/1241/1fd0b84/rmm_conda_cpp_cuda11_$(arch).tar.gz)
-RMM_CHANNEL=$(rapids-get-artifact ci/rmm/pull-request/1241/1fd0b84/rmm_conda_python_cuda11__${PY_VER}_$(arch).tar.gz)
+RMM_CHANNEL=$(rapids-get-artifact ci/rmm/pull-request/1241/1fd0b84/rmm_conda_python_cuda11_${PY_VER}_$(arch).tar.gz)
 
 
 # TODO: Remove `--no-test` flag once importing on a CPU
diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh
index 50796244de0..c03e1d34751 100755
--- a/ci/test_python_common.sh
+++ b/ci/test_python_common.sh
@@ -25,7 +25,7 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
 PY_VER=${RAPIDS_PY_VERSION//./}
 LIBRMM_CHANNEL=$(rapids-get-artifact ci/rmm/pull-request/1241/1fd0b84/rmm_conda_cpp_cuda11_$(arch).tar.gz)
-RMM_CHANNEL=$(rapids-get-artifact ci/rmm/pull-request/1241/1fd0b84/rmm_conda_python_cuda11__${PY_VER}_$(arch).tar.gz)
+RMM_CHANNEL=$(rapids-get-artifact ci/rmm/pull-request/1241/1fd0b84/rmm_conda_python_cuda11_${PY_VER}_$(arch).tar.gz)
 
 
 RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}

From cb9465355ee4d811112fe088537f4480ec44a3ac Mon Sep 17 00:00:00 2001
From: Allard Hendriksen <ahendriksen@nvidia.com>
Date: Wed, 5 Apr 2023 15:02:16 +0200
Subject: [PATCH 4/5] Fix include order

---
 cpp/tests/utilities/identify_stream_usage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/tests/utilities/identify_stream_usage.cpp b/cpp/tests/utilities/identify_stream_usage.cpp
index e500466a10f..c59622ee66d 100644
--- a/cpp/tests/utilities/identify_stream_usage.cpp
+++ b/cpp/tests/utilities/identify_stream_usage.cpp
@@ -20,8 +20,8 @@
 #include <cuda_runtime.h>
 
 #include <cstdlib>
-#include <cxxabi.h>
 #include <cstring>
+#include <cxxabi.h>
 #include <dlfcn.h>
 #include <execinfo.h>
 #include <iostream>

From f947dd561281e54fb15716927a214f9fb15fdd35 Mon Sep 17 00:00:00 2001
From: Allard Hendriksen <ahendriksen@nvidia.com>
Date: Wed, 5 Apr 2023 19:09:21 +0200
Subject: [PATCH 5/5] Add algorithm include

---
 cpp/include/cudf/io/data_sink.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cpp/include/cudf/io/data_sink.hpp b/cpp/include/cudf/io/data_sink.hpp
index 0be2935b84c..88f9c188530 100644
--- a/cpp/include/cudf/io/data_sink.hpp
+++ b/cpp/include/cudf/io/data_sink.hpp
@@ -21,6 +21,7 @@
 
 #include <rmm/cuda_stream_view.hpp>
 
+#include <algorithm>
 #include <future>
 #include <memory>
 #include <string>