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.

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

feat: Simplify region statistics output in HDF5 #3314

Open
wants to merge 132 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
c71fb78
initial C++14 SFINAE implementation, to detect last accessed memory s…
wrtobin Apr 3, 2023
6d7b8b0
Merge branch 'develop' into feature/wrtobin/memspace-aware-packing
wrtobin Apr 6, 2023
7bd8094
modifying packing traits for naming clarity, encapsulating impl funct…
wrtobin Apr 6, 2023
29371d8
typo
wrtobin Apr 6, 2023
75c0d43
static_asserts to prevent internal misuse, and working on improving S…
wrtobin Apr 13, 2023
a4893ec
merge
wrtobin Apr 13, 2023
3f9f96e
resolve
wrtobin Apr 13, 2023
376bfb6
Merge branch 'develop' into feature/wrtobin/memspace-aware-packing
May 4, 2023
0b43ed5
after merge
May 4, 2023
4996988
uncrustify stage
May 5, 2023
2802ed3
an X hanging around
May 9, 2023
f9abced
modify traits
May 9, 2023
62a77ae
Merge branch 'develop' into feature/wrtobin/memspace-aware-packing
May 10, 2023
d561f91
update doc
May 10, 2023
39b02d5
Merge branch 'develop' into feature/wrtobin/memspace-aware-packing
wrtobin May 15, 2023
dd71040
Merge branch 'develop' into feature/wrtobin/memspace-aware-packing
wrtobin Jun 14, 2023
0c2de71
fix for isPackable device-packing check on raw type instead of declty…
wrtobin Jun 20, 2023
99365ab
checkTouch
wrtobin Jun 20, 2023
a744f03
wip
wrtobin Jun 22, 2023
6b5341b
Merge branch 'develop' into feature/wrtobin/memspace-aware-packing
Jul 12, 2023
39cba69
up hdf5 interface
Jul 12, 2023
3251a8f
fix unit test + remove ambigous constructor
Jul 12, 2023
33c370c
fix host pack arrayview
wrtobin Jul 19, 2023
e5dea8e
merge dev
wrtobin Jul 19, 2023
4e39f20
merge dev
wrtobin Jul 28, 2023
4931875
Merge branch 'develop' into feature/wrtobin/memspace-aware-packing
wrtobin Oct 16, 2023
adfb535
resolving merge-in
wrtobin Oct 16, 2023
0b75ec0
lvarray
wrtobin Oct 16, 2023
ca854fd
merging in develop
wrtobin Oct 17, 2023
99f66f6
resolving merge
wrtobin Nov 2, 2023
a8e17e0
unit test merge resolution
wrtobin Nov 2, 2023
fe0e484
Merge branch 'develop' into feature/wrtobin/memspace-aware-packing
Nov 15, 2023
7d4e6ba
fix
Nov 15, 2023
7689ad8
fix
Nov 15, 2023
af8708a
merge-in
wrtobin Dec 5, 2023
e511914
Merge branch 'develop' into feature/wrtobin/memspace-aware-packing
wrtobin Dec 5, 2023
80cf387
merge wip
wrtobin Jan 3, 2024
abae456
Merge branch 'develop' into feature/wrtobin/memspace-aware-packing
wrtobin Jan 3, 2024
3b97e49
merge-in from dev
wrtobin Apr 2, 2024
37fe3d1
mostly just cleanup
wrtobin Apr 2, 2024
2834c2b
cleanup and debugging
wrtobin Apr 2, 2024
4311984
merge-in from dev
wrtobin Apr 2, 2024
c61cc8f
formatting
wrtobin Apr 2, 2024
060cd1d
wip mpm fixes
wrtobin Apr 4, 2024
f81b0fc
Merge remote-tracking branch 'origin/develop' into feature/wrtobin/me…
arng40 Jun 27, 2024
bf7312d
merge fix
arng40 Jun 27, 2024
88935b9
generated files
arng40 Jun 27, 2024
f7a7210
Merge remote-tracking branch 'origin/develop' into feature/dudes/outp…
arng40 Aug 22, 2024
7e2fd6e
Region statistics transform to class
arng40 Aug 27, 2024
87914ce
exemple deck with new mecanism
arng40 Aug 27, 2024
6efd12b
class for component generation ( pack/timeHistoOuput)
arng40 Aug 27, 2024
9a560c0
code update
arng40 Aug 27, 2024
46a4d03
rst/test
arng40 Aug 27, 2024
786e359
embedded region for singlePhase
arng40 Aug 29, 2024
536a133
doc and cleanup
arng40 Aug 29, 2024
13a6c76
uncrustify
arng40 Aug 29, 2024
91f3440
constness
arng40 Aug 29, 2024
0c494b6
xsd
arng40 Aug 29, 2024
9410d7b
xsd....
arng40 Aug 29, 2024
bae55e9
Merge remote-tracking branch 'origin/develop' into feature/dudes/outp…
arng40 Aug 29, 2024
1956b2e
some simplifications & doc
arng40 Aug 30, 2024
1fe470f
remove unacessary lib
arng40 Aug 30, 2024
32fae3e
lv
arng40 Sep 25, 2024
e05ecfe
Merge remote-tracking branch 'origin/develop' into feature/dudes/outp…
arng40 Sep 25, 2024
9af6cd5
fix merge
arng40 Sep 25, 2024
856b118
singlephase test fail test correction
arng40 Sep 27, 2024
3e31824
fix signlephase test
arng40 Sep 27, 2024
243b35a
[draft] testController
arng40 Sep 27, 2024
f950edb
some refactor
arng40 Sep 27, 2024
8a4fd4c
attempt checkMultiPhaseFluxStatisticsMol test
arng40 Sep 27, 2024
dce6b5a
testFlowStatistics fixed
arng40 Sep 30, 2024
f863f4e
rename StatOutputController name
arng40 Sep 30, 2024
ff7df59
doxygen hpp correction
arng40 Sep 30, 2024
55faa37
doxygen
arng40 Sep 30, 2024
6cabaab
typo and unit test fix
wrtobin Sep 30, 2024
c621cf7
missing doxygen
arng40 Oct 1, 2024
c0c726c
Merge branch 'feature/dudes/output-regions' of https://github.com/GEO…
arng40 Oct 1, 2024
ba4a7fe
const + small modif
arng40 Oct 1, 2024
891fad6
uncrustify
arng40 Oct 1, 2024
3fe7e30
seems like a gcc-9 bug, trying a quick-fix
wrtobin Oct 1, 2024
961a6ef
lvarray update
wrtobin Oct 1, 2024
731a4cd
momentarily suppress possibly failing tests as a sanity check
wrtobin Oct 1, 2024
8645916
momentarily suppress possibly failing tests as a sanity check
wrtobin Oct 1, 2024
6965cd3
momentarily suppress possibly failing tests as a sanity check
wrtobin Oct 1, 2024
dd32dd4
momentarily suppress possibly failing tests as a sanity check
wrtobin Oct 1, 2024
e31ea01
lvarray, turn on one failing test
wrtobin Oct 1, 2024
cab13c0
maybe?
wrtobin Oct 1, 2024
4c00485
probably just a compiler bug
wrtobin Oct 1, 2024
33af708
what if we just turn those tests off on gcc-9.4.0 due to the double-f…
wrtobin Oct 1, 2024
ee7711d
lvarray
wrtobin Oct 1, 2024
5140549
turn tests back on
wrtobin Oct 1, 2024
866ed2d
Merge remote-tracking branch 'origin/develop' into feature/dudes/outp…
arng40 Oct 2, 2024
3ed16c5
attempting to fix doxygen issue
MelReyCG Oct 4, 2024
9cad9ec
[INCOMPLETE] setup unit test
arng40 Oct 21, 2024
4de2a91
test hdf generation
arng40 Oct 21, 2024
620af2d
Merge branch 'feature/dudes/output-regions' of https://github.com/GEO…
arng40 Oct 21, 2024
c8ef4f0
add file creation verification + timeHistory path verif
arng40 Oct 22, 2024
fcdb564
revert thermalLeakyWell
arng40 Oct 22, 2024
ae4f48a
Merge remote-tracking branch 'origin/develop' into feature/dudes/outp…
arng40 Oct 22, 2024
04fbba3
fix merge
arng40 Oct 22, 2024
f243ef5
add path in controller
arng40 Oct 31, 2024
ade7114
simpl on test
arng40 Nov 5, 2024
01dbd47
remove unneccesary "/" in test
arng40 Nov 5, 2024
b220585
revert xml
arng40 Nov 6, 2024
bedf53d
simplification, regionStats in cpp, revised test
arng40 Nov 7, 2024
f084c02
region stats class -> struct
arng40 Nov 8, 2024
f0c9998
remove statsVKS
arng40 Nov 8, 2024
b70666d
add context for stat output controller error
arng40 Nov 13, 2024
f7f0cac
Merge remote-tracking branch 'origin/develop' into feature/dudes/outp…
arng40 Nov 13, 2024
e4c89d2
wrapperHelper : can_memcpy -> is_device_packable_v
arng40 Nov 14, 2024
01f6fbf
remove unecessary assert + packCollection renaming
arng40 Nov 19, 2024
f6e7e5c
renaming + adding viewkeystruct
arng40 Nov 19, 2024
a1f5821
move testStatController to fluidFlowTest
arng40 Nov 19, 2024
ad8f7eb
revert setInputFlag
arng40 Nov 20, 2024
7f8a9e3
revised review (:
arng40 Nov 20, 2024
4e2e548
enabling trait that never could get verified
MelReyCG Dec 3, 2024
9302eae
missing logging capabilities
MelReyCG Dec 3, 2024
232ea0d
Merge branch 'feature/dudes/output-regions' of https://github.com/GEO…
MelReyCG Dec 3, 2024
1b9729c
Merge remote-tracking branch 'origin/develop' into feature/dudes/outp…
MelReyCG Dec 3, 2024
c4f29d0
fixing diverse merge issues
MelReyCG Dec 4, 2024
c632fb4
Merge remote-tracking branch 'origin/develop' into feature/dudes/outp…
MelReyCG Dec 4, 2024
00aa309
fixing merge issue
MelReyCG Dec 4, 2024
df36891
removed dead code
MelReyCG Dec 4, 2024
c99a7bf
Merge remote-tracking branch 'origin/develop' into feature/dudes/outp…
MelReyCG Dec 5, 2024
962ddc1
revert setInputFlag
arng40 Dec 10, 2024
a4b18eb
Merge branch 'feature/dudes/output-regions' of https://github.com/GEO…
arng40 Dec 10, 2024
022cbd1
viewkeyStruct move to fieldBase and variable renamed
arng40 Dec 10, 2024
8072e6f
Merge remote-tracking branch 'origin/develop' into feature/dudes/outp…
arng40 Dec 10, 2024
5d8c99c
change compoennt mass name
arng40 Jan 6, 2025
d6c7299
update submodule
arng40 Jan 13, 2025
c705a60
Merge remote-tracking branch 'origin/develop' into feature/dudes/outp…
arng40 Jan 13, 2025
1246065
update submodule
arng40 Jan 13, 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
Next Next commit
Merge branch 'develop' into feature/wrtobin/memspace-aware-packing
  • Loading branch information
Lionel Untereiner committed Jul 12, 2023
commit 6b5341bde0ef6ddf58f04c2f054f0e257e333cea
35 changes: 28 additions & 7 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ concurrency:
cancel-in-progress: true

env:
GEOSX_TPL_TAG: 220-932
GEOSX_TPL_TAG: 224-965

jobs:
# Matrix jobs will be cancelled if PR is a draft.
Expand Down Expand Up @@ -88,7 +88,8 @@ jobs:

linux_builds:
name: ${{ matrix.name }}
runs-on: ubuntu-22.04
# runs-on: ubuntu-22.04
runs-on: ${{ matrix.os }}
needs: [check_pull_request_is_not_a_draft]
strategy:

Expand All @@ -98,6 +99,7 @@ jobs:
include:
- name: Ubuntu CUDA debug (20.04, clang 10.0.0 + gcc 9.4.0, open-mpi 4.0.3, cuda-11.2.152)
DOCKER_REPOSITORY: geosx/ubuntu20.04-clang10.0.0-cuda11.2.152
OS: Runner_4core_16GB
CMAKE_BUILD_TYPE: Debug
BUILD_AND_TEST_ARGS: "--disable-unit-tests --build-exe-only --disable-schema-deployment"
ENABLE_HYPRE: ON
Expand All @@ -106,52 +108,62 @@ jobs:

- name: Ubuntu CUDA (20.04, clang 10.0.0 + gcc 9.4.0, open-mpi 4.0.3, cuda-11.2.152)
DOCKER_REPOSITORY: geosx/ubuntu20.04-clang10.0.0-cuda11.2.152
# OS: Runner_8core_32GB
OS: ubuntu-22.04
CMAKE_BUILD_TYPE: Release
BUILD_AND_TEST_ARGS: "--disable-unit-tests --disable-schema-deployment"
ENABLE_HYPRE: ON
ENABLE_HYPRE_DEVICE: CUDA
ENABLE_TRILINOS: OFF

- name: Centos (7.6, gcc 8.3.1, open-mpi 1.10.7, cuda 10.1.243)
DOCKER_REPOSITORY: geosx/centos7.6.1810-gcc8.3.1-cuda10.1.243
- name: Centos (7.7, gcc 8.3.1, open-mpi 1.10.7, cuda 11.8.0)
DOCKER_REPOSITORY: geosx/centos7.7-gcc8.3.1-cuda11.8.0
OS: ubuntu-22.04
CMAKE_BUILD_TYPE: Release
BUILD_AND_TEST_ARGS: "--disable-unit-tests --disable-schema-deployment"

- name: Ubuntu (20.04, gcc 9.3.0, open-mpi 4.0.3)
DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc9
OS: ubuntu-22.04
CMAKE_BUILD_TYPE: Release

- name: Ubuntu debug (20.04, gcc 10.3.0, open-mpi 4.0.3)
DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc10
OS: ubuntu-22.04
CMAKE_BUILD_TYPE: Debug

- name: Ubuntu (20.04, gcc 10.3.0, open-mpi 4.0.3)
DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc10
OS: ubuntu-22.04
CMAKE_BUILD_TYPE: Release

# Matrix jobs that deploy to Google Cloud
- name: Pecan GPU (centos 7.7, gcc 8.2.0, open-mpi 4.0.1, mkl 2019.5, cuda 10.2.89p2)
DOCKER_REPOSITORY: geosx/pecan-gpu-gcc8.2.0-openmpi4.0.1-mkl2019.5-cuda10.2.89p2
- name: Pecan GPU (centos 7.7, gcc 8.2.0, open-mpi 4.0.1, mkl 2019.5, cuda 11.5.119)
DOCKER_REPOSITORY: geosx/pecan-gpu-gcc8.2.0-openmpi4.0.1-mkl2019.5-cuda11.5.119
OS: ubuntu-22.04
CMAKE_BUILD_TYPE: Release
BUILD_AND_TEST_ARGS: "--disable-unit-tests --disable-schema-deployment"
BUILD_AND_TEST_ARGS: "--build-exe-only --disable-unit-tests --disable-schema-deployment"
HOST_CONFIG: host-configs/TOTAL/pecan-GPU.cmake
GCP_BUCKET: geosx/Pecan-GPU

- name: Pecan CPU (centos 7.7, gcc 8.2.0, open-mpi 4.0.1, mkl 2019.5)
DOCKER_REPOSITORY: geosx/pecan-cpu-gcc8.2.0-openmpi4.0.1-mkl2019.5
OS: ubuntu-22.04
CMAKE_BUILD_TYPE: Release
HOST_CONFIG: host-configs/TOTAL/pecan-CPU.cmake
GCP_BUCKET: geosx/Pecan-CPU

- name: Pangea 2 (centos 7.6, gcc 8.3.0, open-mpi 2.1.5, mkl 2019.3)
DOCKER_REPOSITORY: geosx/pangea2-gcc8.3.0-openmpi2.1.5-mkl2019.3
OS: ubuntu-22.04
CMAKE_BUILD_TYPE: Release
GCP_BUCKET: geosx/Pangea2
ENABLE_HYPRE: ON
ENABLE_TRILINOS: OFF

- name: Sherlock CPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10)
DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-openblas0.3.10-zlib1.2.11
OS: ubuntu-22.04
CMAKE_BUILD_TYPE: Release
HOST_CONFIG: host-configs/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10.cmake
GCP_BUCKET: geosx/Sherlock-CPU
Expand All @@ -160,6 +172,7 @@ jobs:

