Skip to content
Draft
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
42 changes: 21 additions & 21 deletions .github/workflows/everything.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:

runs-on: ubuntu-22.04
container:
image: ghcr.io/ornladios/adios2:ci-spack-${{ matrix.os }}-${{ matrix.compiler }}
image: ghcr.io/scottwittenburg/adios2:ci-spack-${{ matrix.os }}-${{ matrix.compiler }}
options: --shm-size=1g
env:
GH_YML_JOBNAME: ${{ matrix.os }}-${{ matrix.compiler }}${{ matrix.shared == 'static' && '-static' || ''}}-${{ matrix.parallel }}
Expand All @@ -130,33 +130,33 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu20.04]
compiler: [gcc8, gcc9, gcc10, clang6, clang10]
os: [ubuntu22.04]
compiler: [gcc9, gcc10, gcc12, clang11, clang14]
parallel: [mpich]
include:
- os: ubuntu20.04
compiler: gcc8
- os: ubuntu22.04
compiler: gcc9
parallel: ompi
- os: ubuntu20.04
compiler: gcc8
- os: ubuntu22.04
compiler: gcc9
parallel: serial
- os: ubuntu20.04
compiler: clang6
- os: ubuntu22.04
compiler: clang11
parallel: ompi
- os: ubuntu20.04
compiler: clang6
- os: ubuntu22.04
compiler: clang11
parallel: serial
- os: ubuntu20.04
compiler: gcc8
- os: ubuntu22.04
compiler: gcc9
parallel: serial
shared: static
- os: ubuntu20.04
compiler: gcc8
- os: ubuntu22.04
compiler: gcc9
shared: static
parallel: mpich
constrains: build_only
- os: ubuntu20.04
compiler: clang6
- os: ubuntu22.04
compiler: clang11
shared: static
parallel: mpich
constrains: build_only
Expand Down Expand Up @@ -535,12 +535,12 @@ jobs:
name: CodeQL
runs-on: ubuntu-latest
container:
image: 'ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8'
image: ghcr.io/scottwittenburg/adios2:ci-spack-ubuntu22.04-gcc9
env:
GH_YML_JOBNAME: ubuntu20.04-gcc8-serial-codeql
GH_YML_JOBNAME: ubuntu22.04-gcc9-serial-codeql
GH_YML_BASE_OS: Linux
GH_YML_MATRIX_OS: ubuntu20.04
GH_YML_MATRIX_COMPILER: gcc8
GH_YML_MATRIX_OS: ubuntu22.04
GH_YML_MATRIX_COMPILER: gcc9
GH_YML_MATRIX_PARALLEL: serial
permissions:
actions: read
Expand Down
41 changes: 0 additions & 41 deletions scripts/ci/cmake/ci-ubuntu20.04-gcc10-ompi.cmake

This file was deleted.

38 changes: 0 additions & 38 deletions scripts/ci/cmake/ci-ubuntu20.04-gcc8-serial.cmake

This file was deleted.

38 changes: 0 additions & 38 deletions scripts/ci/cmake/ci-ubuntu20.04-gcc9-ompi.cmake

This file was deleted.

38 changes: 0 additions & 38 deletions scripts/ci/cmake/ci-ubuntu20.04-gcc9-serial.cmake

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ include(ProcessorCount)
ProcessorCount(NCPUS)
math(EXPR N2CPUS "${NCPUS}*2")

set(ENV{CC} clang-6.0)
set(ENV{CXX} clang++-6.0)
set(ENV{CC} clang-11)
set(ENV{CXX} clang++-11)
set(ENV{FC} gfortran-11)

