Merge pull request #3861 from vicentebolea/backport-from-master-manual (15326e65) · Commits · ecpcitest / ADIOS2

.github/workflows/everything.yml

+11 −11

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ jobs:
		outputs:
		num_code_changes: ${{ steps.get_code_changes.outputs.num_code_changes }}
		steps:
		- uses: actions/checkout@v3
		- uses: actions/checkout@v4
		with:
		fetch-depth: 0
		- name: Check for appropriately named topic branch
		@@ -69,10 +69,10 @@ jobs:
		image: ornladios/adios2:ci-formatting

		steps:
		- uses: actions/checkout@v3
		- uses: actions/checkout@v4
		with:
		path: gha
		- uses: actions/checkout@v3
		- uses: actions/checkout@v4
		with:
		ref: ${{ github.event.pull_request.head.sha }}
		path: source
		@@ -124,10 +124,10 @@ jobs:
		parallel: mpich

		steps:
		- uses: actions/checkout@v3
		- uses: actions/checkout@v4
		with:
		path: gha
		- uses: actions/checkout@v3
		- uses: actions/checkout@v4
		with:
		ref: ${{ github.event.pull_request.head.sha }}
		path: source
		@@ -231,10 +231,10 @@ jobs:
		compiler: xcode13_4_1

		steps:
		- uses: actions/checkout@v3
		- uses: actions/checkout@v4
		with:
		path: gha
		- uses: actions/checkout@v3
		- uses: actions/checkout@v4
		with:
		ref: ${{ github.event.pull_request.head.sha }}
		path: source
		@@ -280,10 +280,10 @@ jobs:
		shell: bash

		steps:
		- uses: actions/checkout@v3
		- uses: actions/checkout@v4
		with:
		path: gha
		- uses: actions/checkout@v3
		- uses: actions/checkout@v4
		with:
		ref: ${{ github.event.pull_request.head.sha }}
		path: source
		@@ -314,7 +314,7 @@ jobs:
		baseos: [ubuntu-bionic]

		steps:
		- uses: actions/checkout@v3
		- uses: actions/checkout@v4
		with:
		ref: ${{ github.event.pull_request.head.sha }}
		path: ci-source
		@@ -393,7 +393,7 @@ jobs:
		shell: bash -c "docker exec adios2-ci bash --login -e $(echo {0} \| sed 's\|/home/runner/work\|/__w\|g')"

		steps:
		- uses: actions/checkout@v3
		- uses: actions/checkout@v4
		with:
		repository: ${{ matrix.repo }}
		ref: ${{ matrix.ref }}

CMakeLists.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -196,6 +196,8 @@ if(ADIOS2_HAVE_MPI)
		add_definitions(-DOMPI_SKIP_MPICXX -DMPICH_SKIP_MPICXX)
		endif()

		cmake_dependent_option(ADIOS2_Blosc2_PREFER_SHARED "Prefer shared Blosc2 libraries"
		ON "Blosc2_shlib_available" OFF)

		#------------------------------------------------------------------------------#
		# POSIX O_DIRECT is only working for Unix in adios for now