- name: Ubuntu (22.04, gcc 11.2.0, open-mpi 4.1.2)
DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc11
OS: ubuntu-22.04
CMAKE_BUILD_TYPE: Release
GCP_BUCKET: geosx/ubuntu22.04-gcc11

Expand Down Expand Up @@ -216,3 +229,11 @@ jobs:
GEOSX_BUNDLE=${TMP_DIR}/${GEOSX_EXPORT_DIR}.tar.gz
tar czf ${GEOSX_BUNDLE} --directory=${TMP_DIR} ${GEOSX_EXPORT_DIR}
CLOUDSDK_PYTHON=python3 gsutil cp -a public-read ${GEOSX_BUNDLE} gs://${GCP_BUCKET}/

# Convenience job - passes when all other jobs have passed.
check_that_all_jobs_succeeded:
runs-on: ubuntu-22.04
needs: [check_pull_request_is_not_a_draft, check_pull_request_is_assigned, check_submodules, code_style, documentation, linux_builds]
steps:
- name: Success
run: "true"
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ vm:

env:
global:
- GEOSX_TPL_TAG=223-942
- GEOSX_TPL_TAG=224-965
- secure: CGs2uH6efq1Me6xJWRr0BnwtwxoujzlowC4FHXHdWbNOkPsXf7nCgdaW5vthfD3bhnOeEUQSrfxdhTRtyU/NfcKLmKgGBnZOdUG4/JJK4gDSJ2Wp8LZ/mB0QEoODKVxbh+YtoAiHe3y4M9PGCs+wkNDw/3eEU00cK12DZ6gad0RbLjI3xkhEr/ZEZDZkcYg9yHAhl5bmpqoh/6QGnIg8mxIqdAtGDw+6tT0EgUqjeqc5bG5WwsamKzJItHSXD5zx8IJAlgDk4EzEGjZe0m56YnNfb9iwqqUsmL3Cuwgs7ByVDYw78JC5Kv42YqoxA5BxMT2mFsEe37TpYNXlzofU7ma2Duw9DGXWQd4IkTCcBxlyR0I0bfo0TmgO+y7PYG9lIyHPUkENemdozsZcWamqqkqegiEdRhDVYlSRo3mu7iCwTS6ZTALliVyEYjYxYb7oAnR3cNywXjblTCI8oKfgLSY+8WijM9SRl57JruIHLkLMCjmRI+cZBfv5tS2tYQTBPkygGrigrrN77ZiC7/TGyfggSN0+y0oYtOAgqEnBcKcreiibMW7tKcV2Z1RFD9ZvIkSc1EXLUPDP8FX1oyhmqBMqVo8LksrYLDJHQ05+F3YNgl2taSt7uMjQ4e8iZ3/IjFeMnbylDw+cj/RbS520HXsFPbWFm2Pb9pceA9n6GnY=

