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

Jump to bottom

Remove some logic from the superbuild #2469

Merged
merged 2 commits into from
Sep 3, 2024
Merged

Remove some logic from the superbuild #2469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bb6073
Remove some logic that shouldn't have been in the superbuild CMake in…
benson31 Sep 3, 2024
8b57b45
Fixed whitespace.
bvanessen Sep 3, 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
4 changes: 4 additions & 0 deletions .gitlab/build-and-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ then
cmake --build build-deps
ninja -C build-deps gather-all

# Copy the suggested cmake prefix path to the install tree.
mkdir ${prefix}/logs
cp ${build_dir}/build-deps/lbann_sb_suggested_cmake_install_prefix.sh ${prefix}/logs

# Stamp these commits
cd ${build_dir}/build-deps/aluminum/src && git rev-parse HEAD > ${prefix}/al-prebuilt-hash.txt
cd ${build_dir}/build-deps/hydrogen/src && git rev-parse HEAD > ${prefix}/h-prebuilt-hash.txt
Expand Down
21 changes: 2 additions & 19 deletions scripts/superbuild/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,25 +154,8 @@ if (LBANN_SB_BUILD_AWS_OFI_RCCL)
message("export LD_LIBRARY_PATH=${LBANN_SB_AWS_OFI_RCCL_PREFIX}/lib:\$\{LD_LIBARY_PATH\}\n")
message("-----------------------------------------------------------------\n")
file(APPEND "${CMAKE_BINARY_DIR}/lbann_sb_suggested_cmake_prefix_path.sh"
"export AWS_OFI_RCCL_LIBDIR=${LBANN_SB_AWS_OFI_RCCL_PREFIX}/lib\n")
file(APPEND "${CMAKE_BINARY_DIR}/lbann_sb_suggested_cmake_prefix_path.sh"
"export LD_LIBRARY_PATH=${LBANN_SB_AWS_OFI_RCCL_PREFIX}/lib:\$\{LD_LIBRARY_PATH\}\n")
file(APPEND "${CMAKE_INSTALL_PREFIX}/logs/lbann_sb_suggested_cmake_prefix_path.sh"
"export AWS_OFI_RCCL_LIBDIR=${LBANN_SB_AWS_OFI_RCCL_PREFIX}/lib\n")
file(APPEND "${CMAKE_INSTALL_PREFIX}/logs/lbann_sb_suggested_cmake_prefix_path.sh"
"export LD_LIBRARY_PATH=${LBANN_SB_AWS_OFI_RCCL_PREFIX}/lib:\$\{LD_LIBRARY_PATH\}\n")
endif ()

if (LBANN_SB_FWD_LBANN_LBANN_WITH_PYTHON_FRONTEND)
message("-----------------------------------------------------------------\n")
message("LBANN was built with support for the Python Front End (PFE) (If you need to install it via pip you can in the LBANN site-packages with):")
message(" python3 -m pip install --target \$\{LBANN_PYTHON_SITE_PACKAGES\} pytest")
message(" python3 -m pip install --target \$\{LBANN_PYTHON_SITE_PACKAGES\} protobuf")
if (LBANN_SB_FWD_LBANN_LBANN_WITH_CNPY)
message("\nLBANN was built with support for the NumPy (If you need to install it via pip you can in the LBANN site-packages with):")
message(" python3 -m pip install --target \$\{LBANN_PYTHON_SITE_PACKAGES\} numpy")
endif ()
message("\n-----------------------------------------------------------------\n")
"export AWS_OFI_RCCL_LIBDIR=${LBANN_SB_AWS_OFI_RCCL_PREFIX}/lib
export LD_LIBRARY_PATH=${LBANN_SB_AWS_OFI_RCCL_PREFIX}/lib:\$\{LD_LIBRARY_PATH\}\n")
endif ()
bvanessen marked this conversation as resolved.
Show resolved Hide resolved

# Add a custom target for bundling all things up
Expand Down
1 change: 1 addition & 0 deletions scripts/superbuild/ci/ci_core_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ if [ ! -e ${INSTALL_PREFIX}/logs ]; then
mkdir -p ${INSTALL_PREFIX}/logs
fi
module -t list 2> ${INSTALL_PREFIX}/logs/modules.txt
cp ${BUILD_DIR}/lbann_sb_suggested_cmake_prefix_path.sh ${INSTALL_PREFIX}/logs

pushd ${BUILD_DIR}
ninja
Expand Down
Loading