CTestCustom.cmake.in

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
		"Warning #20208-D: '.' is treated as '.' in device code"
		"Warning: '.' is treated as '.' in device code"
		".was specified as both a system and non-system include directory."
		"Wunused-command-line-argument"
		)
		list(APPEND CTEST_CUSTOM_COVERAGE_EXCLUDE
		"./thirdparty/."

cmake/DetectOptions.cmake

+41 −7

Original line number	Diff line number	Diff line
		@@ -69,12 +69,35 @@ endfunction()

		# Blosc2
		if(ADIOS2_USE_Blosc2 STREQUAL AUTO)
		find_package(Blosc2 2.4)
		# Prefect CONFIG mode
		find_package(Blosc2 2.4 CONFIG QUIET)
		if(NOT Blosc2_FOUND)
		find_package(Blosc2 2.4 MODULE QUIET)
		endif()
		elseif(ADIOS2_USE_Blosc2)
		find_package(Blosc2 2.4 REQUIRED)
		# Prefect CONFIG mode
		find_package(Blosc2 2.4 CONFIG)
		if(NOT Blosc2_FOUND)
		find_package(Blosc2 2.4 MODULE REQUIRED)
		endif()
		endif()
		if(BLOSC2_FOUND)
		if(Blosc2_FOUND)
		set(ADIOS2_HAVE_Blosc2 TRUE)
		if(TARGET Blosc2::blosc2_shared)
		set(Blosc2_shlib_available ON)
		endif()

		set(adios2_blosc2_tgt Blosc2::Blosc2)
		if (Blosc2_VERSION VERSION_GREATER_EQUAL 2.10.1)
		if (Blosc2_shlib_available)
		set(adios2_blosc2_tgt Blosc2::blosc2_$<IF:$<BOOL:${ADIOS2_Blosc2_PREFER_SHARED}>,shared,static>)
		else()
		set(adios2_blosc2_tgt Blosc2::blosc2_static)
		endif()
		endif()

		add_library(adios2_blosc2 INTERFACE)
		target_link_libraries(adios2_blosc2 INTERFACE ${adios2_blosc2_tgt})
		endif()

		# BZip2
		@@ -407,9 +430,11 @@ if(ADIOS2_USE_SST AND NOT WIN32)
		endif()
		endif()
		if(ADIOS2_HAVE_MPI)
		set(CMAKE_REQUIRED_LIBRARIES MPI::MPI_C)
		include(CheckCSourceRuns)
		check_c_source_runs([=[
		set(CMAKE_REQUIRED_LIBRARIES "MPI::MPI_C;Threads::Threads")
		include(CheckCXXSourceRuns)
		check_cxx_source_runs([=[
		#include <chrono>
		#include <future>
		#include <mpi.h>
		#include <stdlib.h>

		@@ -419,9 +444,18 @@ if(ADIOS2_USE_SST AND NOT WIN32)

		int main()
		{
		// Timeout after 5 second
		auto task = std::async(std::launch::async, []() {
		std::this_thread::sleep_for(std::chrono::seconds(5));
		exit(EXIT_FAILURE);
		});

		char* port_name = new char[MPI_MAX_PORT_NAME];
		MPI_Init_thread(NULL, NULL, MPI_THREAD_MULTIPLE, NULL);
		MPI_Open_port(MPI_INFO_NULL, malloc(sizeof(char) * MPI_MAX_PORT_NAME));
		MPI_Open_port(MPI_INFO_NULL, port_name);
		MPI_Close_port(port_name);
		MPI_Finalize();
		exit(EXIT_SUCCESS);
		}]=]
		ADIOS2_HAVE_MPI_CLIENT_SERVER)
		unset(CMAKE_REQUIRED_LIBRARIES)

cmake/adios2-config-common.cmake.in

+5 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,11 @@ endif()

		set(ADIOS2_HAVE_Fortran @ADIOS2_HAVE_Fortran@)
		set(ADIOS2_HAVE_MPI @ADIOS2_HAVE_MPI@)
		set(ADIOS2_HAVE_CUDA @ADIOS2_HAVE_CUDA@)
		set(ADIOS2_HAVE_Kokkos @ADIOS2_HAVE_Kokkos@)
		set(ADIOS2_HAVE_Kokkos_CUDA @ADIOS2_HAVE_Kokkos_CUDA@)
		set(ADIOS2_HAVE_Kokkos_HIP @ADIOS2_HAVE_Kokkos_HIP@)
		set(ADIOS2_HAVE_Kokkos_SYCL @ADIOS2_HAVE_Kokkos_SYCL@)

		function(adios2_add_thirdparty_target PackageName)
		add_library(adios2::thirdparty::${PackageName} INTERFACE IMPORTED)

Admin message