# The integrated test repository contains large data (using git lfs) and we do not use them here.
Expand All @@ -31,7 +31,7 @@ __geosx_linux_build: &__geosx_linux_build
# Optional BUILD_AND_TEST_ARGS to pass arguments to travis_build_and_test.sh script.
#
# We extract the location of the GEOSX_TPL from the container...
- GEOSX_TPL_DIR=$(docker run --rm ${DOCKER_REPOSITORY}:${GEOSX_TPL_TAG} /bin/bash -c 'echo ${GEOSX_TPL_DIR}')
- GEOSX_TPL_DIR=$(docker run --rm ${DOCKER_REPOSITORY}:${GEOSX_TPL_TAG} /bin/bash -c 'echo ${GEOSX_TPL_DIR}' | tail -1 )
# ... so we can install GEOSX alongside. This is assumed for bundling the binaries, so consider modifying with care.
- GEOSX_DIR=${GEOSX_TPL_DIR}/../GEOSX-${TRAVIS_COMMIT:0:7}
# We need to know where the code folder is mounted inside the container so we can run the script at the proper location!
Expand Down Expand Up @@ -181,17 +181,17 @@ jobs:
- ENABLE_HYPRE_DEVICE=CUDA
- ENABLE_TRILINOS=OFF
- stage: builds
name: Centos (7.6, gcc 8.3.1, open-mpi 1.10.7, cuda 10.1.243)
name: Centos (7.7, gcc 8.3.1, open-mpi 1.10.7, cuda 11.8.0)
<<: *__geosx_linux_build
env:
- DOCKER_REPOSITORY=geosx/centos7.6.1810-gcc8.3.1-cuda10.1.243
- DOCKER_REPOSITORY=geosx/centos7.7-gcc8.3.1-cuda11.8.0
- CMAKE_BUILD_TYPE=Release
- BUILD_AND_TEST_ARGS="--disable-unit-tests --build-exe-only --disable-schema-deployment"
- stage: builds
name: Pecan GPU (centos 7.7, gcc 8.2.0, open-mpi 4.0.1, mkl 2019.5, cuda 10.2.89p2)
name: Pecan GPU (centos 7.7, gcc 8.2.0, open-mpi 4.0.1, mkl 2019.5, cuda 11.5.119)
<<: *__geosx_auto_deploy
env:
- DOCKER_REPOSITORY=geosx/pecan-gpu-gcc8.2.0-openmpi4.0.1-mkl2019.5-cuda10.2.89p2
- DOCKER_REPOSITORY=geosx/pecan-gpu-gcc8.2.0-openmpi4.0.1-mkl2019.5-cuda11.5.119
- CMAKE_BUILD_TYPE=Release
- BUILD_AND_TEST_ARGS="--disable-unit-tests --build-exe-only --disable-schema-deployment"
- HOST_CONFIG=host-configs/TOTAL/pecan-GPU.cmake
Expand Down
24 changes: 10 additions & 14 deletions host-configs/LLNL/lassen-base.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,19 @@ set(ENABLE_OPENMP ON CACHE BOOL "" FORCE)
# LvArray sets this to the CMAKE_CXX_COMPILER.
set(CMAKE_CUDA_HOST_COMPILER ${MPI_CXX_COMPILER} CACHE STRING "")

