Skip to content

WIP: Prevent path conflict in builds #1508

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

Closed
AyodeAwe wants to merge 11 commits into from
Closed

WIP: Prevent path conflict in builds #1508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ba03497
prevent path conflicts
AyodeAwe Mar 25, 2024
9dfd907
Merge branch 'branch-24.06' into jawe/ops-2621
jameslamb Apr 19, 2024
0cee90c
add more tests, skip running non-conda CI
jameslamb Apr 22, 2024
db38985
use my fork of rapids-cmake
jameslamb Apr 22, 2024
0e7fd73
changes
jameslamb Apr 23, 2024
3d9494c
formatting
jameslamb Apr 23, 2024
f8664fb
add uploads so tests can run
jameslamb Apr 23, 2024
f00512b
update to fmt 10.2.1 and spdlog 1.13.0
jameslamb Apr 24, 2024
ddc4fca
merge branch-24.06
jameslamb Apr 24, 2024
e5fb90b
stop manually re-exporting spdlog targets
jameslamb Apr 24, 2024
39a6a58
formatting
jameslamb Apr 24, 2024
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
1 change: 1 addition & 0 deletions ci/build_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ rapids-print-env
version=$(rapids-generate-version)

rapids-logger "Begin cpp build"
conda config --set path_conflict prevent

# This calls mambabuild when boa is installed (as is the case in the CI images)
RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/librmm
Expand Down
1 change: 1 addition & 0 deletions ci/build_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ sed -i "/^__git_commit__/ s/= .*/= \"${commit}\"/g" "${package_dir}/${package_na
rapids-logger "Begin py build"

CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
conda config --set path_conflict prevent

# This calls mambabuild when boa is installed (as is the case in the CI images)
RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild -c "${CPP_CHANNEL}" conda/recipes/rmm
Expand Down
16 changes: 4 additions & 12 deletions cmake/thirdparty/get_spdlog.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,11 @@
function(find_and_configure_spdlog)

include(${rapids-cmake-dir}/cpm/spdlog.cmake)
rapids_cpm_spdlog(FMT_OPTION "EXTERNAL_FMT_HO" INSTALL_EXPORT_SET rmm-exports)
rapids_export_package(BUILD spdlog rmm-exports)
rapids_cpm_spdlog(
FMT_OPTION "EXTERNAL_FMT_HO"
INSTALL_EXPORT_SET rmm-exports
BUILD_EXPORT_SET rmm-exports)

if(spdlog_ADDED)
rapids_export(
BUILD spdlog
EXPORT_SET spdlog
GLOBAL_TARGETS spdlog spdlog_header_only
NAMESPACE spdlog::)
include("${rapids-cmake-dir}/export/find_package_root.cmake")
rapids_export_find_package_root(BUILD spdlog [=[${CMAKE_CURRENT_LIST_DIR}]=]
EXPORT_SET rmm-exports)
endif()
endfunction()

find_and_configure_spdlog()
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 @@ -16,7 +16,7 @@ dependencies:
- cxx-compiler
- cython>=3.0.0
- doxygen=1.9.1
- fmt>=10.1.1,<11
- fmt>=10.2.1,<11
- gcc_linux-64=11.*
- gcovr>=5.0
- graphviz
Expand All @@ -34,7 +34,7 @@ dependencies:
- pytest-cov
- python>=3.9,<3.12
- scikit-build-core>=0.7.0
- spdlog>=1.12.0,<1.13
- spdlog>=1.13.0,<1.14
- sphinx
- sphinx-copybutton
- sphinx-markdown-tables
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-122_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
- cxx-compiler
- cython>=3.0.0
- doxygen=1.9.1
- fmt>=10.1.1,<11
- fmt>=10.2.1,<11
- gcc_linux-64=11.*
- gcovr>=5.0
- graphviz
Expand All @@ -32,7 +32,7 @@ dependencies:
- pytest-cov
- python>=3.9,<3.12
- scikit-build-core>=0.7.0
- spdlog>=1.12.0,<1.13
- spdlog>=1.13.0,<1.14
- sphinx
- sphinx-copybutton
- sphinx-markdown-tables
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/librmm/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ cmake_version:
- ">=3.26.4"

fmt_version:
- ">=10.1.1,<11"
- ">=10.2.1,<11"

spdlog_version:
- ">=1.12.0,<1.13"
- ">=1.13.0,<1.14"

sysroot_version:
- "2.17"
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 @@ -75,9 +75,9 @@ dependencies:
packages:
- c-compiler
- cxx-compiler
- fmt>=10.1.1,<11
- fmt>=10.2.1,<11
- scikit-build-core>=0.7.0
- spdlog>=1.12.0,<1.13
- spdlog>=1.13.0,<1.14
- output_types: [requirements, pyproject]
packages:
- scikit-build-core[pyproject]>=0.7.0
Expand Down
5 changes: 5 additions & 0 deletions rapids_config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ else()
endif()

if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake")
include(FetchContent)
FetchContent_Declare(
rapids-cmake
GIT_REPOSITORY https://github.com/jameslamb/rapids-cmake.git
GIT_TAG fmt-version)
file(
DOWNLOAD
"https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION_MAJOR_MINOR}/RAPIDS.cmake"
Expand Down