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

openPMD-api: new CMake Control (tests) #312

Merged
merged 3 commits into from
Jan 15, 2021
Merged

openPMD-api: new CMake Control (tests) #312

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08190bc
openPMD-api: new CMake Control (tests)
ax3l Jan 12, 2021
0089f65
New commit
ax3l Jan 14, 2021
cc4c4ca
Apply suggestions from code review
MaxThevenet Jan 15, 2021
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
16 changes: 8 additions & 8 deletions cmake/dependencies/openPMD.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ function(find_openpmd)
include(FetchContent)
set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)

# see https://openpmd-api.readthedocs.io/en/0.12.0-alpha/dev/buildoptions.html
set(openPMD_USE_MPI ${HiPACE_MPI} CACHE INTERNAL "")
set(openPMD_USE_PYTHON OFF CACHE INTERNAL "")
set(BUILD_CLI_TOOLS OFF CACHE INTERNAL "") # FIXME
set(BUILD_EXAMPLES OFF CACHE INTERNAL "") # FIXME
set(BUILD_TESTING ${BUILD_TESTING} CACHE INTERNAL "") # FIXME
set(openPMD_INSTALL ${BUILD_SHARED_LIBS} CACHE INTERNAL "")
# see https://openpmd-api.readthedocs.io/en/0.13.1-alpha/dev/buildoptions.html
set(openPMD_USE_MPI ${HiPACE_MPI} CACHE INTERNAL "")
set(openPMD_USE_PYTHON OFF CACHE INTERNAL "")
set(openPMD_BUILD_CLI_TOOLS OFF CACHE INTERNAL "")
set(openPMD_BUILD_EXAMPLES OFF CACHE INTERNAL "")
set(openPMD_BUILD_TESTING OFF CACHE INTERNAL "")
set(openPMD_INSTALL ${BUILD_SHARED_LIBS} CACHE INTERNAL "")
MaxThevenet marked this conversation as resolved.
Show resolved Hide resolved

FetchContent_Declare(fetchedopenpmd
GIT_REPOSITORY ${HiPACE_openpmd_repo}
Expand Down Expand Up @@ -62,7 +62,7 @@ if(HiPACE_OPENPMD)
set(HiPACE_openpmd_repo "https://github.com/openPMD/openPMD-api.git"
CACHE STRING
"Repository URI to pull and build openPMD-api from if(HiPACE_openpmd_internal)")
set(HiPACE_openpmd_branch "0.13.1"
set(HiPACE_openpmd_branch "a9022ee30fe640a5ca1d92c30d0658cf2bfebec6"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a plan to go back to a release version here? If so, should we wait before merging this PR?

Copy link
Member Author

@ax3l ax3l Jan 14, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the plan is to use this until a new major release comes out.
It's still reproducible and fine and allows us to move fast.

This change is a bit invasive, so I am not 100% sure I can drop it in a 0.13.2 patch release (although I try to make it backwards compatible). Will check out, latest it will be in 0.14.0 :)

ax3l marked this conversation as resolved.
Show resolved Hide resolved
CACHE STRING
"Repository branch for HiPACE_openpmd_repo if(HiPACE_openpmd_internal)")

Expand Down