Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 0 additions & 33 deletions .github/workflows/docker_build_tpls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,6 @@ jobs:
GCC_VERSION: 13
SPEC: "~pygeosx +docs %gcc-13"

- name: Ubuntu 24.04 - gcc 13 (+docs +hypredrive)
RUNS_ON: ubuntu-latest
TPL_DOCKERFILE: docker/tpl-ubuntu.Dockerfile
DOCKER_BASE_IMAGE_TAG: 24.04-gcc13
DOCKER_BASE_IMAGE_REPO: geosx/ubuntu
DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13-hypredrive
GCC_VERSION: 13
SPEC: "~pygeosx +docs +hypredrive %gcc-13"

- name: Ubuntu 24.04 - clang 19
RUNS_ON: ubuntu-latest
TPL_DOCKERFILE: docker/tpl-ubuntu.Dockerfile
Expand Down Expand Up @@ -86,14 +77,6 @@ jobs:
DOCKER_REPOSITORY: geosx/rockylinux8-gcc13
SPEC: "~pygeosx ~docs %gcc-13"

- name: Rocky Linux 8 - gcc 13 (+hypredrive)
RUNS_ON: ubuntu-latest
TPL_DOCKERFILE: docker/tpl-rockylinux.Dockerfile
DOCKER_BASE_IMAGE_TAG: 8-gcc13
DOCKER_BASE_IMAGE_REPO: geosx/rockylinux
DOCKER_REPOSITORY: geosx/rockylinux8-gcc13-hypredrive
SPEC: "~pygeosx ~docs +hypredrive %gcc-13"

- name: Rocky Linux 8 - clang 19
RUNS_ON: ubuntu-latest
TPL_DOCKERFILE: docker/tpl-rockylinux.Dockerfile
Expand All @@ -120,14 +103,6 @@ jobs:
GCC_VERSION: 13
SPEC: "+cuda cuda_arch=86,120 ~openmp ~pygeosx ~docs %gcc-13 ^cuda@12.9.1+allow-unsupported-compilers"

- name: Ubuntu 24.04 - gcc 13 + CUDA 12.9.1 (+hypredrive)
RUNS_ON: streak2
TPL_DOCKERFILE: docker/tpl-ubuntu.Dockerfile
DOCKER_BASE_IMAGE_TAG: 24.04-gcc13-cuda12.9.1
DOCKER_BASE_IMAGE_REPO: geosx/ubuntu
DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13-cuda12.9.1-hypredrive
GCC_VERSION: 13
SPEC: "+cuda cuda_arch=86,120 ~openmp ~pygeosx ~docs +hypredrive %gcc-13 ^cuda@12.9.1+allow-unsupported-compilers"

# CUDA 13 is blocked by the pinned RAJA package:
# raja: '^cuda@13:' conflicts with '+cuda'
Expand Down Expand Up @@ -166,14 +141,6 @@ jobs:
DOCKER_REPOSITORY: geosx/rockylinux8-gcc13-cuda12.9.1
SPEC: "+cuda cuda_arch=86,120 ~openmp ~pygeosx ~docs %gcc-13 ^cuda@12.9.1+allow-unsupported-compilers"

- name: Rocky Linux 8 - gcc 13 + CUDA 12.9.1 (+hypredrive)
RUNS_ON: streak2
TPL_DOCKERFILE: docker/tpl-rockylinux.Dockerfile
DOCKER_BASE_IMAGE_TAG: 8-gcc13-cuda12.9.1
DOCKER_BASE_IMAGE_REPO: geosx/rockylinux
DOCKER_REPOSITORY: geosx/rockylinux8-gcc13-cuda12.9.1-hypredrive
SPEC: "+cuda cuda_arch=86,120 ~openmp ~pygeosx ~docs +hypredrive %gcc-13 ^cuda@12.9.1+allow-unsupported-compilers"