execute_process(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(ENV{CC} clang-6.0)
set(ENV{CXX} clang++-6.0)
set(ENV{CC} clang-11)
set(ENV{CXX} clang++-11)
set(ENV{FC} gfortran-11)

execute_process(
Expand Down Expand Up @@ -32,6 +32,8 @@ CMAKE_CXX_COMPILER_LAUNCHER=ccache
CMAKE_C_FLAGS:STRING=-Wall
CMAKE_CXX_FLAGS:STRING=-Wall
CMAKE_Fortran_FLAGS:STRING=-Wall

MPIEXEC_EXTRA_FLAGS:STRING=--oversubscribe
")

# We have a dedicated build for this setup without MPI
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(ENV{CC} clang-6.0)
set(ENV{CXX} clang++-6.0)
set(ENV{CC} clang-11)
set(ENV{CXX} clang++-11)
set(ENV{FC} gfortran-11)

execute_process(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(ENV{CC} clang-6.0)
set(ENV{CXX} clang++-6.0)
set(ENV{CC} clang-11)
set(ENV{CXX} clang++-11)
set(ENV{FC} gfortran-11)

execute_process(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ include(ProcessorCount)
ProcessorCount(NCPUS)
math(EXPR N2CPUS "${NCPUS}*2")

set(ENV{CC} clang-10)
set(ENV{CXX} clang++-10)
set(ENV{CC} clang-14)
set(ENV{CXX} clang++-14)
set(ENV{FC} gfortran-11)

execute_process(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(ENV{CC} clang-10)
set(ENV{CXX} clang++-10)
set(ENV{CC} clang-14)
set(ENV{CXX} clang++-14)
set(ENV{FC} gfortran-11)

execute_process(
Expand Down Expand Up @@ -31,6 +31,8 @@ CMAKE_CXX_COMPILER_LAUNCHER=ccache
CMAKE_C_FLAGS:STRING=-Wall
CMAKE_CXX_FLAGS:STRING=-Wall
CMAKE_Fortran_FLAGS:STRING=-Wall

MPIEXEC_EXTRA_FLAGS:STRING=--oversubscribe
")

set(CTEST_CMAKE_GENERATOR "Ninja")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(ENV{CC} clang-10)
set(ENV{CXX} clang++-10)
set(ENV{CC} clang-14)
set(ENV{CXX} clang++-14)
set(ENV{FC} gfortran-11)

execute_process(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ CMAKE_CXX_COMPILER_LAUNCHER=ccache
CMAKE_C_FLAGS:STRING=-Wall
CMAKE_CXX_FLAGS:STRING=-Wall
CMAKE_Fortran_FLAGS:STRING=-Wall

MPIEXEC_EXTRA_FLAGS:STRING=--oversubscribe
")

# We have a dedicated build for this setup without MPI
Expand Down
42 changes: 22 additions & 20 deletions scripts/ci/images/0002-adios2-add-xrootd-variant.patch
Original file line number Diff line number Diff line change
@@ -1,40 +1,42 @@
From dfe014d1eea8b0d0533b7519b4a4f58785e43298 Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Tue, 18 Jun 2024 18:23:06 -0400
From f6096d97e31f3a0d2b34f0ec74a39f7a9bca9d99 Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Tue, 14 Oct 2025 15:59:47 -0600
Subject: [PATCH] adios2: add xrootd variant

---
var/spack/repos/builtin/packages/adios2/package.py | 3 +++
1 file changed, 3 insertions(+)
var/spack/repos/builtin/packages/adios2/package.py | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py
index f6a5aba446..97f8322ff3 100644
index 8870366397..b3668c7e7b 100644
--- a/var/spack/repos/builtin/packages/adios2/package.py
+++ b/var/spack/repos/builtin/packages/adios2/package.py
@@ -95,6 +95,7 @@ class Adios2(CMakePackage, CudaPackage):
variant("cuda", default=False, when="@2.8:", description="Enable CUDA support")
variant("python", default=False, description="Enable the Python bindings")
variant("fortran", default=True, description="Enable the Fortran bindings")
+ variant("xrootd", default=True, description="Enable the XRootD")
@@ -107,6 +107,8 @@ class Adios2(CMakePackage, CudaPackage, ROCmPackage):
description="Enable support for in situ visualization plugin using ParaView Catalyst",
)

# Requires mature C++11 implementations
conflicts("%gcc@:4.7")
@@ -148,6 +149,7 @@ class Adios2(CMakePackage, CudaPackage):
depends_on("py-mpi4py@2.0.0:", when="+mpi +python", type=("build", "run"))
+ variant("xrootd", default=True, description="Enable the XRootD")
+
# Optional language bindings, C++11 and C always provided
variant("kokkos", default=False, when="@2.9:", description="Enable Kokkos support")
variant("sycl", default=False, when="@2.10:", description="Enable SYCL support")
@@ -207,6 +209,8 @@ class Adios2(CMakePackage, CudaPackage, ROCmPackage):
depends_on("aws-sdk-cpp", when="+aws")
depends_on("libcatalyst@2", when="+libcatalyst")

+ depends_on("xrootd~davix", when="+xrootd")
+
# error: invalid use of incomplete type 'PyFrameObject' {aka 'struct _frame'}
conflicts("^python@3.11:", when="@:2.7")

# Fix findmpi when called by dependees
# See https://github.com/ornladios/ADIOS2/pull/1632
@@ -197,6 +199,7 @@ def cmake_args(self):
@@ -273,6 +277,7 @@ def cmake_args(self):
from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic"),
from_variant("BUILD_SHARED_LIBS", "shared"),
from_variant("ADIOS2_USE_AWSSDK", "aws"),
+ from_variant("ADIOS2_USE_XRootD", "xrootd"),
from_variant("ADIOS2_USE_Blosc", "blosc"),
from_variant("ADIOS2_USE_Blosc2", "blosc2"),
from_variant("ADIOS2_USE_BZip2", "bzip2"),
from_variant("ADIOS2_USE_DataMan", "dataman"),
--
2.35.3
2.34.1

Loading
Loading