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

Adopt Rapids 25.02 #528

Draft
wants to merge 4 commits into
base: branch-25.02
Choose a base branch
from
Draft

Adopt Rapids 25.02 #528

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0fd5710
First pass at rapids 25.02 support
dagardner-nv Jan 17, 2025
65658ea
Update conda version
dagardner-nv Jan 17, 2025
ae9f802
Revert temp change
dagardner-nv Jan 17, 2025
02a5002
Formatting fixes
dagardner-nv Jan 17, 2025
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
Prev Previous commit
Formatting fixes
  • Loading branch information
@dagardner-nv
dagardner-nv committed Jan 17, 2025
commit 02a5002ce5448aa391e90372c92d51d08d12382c
17 changes: 10 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ mark_as_advanced(MRC_CACHE_DIR)

enable_testing()

if(MRC_USE_IWYU AND MRC_USE_CCACHE)
if (MRC_USE_IWYU AND MRC_USE_CCACHE)
message(FATAL_ERROR "MRC_USE_IWYU and MRC_USE_CCACHE cannot be set simultaneously")
endif()

Expand All @@ -53,11 +53,11 @@ set(MRC_CMAKE_MODULE_PATH_EXTENSIONS
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/external/utilities/cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/external/utilities/cmake/morpheus_utils/package_search"
)
)

set(MRC_CMAKE_PREFIX_PATH_EXTENSIONS
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
)
)

# Prepend path and prefix updates so they take priority in this scope.
list(PREPEND CMAKE_MODULE_PATH "${MRC_CMAKE_MODULE_PATH_EXTENSIONS}")
Expand All @@ -72,7 +72,7 @@ include(morpheus_utils/load)
morpheus_utils_initialize_package_manager(
MRC_USE_CONDA
BUILD_SHARED_LIBS
)
)

# Configure CUDA architecture
# NOTE: This MUST occur before any 'project' calls because of rapids_cmake requirements.
Expand Down Expand Up @@ -111,6 +111,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
if(${clang_version} VERSION_LESS_EQUAL "15")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcoroutines-ts")
endif()

endif()

# Now enable CUDA
Expand Down Expand Up @@ -166,6 +167,7 @@ include(environment/init_iwyu)

# ##################################################################################################
# - subdirectories ---------------------------------------------------------------------------------

add_subdirectory(cpp)

if(MRC_BUILD_PYTHON)
Expand All @@ -178,6 +180,7 @@ endif()

# ##################################################################################################
# - install export ---------------------------------------------------------------------------------

set(doc_string
[=[
Provide targets for mrc.
Expand Down Expand Up @@ -216,13 +219,13 @@ rapids_export(BUILD ${PROJECT_NAME}

# ##################################################################################################
# - debug info -------------------------------------------------------------------------------------
if(MRC_ENABLE_DEBUG_INFO)
if (MRC_ENABLE_DEBUG_INFO)
morpheus_utils_print_all_targets()

morpheus_utils_print_target_properties(
TARGETS
libmrc
pymrc
libmrc
pymrc
WRITE_TO_FILE
)

Expand Down
Loading