Skip to content

Specify CUDA version for login node builds #697

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

Merged
merged 8 commits into from
Nov 7, 2024
Merged

Specify CUDA version for login node builds #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7b49467
Specify CUDA version for login builds
max-Hawkins Nov 6, 2024
ad474d9
Update modules
sbryngelson Nov 6, 2024
8518493
Specify CUDA CC for Delta
max-Hawkins Nov 6, 2024
e614cf2
Set NVHPC_CUDA_HOME for Phoenix
max-Hawkins Nov 6, 2024
df131fb
Remove unneeded find CUDA
max-Hawkins Nov 7, 2024
e3292c5
bump python v (#695)
sbryngelson Nov 6, 2024
ce421bb
Fix multi-rank debug case problem (#696)
sbryngelson Nov 6, 2024
8c717df
Remove redundant find CUDA
max-Hawkins Nov 7, 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
14 changes: 7 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")

if (CMAKE_BUILD_TYPE STREQUAL "Debug")
add_compile_options(
-Wall
-Wall
-fcheck=all,no-array-temps
-fbacktrace
-fimplicit-none
Expand All @@ -142,7 +142,7 @@ if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
add_compile_options(
$<$<COMPILE_LANGUAGE:Fortran>:-fallow-invalid-boz>
$<$<COMPILE_LANGUAGE:Fortran>:-fallow-argument-mismatch>
$<$<COMPILE_LANGUAGE:Fortran>:-fcheck=bounds>
$<$<COMPILE_LANGUAGE:Fortran>:-fcheck=bounds>
)
endif()
elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")
Expand All @@ -155,7 +155,7 @@ elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")
)

add_link_options("SHELL:-hkeepfiles")

if (CMAKE_BUILD_TYPE STREQUAL "Debug")
add_compile_options(
"SHELL:-h acc_model=auto_async_none"
Expand Down Expand Up @@ -197,7 +197,7 @@ elseif ((CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC") OR (CMAKE_Fortran_COMPILER_

if (DEFINED ENV{MFC_CUDA_CC})
string(REGEX MATCHALL "[0-9]+" MFC_CUDA_CC $ENV{MFC_CUDA_CC})
message(STATUS "Found $MFC_CUDA_CC specified. GPU code will be generated for ${MFC_CUDA_CC}.")
message(STATUS "Found $MFC_CUDA_CC specified. GPU code will be generated for compute capability(ies) ${MFC_CUDA_CC}.")
endif()
endif()

Expand Down Expand Up @@ -231,7 +231,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Release")
else()
message(STATUS "IPO / LTO is NOT available")
endif()
endif()
endif()
endif()

if (CMAKE_BUILD_TYPE STREQUAL "Debug")
Expand Down Expand Up @@ -295,7 +295,7 @@ macro(HANDLE_SOURCES target useCommon)

string(TOUPPER ${target} ${target}_UPPER)

# Gather:
# Gather:
# * src/[<target>,(common)]/*.f90
# * (if any) <build>/modules/<target>/*.f90
file(GLOB ${target}_F90s CONFIGURE_DEPENDS "${${target}_DIR}/*.f90"
Expand Down Expand Up @@ -388,7 +388,7 @@ function(MFC_SETUP_TARGET)
# A little hacky, but it *is* an edge-case for *one* compiler.
if (NVHPC_USE_TWO_PASS_IPO)
add_library(${ARGS_TARGET}_lib OBJECT ${ARGS_SOURCES})
target_compile_options(${ARGS_TARGET}_lib PRIVATE
target_compile_options(${ARGS_TARGET}_lib PRIVATE
$<$<COMPILE_LANGUAGE:Fortran>:-Mextract=lib:${ARGS_TARGET}_lib>
$<$<COMPILE_LANGUAGE:Fortran>:-Minline>
)
Expand Down
2 changes: 1 addition & 1 deletion src/pre_process/m_mpi_proxy.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ contains
! Logistics
call MPI_BCAST(case_dir, len(case_dir), MPI_CHARACTER, 0, MPI_COMM_WORLD, ierr)

#:for VAR in ['t_step_old', 'm', 'n', 'p', 'm_glb', 'n_glb', 'p_glb', &
#:for VAR in ['t_step_old', 't_step_start', 'm', 'n', 'p', 'm_glb', 'n_glb', 'p_glb', &
& 'loops_x', 'loops_y', 'loops_z', 'model_eqns', 'num_fluids', &
& 'weno_order', 'precision', 'perturb_flow_fluid', &
& 'perturb_sph_fluid', 'num_patches', 'thermal', 'nb', 'dist_type',&
Expand Down
4 changes: 2 additions & 2 deletions toolchain/bootstrap/modules.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ if ! module load $MODULES; then
fi

if [ $(echo "$VARIABLES" | grep = | wc -c) -gt 0 ]; then
log " $ export $VARIABLES"
export $VARIABLES > /dev/null
log " $ export $(eval "echo $VARIABLES")"
export $(eval "echo $VARIABLES") > /dev/null
fi

# Don't check for Cray paths on Carpenter, otherwise do check if they exist
Expand Down
2 changes: 1 addition & 1 deletion toolchain/bootstrap/python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ if ! cmp "$(pwd)/toolchain/pyproject.toml" "$(pwd)/build/pyproject.toml" > /dev/
fi
done

if ! PIP_DISABLE_PIP_VERSION_CHECK=1 MAKEFLAGS=$nthreads pip3 install -e "$(pwd)/toolchain"; then
if ! PIP_DISABLE_PIP_VERSION_CHECK=1 MAKEFLAGS=$nthreads pip3 install "$(pwd)/toolchain"; then
error "(venv) Installation failed."

log "(venv) Exiting the$MAGENTA Python$COLOR_RESET virtual environment."
Expand Down
2 changes: 2 additions & 0 deletions toolchain/modules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ p GT Phoenix
p-all python/3.10.10
p-cpu gcc/12.3.0 openmpi/4.1.5
p-gpu nvhpc/24.5 hpcx/2.19-cuda cuda/12.1.1
p-gpu MFC_CUDA_CC=70,80,89,90 NVHPC_CUDA_HOME=$CUDA_HOME CC=nvc CXX=nvc++ FC=nvfortran

f OLCF Frontier
f-all cce/18.0.0 cpe/24.07 rocm/6.1.3 cray-mpich/8.1.28
Expand All @@ -56,6 +57,7 @@ d-all python/3.11.6
d-cpu gcc/11.4.0 openmpi
d-gpu nvhpc/24.1 cuda/12.3.0 openmpi/4.1.5+cuda cmake
d-gpu CC=nvc CXX=nvc++ FC=nvfortran
d-gpu MFC_CUDA_CC=80,86

c DoD Carpenter
c-all python/3.12.1
Expand Down
Loading