set(ENABLE_CUDA_NVTOOLSEXT OFF CACHE BOOL "")

# ESSL
set(ENABLE_ESSL ON CACHE BOOL "")
set(ESSL_INCLUDE_DIRS /usr/tcetmp/packages/essl/essl-6.2.1/include CACHE STRING "")
set(ESSL_LIBRARIES /usr/tcetmp/packages/essl/essl-6.2.1/lib64/libesslsmpcuda.so
/usr/tce/packages/xl/xl-beta-2019.06.20/alllibs/libxlsmp.so
/usr/tce/packages/xl/xl-beta-2019.06.20/alllibs/libxlfmath.so
/usr/tce/packages/xl/xl-beta-2019.06.20/alllibs/libxlf90_r.so
set(ENABLE_ESSL ON CACHE BOOL "" FORCE )
set(ESSL_INCLUDE_DIRS /usr/tcetmp/packages/essl/essl-6.3.0.2/include CACHE STRING "" FORCE )
set(ESSL_LIBRARIES /usr/tcetmp/packages/essl/essl-6.3.0.2/lib64/libesslsmpcuda.so
${CUDA_TOOLKIT_ROOT_DIR}/lib64/libcublas.so
${CUDA_TOOLKIT_ROOT_DIR}/lib64/libcublasLt.so
${CUDA_TOOLKIT_ROOT_DIR}/lib64/libcudart.so
/usr/tcetmp/packages/essl/essl-6.2.1/lib64/liblapackforessl.so
/usr/tcetmp/packages/essl/essl-6.2.1/lib64/liblapackforessl_.so
/usr/tce/packages/xl/xl-beta-2019.06.20/alllibs/libxl.a
CACHE PATH "")

/usr/tcetmp/packages/essl/essl-6.3.0.2/lib64/liblapackforessl.so
/usr/tcetmp/packages/essl/essl-6.3.0.2/lib64/liblapackforessl_.so
CACHE PATH "" FORCE )

