Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added some cmake logic to capture the path to the python venv used du…
Browse files Browse the repository at this point in the history
…ring configuration.
bvanessen committed Aug 27, 2024
1 parent 0bc591c commit f3880b1
Showing 5 changed files with 28 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .gitlab/build-and-test.sh
Original file line number Diff line number Diff line change
@@ -218,7 +218,7 @@ then
else
ninja -C build-lbann install
fi

exit
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
echo "~~~~~ Installing Python Packages with PIP"
echo "~~~~~ $(date)"
8 changes: 4 additions & 4 deletions .gitlab/setup_env.sh
Original file line number Diff line number Diff line change
@@ -184,13 +184,13 @@ echo "----- DISTCONV: \"${build_distconv:-""}\""
echo "----- FFT: \"${build_fft:-""}\""
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"

VENV_DIR="${INSTALL_EXTERNALS_ROOT}/${SYSTEM_INSTALL_PREFIX_EXTERNALS}/venv"
if [[ ! -e "${VENV_DIR}/pyvenv.cfg" ]]; then
CMD="python3 -m venv ${VENV_DIR}"
export LBANN_PYTHON_VENV_DIR="${INSTALL_EXTERNALS_ROOT}/${SYSTEM_INSTALL_PREFIX_EXTERNALS}/venv"
if [[ ! -e "${LBANN_PYTHON_VENV_DIR}/pyvenv.cfg" ]]; then
CMD="python3 -m venv ${LBANN_PYTHON_VENV_DIR}"
echo "${CMD}"
${CMD}
fi
CMD="source ${VENV_DIR}/bin/activate"
CMD="source ${LBANN_PYTHON_VENV_DIR}/bin/activate"
echo "${CMD}"
${CMD}

12 changes: 12 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1202,6 +1202,13 @@ else ()
set(LBANN_EXTRA_MODULE_LOADS "")
endif ()

if (DEFINED ENV{LBANN_PYTHON_VENV_DIR})
set(LBANN_PYTHON_VENV_DIR "$ENV{LBANN_PYTHON_VENV_DIR}" CACHE STRING "")
else ()
set(LBANN_PYTHON_VENV_DIR "" CACHE STRING "")
endif()
message("BVE I have found a variable >${LBANN_PYTHON_VENV_DIR}<")

configure_file(
"${CMAKE_SOURCE_DIR}/cmake/configure_files/lbann_module.lua.in"
"${CMAKE_BINARY_DIR}/lbann_module.lua.install"
@@ -1216,10 +1223,15 @@ install(FILES "${CMAKE_BINARY_DIR}/lbann_module.lua.install"
install(FILES "${CMAKE_BINARY_DIR}/lbann_module.tcl.install"
RENAME "${LBANN_VERSION}"
DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/modulefiles/lbann")
message("BVE ready to install with VENV variable >${LBANN_PYTHON_VENV_DIR}<")
message("BVE ready to install with VENV variable >$ENV{LBANN_PYTHON_VENV_DIR}<")
install(CODE [===[
message("\n********************************************************************************")
message("LBANN is installed into ${CMAKE_INSTALL_PREFIX} - to load the LBANN module:")
message(" module use ${CMAKE_INSTALL_PREFIX}/etc/modulefiles")
message(" module load lbann")
message(" source ${LBANN_PYTHON_VENV_DIR}/bin/activate")
message(" source $ENV{LBANN_PYTHON_VENV_DIR}/bin/activate")
message(" source \${LBANN_PYTHON_VENV_DIR}/bin/activate")
message("********************************************************************************")
]===])
4 changes: 4 additions & 0 deletions cmake/configure_files/lbann_module.lua.in
Original file line number Diff line number Diff line change
@@ -90,6 +90,10 @@ prepend_path("LD_LIBRARY_PATH","@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@")
prepend_path("PYTHONPATH","@PYTHON_INSTALL_PREFIX@/@CMAKE_INSTALL_PYTHONDIR@")
prepend_path("LBANN_PYTHON_SITE_PACKAGES","@PYTHON_INSTALL_PREFIX@/@CMAKE_INSTALL_PYTHONDIR@")

pushenv("LBANN_PYTHON_VENV_DIR","@LBANN_PYTHON_VENV_DIR@")
pushenv("LBANN_PYTHON_VENV_SITE_PACKAGES","@LBANN_PYTHON_VENV_DIR@/@CMAKE_INSTALL_PYTHONDIR@")
prepend_path("PYTHONPATH","@LBANN_PYTHON_VENV_DIR@/@CMAKE_INSTALL_PYTHONDIR@")

pushenv("LBANN_DIR","@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DIR@")

@LBANN_EXTRA_MODULEPATH@
7 changes: 7 additions & 0 deletions cmake/configure_files/lbann_module.tcl.in
Original file line number Diff line number Diff line change
@@ -81,3 +81,10 @@ Configuration:

prepend-path PATH $root/@CMAKE_INSTALL_BINDIR@
prepend-path PYTHONPATH @PYTHON_INSTALL_PREFIX@/@CMAKE_INSTALL_PYTHONDIR@
prepend-path LBANN_PYTHON_SITE_PACKAGES @PYTHON_INSTALL_PREFIX@/@CMAKE_INSTALL_PYTHONDIR@

pushenv LBANN_PYTHON_VENV_DIR @LBANN_PYTHON_VENV_DIR@
pushenv LBANN_PYTHON_VENV_SITE_PACKAGES @LBANN_PYTHON_VENV_DIR@/@CMAKE_INSTALL_PYTHONDIR@
prepend-path PYTHONPATH @LBANN_PYTHON_VENV_DIR@/@CMAKE_INSTALL_PYTHONDIR@

pushenv LBANN_DIR @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DIR@

0 comments on commit f3880b1

Please sign in to comment.