forked from E3SM-Project/E3SM
-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Update Chicoma-CPU and add Chicoma-GPU #73
Closed
xylar
wants to merge
5
commits into
E3SM-Ocean-Discussion:master
from
xylar:machinefiles/update-chicoma
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| # For this file, fixes non-BFB behavior of stealth feature on pm-cpu with -O2 | ||
| set(NOOPT | ||
| eam/src/physics/cam/zm_conv.F90) | ||
|
|
||
| if (NOT DEBUG) | ||
| foreach(ITEM IN LISTS NOOPT) | ||
| e3sm_deoptimize_file("${ITEM}") | ||
| endforeach() | ||
| endif() | ||
|
|
||
|
|
||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| list(APPEND REDUCE_OPT_LIST | ||
| homme/src/share/derivative_mod_base.F90 | ||
| ) | ||
|
|
||
| # Can use this flag to avoid internal compiler error for this file (with nvidia/21.11) | ||
| if (NOT DEBUG) | ||
| foreach(ITEM IN LISTS REDUCE_OPT_LIST) | ||
| e3sm_add_flags("${ITEM}" " -Mnovect") | ||
| endforeach() | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| list(APPEND REDUCE_OPT_LIST | ||
| homme/src/share/derivative_mod_base.F90 | ||
| ) | ||
|
|
||
| # Can use this flag to avoid internal compiler error for this file (with nvidia/21.11) | ||
| if (NOT DEBUG) | ||
| foreach(ITEM IN LISTS REDUCE_OPT_LIST) | ||
| e3sm_add_flags("${ITEM}" " -Mnovect") | ||
| endforeach() | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| string(APPEND CONFIG_ARGS " --host=cray") | ||
| if (COMP_NAME STREQUAL gptl) | ||
| string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY") | ||
| endif() | ||
| string(APPEND SLIBS " -lblas -llapack") | ||
| set(CXX_LINKER "FORTRAN") | ||
| if (NOT DEBUG) | ||
| string(APPEND CFLAGS " -O2 -g") | ||
| endif() | ||
| if (NOT DEBUG) | ||
| string(APPEND FFLAGS " -O2 -g") | ||
| endif() | ||
| string(APPEND CXX_LIBS " -lstdc++") | ||
| set(MPICC "cc") | ||
| set(MPICXX "CC") | ||
| set(MPIFC "ftn") | ||
| set(SCC "gcc") | ||
| set(SCXX "g++") | ||
| set(SFC "gfortran") |
20 changes: 20 additions & 0 deletions
20
cime_config/machines/cmake_macros/gnugpu_chicoma-gpu.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| string(APPEND CONFIG_ARGS " --host=cray") | ||
| set(USE_CUDA "TRUE") | ||
| string(APPEND CPPDEFS " -DGPU") | ||
| if (COMP_NAME STREQUAL gptl) | ||
| string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY") | ||
| endif() | ||
| string(APPEND CPPDEFS " -DTHRUST_IGNORE_CUB_VERSION_CHECK") | ||
| string(APPEND SLIBS " -lblas -llapack") | ||
| string(APPEND CUDA_FLAGS " -ccbin CC -O2 -arch sm_80 --use_fast_math") | ||
| string(APPEND KOKKOS_OPTIONS " -DKokkos_ARCH_AMPERE80=On -DKokkos_ENABLE_CUDA=On -DKokkos_ENABLE_CUDA_LAMBDA=On -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=Off") | ||
| if (NOT DEBUG) | ||
| string(APPEND CFLAGS " -O2") | ||
| string(APPEND FFLAGS " -O2") | ||
| endif() | ||
| set(MPICC "cc") | ||
| set(MPICXX "CC") | ||
| set(MPIFC "ftn") | ||
| set(SCC "cc") | ||
| set(SCXX "CC") | ||
| set(SFC "ftn") |
24 changes: 24 additions & 0 deletions
24
cime_config/machines/cmake_macros/nvidia_chicoma-gpu.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| string(APPEND CONFIG_ARGS " --host=cray") | ||
| if (COMP_NAME STREQUAL gptl) | ||
| string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY") | ||
| endif() | ||
| string(APPEND SLIBS " -lblas -llapack") | ||
| set(CXX_LINKER "FORTRAN") | ||
| if (NOT DEBUG) | ||
| string(APPEND CFLAGS " -O2") | ||
| endif() | ||
| if (NOT DEBUG) | ||
| string(APPEND CXXFLAGS " -O2") | ||
| endif() | ||
| if (NOT DEBUG) | ||
| string(APPEND FFLAGS " -O2") | ||
| endif() | ||
| if (compile_threaded) | ||
| string(APPEND KOKKOS_OPTIONS " -DKokkos_ENABLE_OPENMP=Off") # work-around for nvidia as kokkos is not passing "-mp" for threaded build | ||
| endif() | ||
| set(MPICC "cc") | ||
| set(MPICXX "CC") | ||
| set(MPIFC "ftn") | ||
| set(SCC "cc") | ||
| set(SCXX "CC") | ||
| set(SFC "ftn") |
13 changes: 13 additions & 0 deletions
13
cime_config/machines/cmake_macros/nvidiagpu_chicoma-gpu.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| string(APPEND CONFIG_ARGS " --host=cray") | ||
| set(USE_CUDA "TRUE") | ||
| string(APPEND CPPDEFS " -DGPU") | ||
| if (COMP_NAME STREQUAL gptl) | ||
| string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY") | ||
| endif() | ||
| string(APPEND CPPDEFS " -DTHRUST_IGNORE_CUB_VERSION_CHECK") | ||
| string(APPEND CUDA_FLAGS " -ccbin CC -O2 -arch sm_80 --use_fast_math") | ||
| string(APPEND SLIBS " -lblas -llapack") | ||
| set(CXX_LINKER "FORTRAN") | ||
| set(SCC "cc") | ||
| set(SCXX "CC") | ||
| set(SFC "ftn") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mark-petersen, the issue you pointed out on Slack should be fixed here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, this should definitely be 128 for chicoma-cpu. Thanks.