# TPL
set(ENABLE_PAPI OFF CACHE BOOL "")
set(SILO_BUILD_TYPE powerpc64-unknown-linux-gnu CACHE STRING "")
Expand All @@ -50,8 +49,6 @@ set(ENABLE_FESAPI OFF CACHE BOOL "" FORCE)
set(ENABLE_PVTPackage ON CACHE BOOL "")
set(ENABLE_PETSC OFF CACHE BOOL "" FORCE )



set( ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "" FORCE )
if( ${ENABLE_HYPRE_DEVICE} STREQUAL "HIP" OR ${ENABLE_HYPRE_DEVICE} STREQUAL "CUDA" )
set(ENABLE_TRILINOS OFF CACHE BOOL "" FORCE )
Expand All @@ -60,7 +57,6 @@ else()
set(GEOSX_LA_INTERFACE "Trilinos" CACHE STRING "" FORCE )
endif()


# Documentation
set(ENABLE_UNCRUSTIFY OFF CACHE BOOL "" FORCE)
set(ENABLE_DOXYGEN OFF CACHE BOOL "" FORCE)
Expand Down
16 changes: 16 additions & 0 deletions host-configs/LLNL/lassen-clang-10-cuda-11.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/lassen-clang-10-cuda-11.cmake)

# Fortran
set(CMAKE_Fortran_COMPILER /usr/tce/packages/xl/xl-2022.08.19-cuda-11.8.0/bin/xlf_r CACHE PATH "")
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -qarch=pwr9 -qtune=pwr9" CACHE STRING "")
set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "")
set(OpenMP_Fortran_FLAGS "-qsmp=omp" CACHE STRING "")
set(OpenMP_Fortran_LIB_NAMES "" CACHE STRING "")

