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

Update to fmt 10.1.1 and spdlog 1.12.0. #117

Merged
merged 6 commits into from
Nov 30, 2023
Merged

Update to fmt 10.1.1 and spdlog 1.12.0. #117

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
18e5f8c
Build with spdlog 1.12.0 and fmt 10.1.1.
bdice Nov 3, 2023
5c9efce
Merge remote-tracking branch 'upstream/branch-0.36' into spdlog_1.12_…
bdice Nov 20, 2023
e2f1acd
Test with rmm artifacts.
bdice Nov 22, 2023
b9c5837
Use cudf artifacts.
bdice Nov 30, 2023
27c82a4
Revert build changes.
bdice Nov 30, 2023
e56dc51
Merge remote-tracking branch 'upstream/branch-0.36' into spdlog_1.12_…
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
5 changes: 5 additions & 0 deletions ci/build_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,14 @@ export CMAKE_GENERATOR=Ninja

rapids-print-env

LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 cpp)
RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1374 python)

rapids-logger "Begin C++ and Python builds"

rapids-conda-retry mambabuild \
--channel "${LIBRMM_CHANNEL}" \
--channel "${RMM_CHANNEL}" \
conda/recipes/ucxx

rapids-upload-conda-to-s3 cpp
5 changes: 5 additions & 0 deletions ci/test_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,13 @@ run_port_retry() {
rapids-logger "Downloading artifacts from previous jobs"
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)

rapids-mamba-retry install \
--channel "${CPP_CHANNEL}" \
--channel "${LIBRMM_CHANNEL}" \
--channel "${RMM_CHANNEL}" \
libucxx libucxx-examples libucxx-tests

print_ucx_config
Expand Down
9 changes: 9 additions & 0 deletions ci/test_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,17 @@ run_distributed_ucxx_tests() {
rapids-logger "Downloading artifacts from previous jobs"
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)
LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 cpp)
CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14355 python)

rapids-mamba-retry install \
--channel "${CPP_CHANNEL}" \
--channel "${LIBRMM_CHANNEL}" \
--channel "${RMM_CHANNEL}" \
--channel "${LIBCUDF_CHANNEL}" \
--channel "${CUDF_CHANNEL}" \
libucxx ucxx distributed-ucxx

# TODO: Perhaps install from conda? We need distributed installed in developer
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies:
- dask-cuda==24.2.*
- dask-cudf==24.2.*
- distributed
- fmt>=9.1.0,<10
- fmt>=10.1.1,<11
- gmock>=1.13.0
- gtest>=1.13.0
- librmm==24.2.*
Expand All @@ -41,7 +41,7 @@ dependencies:
- rmm==24.2.*
- scikit-build>=0.13.1
- setuptools
- spdlog>=1.11.0,<1.12
- spdlog>=1.12.0,<1.13
- tomli
- ucx
- wheel
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-120_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies:
- dask-cuda==24.2.*
- dask-cudf==24.2.*
- distributed
- fmt>=9.1.0,<10
- fmt>=10.1.1,<11
- gmock>=1.13.0
- gtest>=1.13.0
- librmm==24.2.*
Expand All @@ -41,7 +41,7 @@ dependencies:
- rmm==24.2.*
- scikit-build>=0.13.1
- setuptools
- spdlog>=1.11.0,<1.12
- spdlog>=1.12.0,<1.13
- tomli
- ucx
- wheel
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ dependencies:
- c-compiler
- cxx-compiler
- &cmake_ver cmake>=3.26.4
- fmt>=9.1.0,<10
- fmt>=10.1.1,<11
- &gmock gmock>=1.13.0
- &gtest gtest>=1.13.0
- librmm==24.2.*
- ninja
- spdlog>=1.11.0,<1.12
- spdlog>=1.12.0,<1.13
build_python:
common:
- output_types: [conda, requirements, pyproject]
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}/UCXX_RAPIDS.cmake)
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.02/RAPIDS.cmake
${CMAKE_CURRENT_BINARY_DIR}/UCXX_RAPIDS.cmake
Expand Down
Loading