# Rocky8 clang19 CUDA 12.9.1 is blocked by SuperLU_DIST using
# C++11 with CUDA 12.9 + clang19 + GCC 14 libstdc++.
# - name: Rocky Linux 8 - clang 19 + CUDA 12.9.1
Expand Down
3 changes: 0 additions & 3 deletions scripts/setupLC-TPL-uberenv.bash
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ function launch_jobs() {
ALLOC_CMD="srun -N 1 --exclusive -t 60 -A vortex"
"${UBERENV_HELPER}" "$INSTALL_DIR" dane gcc-12 "+docs %%gcc-12 ${COMMON}" "${ALLOC_CMD}" "$@" &
"${UBERENV_HELPER}" "$INSTALL_DIR" dane gcc-13 "+docs %%gcc-13 ${COMMON}" "${ALLOC_CMD}" "$@" &
"${UBERENV_HELPER}" "$INSTALL_DIR" dane gcc-13-hypredrive "+docs +hypredrive %%gcc-13 ${COMMON}" "${ALLOC_CMD}" "$@" &
"${UBERENV_HELPER}" "$INSTALL_DIR" dane llvm-14 "+docs %%clang-14 ${COMMON}" "${ALLOC_CMD}" "$@" &
"${UBERENV_HELPER}" "$INSTALL_DIR" dane llvm-19 "+docs %%clang-19 ${COMMON}" "${ALLOC_CMD}" "$@" &
;;
Expand All @@ -100,7 +99,6 @@ function launch_jobs() {
ALLOC_CMD="srun -N 1 --exclusive -t 60 -A vortex"
"${UBERENV_HELPER}" "$INSTALL_DIR" matrix gcc-12-cuda-12.6 "+cuda ~uncrustify cuda_arch=90 %%gcc-12 ^cuda@12.6.0+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" &
"${UBERENV_HELPER}" "$INSTALL_DIR" matrix gcc-13-cuda-12.9 "+cuda ~uncrustify cuda_arch=90 %%gcc-13 ^cuda@12.9.1+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" &
"${UBERENV_HELPER}" "$INSTALL_DIR" matrix gcc-13-cuda-12.9-hypredrive "+cuda ~uncrustify +hypredrive cuda_arch=90 %%gcc-13 ^cuda@12.9.1+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" &
"${UBERENV_HELPER}" "$INSTALL_DIR" matrix llvm-14-cuda-12.6 "+cuda ~uncrustify cuda_arch=90 %%clang-14 ^cuda@12.6.0+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" &
"${UBERENV_HELPER}" "$INSTALL_DIR" matrix llvm-19-cuda-12.9 "+cuda ~uncrustify cuda_arch=90 %%clang-19 ^cuda@12.9.1+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" &
;;
Expand All @@ -109,7 +107,6 @@ function launch_jobs() {
ALLOC_CMD="salloc -N 1 --exclusive -p pdebug -t 60 -A vortex"
"${UBERENV_HELPER}" "$INSTALL_DIR" tuolumne cce-20-rocm-6.4.3 "+rocm~pygeosx~trilinos~petsc~docs amdgpu_target=gfx942 %%cce-20 ${COMMON}" "${ALLOC_CMD}" "$@" &
"${UBERENV_HELPER}" "$INSTALL_DIR" tuolumne llvm-amdgpu-6.4.3 "+rocm~pygeosx~trilinos~petsc~docs amdgpu_target=gfx942 %%llvm-amdgpu_6_4_3 ${COMMON}" "${ALLOC_CMD}" "$@" &
"${UBERENV_HELPER}" "$INSTALL_DIR" tuolumne llvm-amdgpu-6.4.3-hypredrive "+rocm~pygeosx~trilinos~petsc~docs+hypredrive amdgpu_target=gfx942 %%llvm-amdgpu_6_4_3 ${COMMON}" "${ALLOC_CMD}" "$@" &
;;

*)
Expand Down
2 changes: 1 addition & 1 deletion scripts/spack_configs/macOS/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ spack:
buildable: false
externals:
- spec: perl@5.34.1
prefix: /opt/homebrew/opt/perl
prefix: /usr
pkg-config:
buildable: false
externals:
Expand Down
28 changes: 28 additions & 0 deletions scripts/spack_packages/packages/adios2/2.10-enable-rocm6.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From c718e99a9e226b7327ab41396823873999206e38 Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Thu, 27 Jun 2024 18:25:58 -0400
Subject: [PATCH] kokkos: support ROCM >=6

---
source/adios2/helper/kokkos/adiosKokkos.cpp | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/source/adios2/helper/kokkos/adiosKokkos.cpp b/source/adios2/helper/kokkos/adiosKokkos.cpp
index e0599944e..d2619f0d4 100644
--- a/source/adios2/helper/kokkos/adiosKokkos.cpp
+++ b/source/adios2/helper/kokkos/adiosKokkos.cpp
@@ -85,7 +85,11 @@ bool IsGPUbuffer(const void *ptr)
hipError_t ret;
hipPointerAttribute_t attr;
ret = hipPointerGetAttributes(&attr, ptr);
+#if defined(ROCM_VERSION_MAJOR) && ROCM_VERSION_MAJOR < 6
if (ret == hipSuccess && attr.memoryType == hipMemoryTypeDevice)
+#else
+ if (ret == hipSuccess && attr.type == hipMemoryTypeDevice)
+#endif
{
return true;
}
--
2.35.3

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From abbe0f81d78403a62444b1a76222b9a226fd17c6 Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Mon, 22 Apr 2024 20:52:49 -0700
Subject: [PATCH] fix py11bind stdint dep

---
thirdparty/pybind11/pybind11/include/pybind11/pybind11.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/thirdparty/pybind11/pybind11/include/pybind11/pybind11.h b/thirdparty/pybind11/pybind11/include/pybind11/pybind11.h
index fa98f7c18..6992c3d55 100644
--- a/thirdparty/pybind11/pybind11/include/pybind11/pybind11.h
+++ b/thirdparty/pybind11/pybind11/include/pybind11/pybind11.h
@@ -47,6 +47,7 @@
#include "detail/class.h"
#include "detail/init.h"

+#include <cstdint>
#include <memory>
#include <vector>
#include <string>
--
2.35.3

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 5aed0d5c3ecb7afbd56a786243b2bc8811e0fbdd Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Fri, 14 May 2021 18:22:19 -0700
Subject: [PATCH] Fix Broken Endinage Reverse Compile

Add right type in comparison.
---
source/adios2/helper/adiosMemory.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/adios2/helper/adiosMemory.cpp b/source/adios2/helper/adiosMemory.cpp
index c3a4246a91..3bf8c89adc 100644
--- a/source/adios2/helper/adiosMemory.cpp
+++ b/source/adios2/helper/adiosMemory.cpp
@@ -29,7 +29,7 @@ void CopyPayloadStride(const char *src, const size_t payloadStride, char *dest,
#ifdef ADIOS2_HAVE_ENDIAN_REVERSE
if (endianReverse)
{
- if (destType == "")
+ if (destType == DataType::None)
{
}
#define declare_type(T) \

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
From 80e4739fb53b0b7e02dae48b928d8b8247992763 Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Thu, 2 Nov 2023 12:18:49 -0400
Subject: [PATCH] cmake: find threads package first

---
cmake/DetectOptions.cmake | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/DetectOptions.cmake b/cmake/DetectOptions.cmake
index 3f511e02a..615995b71 100644
--- a/cmake/DetectOptions.cmake
+++ b/cmake/DetectOptions.cmake
@@ -67,6 +67,9 @@ function(lists_get_prefix listVars outVar)
set(${outVar} "${prefix}" PARENT_SCOPE)
endfunction()

+# Multithreading
+find_package(Threads REQUIRED)
+
# Blosc2
if(ADIOS2_USE_Blosc2 STREQUAL AUTO)
# Prefect CONFIG mode
@@ -554,9 +557,6 @@ if(AWSSDK_FOUND)
set(ADIOS2_HAVE_AWSSDK TRUE)
endif()

-# Multithreading
-find_package(Threads REQUIRED)
-
# Floating point detection
include(CheckTypeRepresentation)

--
2.35.3

Loading