# MPI
set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1 CACHE PATH "")
set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.8.0/bin/mpifort CACHE PATH "")

include(${CMAKE_CURRENT_LIST_DIR}/lassen-base.cmake)

set(ENABLE_CUDA_NVTOOLSEXT OFF CACHE BOOL "")
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/lassen-clang@upstream.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/lassen-clang-13-cuda-11.cmake)

# Fortran
set(CMAKE_Fortran_COMPILER /usr/tce/packages/xl/xl-2020.11.12/bin/xlf_r CACHE PATH "")
set(CMAKE_Fortran_COMPILER /usr/tce/packages/xl/xl-2022.08.19-cuda-11.8.0/bin/xlf_r CACHE PATH "")
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -qarch=pwr9 -qtune=pwr9" CACHE STRING "")
set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "")
set(OpenMP_Fortran_FLAGS "-qsmp=omp" CACHE STRING "")
set(OpenMP_Fortran_LIB_NAMES "" CACHE STRING "")

# MPI
set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-upstream-2019.03.26 CACHE PATH "")
set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2020.11.12/bin/mpifort CACHE PATH "")
set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-13.0.1-gcc-8.3.1 CACHE PATH "")
set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.8.0/bin/mpifort CACHE PATH "")

include(${CMAKE_CURRENT_LIST_DIR}/lassen-base.cmake)

