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.

Sign up for GitHub

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

Merge pull request #3893 from vicentebolea/find-threads-earlier #3922

Merged
merged 2 commits into from
Nov 16, 2023
Merged

Merge pull request #3893 from vicentebolea/find-threads-earlier #3922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b56bf3
Merge pull request #3893 from vicentebolea/find-threads-earlier
vicentebolea Nov 2, 2023
a22bf34
ci: use dockerhub images
vicentebolea Nov 15, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/everything.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:

runs-on: ubuntu-latest
container:
image: ornladios/adios2:ci-formatting
image: docker.io/ornladios/adios2:ci-formatting

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:

runs-on: ubuntu-latest
container:
image: ornladios/adios2:ci-spack-el8-${{ matrix.compiler }}-${{ matrix.parallel }}
image: docker.io/ornladios/adios2:ci-spack-el8-${{ matrix.compiler }}-${{ matrix.parallel }}
options: --shm-size=1g
env:
GH_YML_JOBNAME: ${{ matrix.os }}-${{ matrix.gpu_backend }}${{ matrix.compiler }}-${{ matrix.parallel }}
Expand Down
6 changes: 3 additions & 3 deletions cmake/DetectOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -544,9 +547,6 @@ if(AWSSDK_FOUND)
set(ADIOS2_HAVE_AWSSDK TRUE)
endif()

# Multithreading
find_package(Threads REQUIRED)

# Floating point detection
include(CheckTypeRepresentation)

Expand Down
Loading