# HYPRE options
set( ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "" )
set( ENABLE_HYPRE_MIXINT TRUE CACHE STRING "" )
set(ENABLE_CUDA_NVTOOLSEXT ON CACHE BOOL "")

# ATS
set(ATS_ARGUMENTS "--ats jsrun_omp --ats jsrun_bind=packed" CACHE PATH "")
30 changes: 0 additions & 30 deletions host-configs/LLNL/lassen-clang10-cuda11.cmake

This file was deleted.

30 changes: 0 additions & 30 deletions host-configs/LLNL/lassen-clang13-cuda11.cmake

This file was deleted.

21 changes: 0 additions & 21 deletions host-configs/LLNL/lassen-clang@upstream-NoMPI.cmake

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/lassen-gcc@8.3.1.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/lassen-gcc-8-cuda-11.cmake)

# C++
# The "-march=native -mtune=native" which LvArray adds breaks the PVT package.
Expand Down
4 changes: 4 additions & 0 deletions host-configs/LLNL/quartz-base.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ set(SPHINX_EXECUTABLE /usr/gapps/GEOSX/thirdPartyLibs/python/quartz-gcc-python/p

set(ENABLE_FESAPI OFF CACHE BOOL "" FORCE)

# caliper
set(ENABLE_CALIPER ON CACHE BOOL "" FORCE)
set(ENABLE_CALIPER_HYPRE ON CACHE BOOL "" FORCE)

# MKL
set(ENABLE_MKL ON CACHE BOOL "")
set(MKL_ROOT /usr/tce/packages/mkl/mkl-2022.1.0)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/quartz-clang@14.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/quartz-clang-14.cmake)

# Fortran
set(CMAKE_Fortran_COMPILER /usr/tce/packages/gcc/gcc-12.1.1-magic/bin/gfortran CACHE PATH "")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/quartz-gcc@12.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/quartz-gcc-12.cmake)

# C++
# The "-march=native -mtune=native" which LvArray adds breaks the PVT package.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/quartz-icc@19.0.4.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/quartz-icc-19.cmake)

# Fortran
set(CMAKE_Fortran_COMPILER ${COMPILER_DIR}/bin/intel64/ifort CACHE PATH "")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/tioga-cce@15.0.0.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/tioga-cce-15.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/tioga-base.cmake)

set( CONDUIT_DIR "${GEOSX_TPL_DIR}/conduit-0.8.7" CACHE PATH "" )
Expand Down
1 change: 0 additions & 1 deletion host-configs/Stanford/sherlock-base.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ set(ENABLE_WRAP_ALL_TESTS_WITH_MPIEXEC ON CACHE BOOL "")
if(ENABLE_CUDA)
set(CMAKE_CUDA_HOST_COMPILER ${MPI_CXX_COMPILER} CACHE STRING "")
set(CMAKE_CUDA_COMPILER ${CUDA_TOOLKIT_ROOT_DIR}/bin/nvcc CACHE STRING "")
set(CMAKE_CUDA_STANDARD 14 CACHE STRING "")
set(CMAKE_CUDA_FLAGS "-restrict -arch ${CUDA_ARCH} --expt-extended-lambda --expt-relaxed-constexpr -Werror cross-execution-space-call,reorder,deprecated-declarations" CACHE STRING "")
set(CMAKE_CUDA_FLAGS_RELEASE "-O3 -DNDEBUG -Xcompiler -DNDEBUG -Xcompiler -O3" CACHE STRING "")
set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO "-g -lineinfo ${CMAKE_CUDA_FLAGS_RELEASE}" CACHE STRING "")
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.