Add catalyst and adios #214
Conversation
| ################################ | ||
| set(CONDUIT_DIR "${CMAKE_INSTALL_PREFIX}/conduit") | ||
| set(CONDUIT_URL "${TPL_MIRROR_DIR}/conduit-0.8.2.tar.gz") | ||
| set(CONDUIT_URL "${TPL_MIRROR_DIR}/conduit-0.8.6.zip") |
There was a problem hiding this comment.
this is not the Catalyst version, is this wanted ?
There was a problem hiding this comment.
Yes, I don't think we should tether geosx's conduitversion to catalyst's. This is just an update of the conduit package to get some things compiling
julienfausty
force-pushed
the
add-catalyst-and-adios
branch
from
b0a01ba to
7a00253
Compare
julienfausty
force-pushed
the
add-catalyst-and-adios
branch
2 times, most recently
from
acf1e38 to
84f47f5
Compare
julienfausty
force-pushed
the
add-catalyst-and-adios
branch
2 times, most recently
from
0fdc45f to
47f28b0
Compare
julienfausty
force-pushed
the
add-catalyst-and-adios
branch
from
47f28b0 to
a716a79
Compare
julienfausty
force-pushed
the
add-catalyst-and-adios
branch
from
a716a79 to
4a96262
Compare
Mangling VTK uses an inline namespace to change the VTK symbols in the binary so as to allow multiple VTK binaries to coexist
julienfausty
force-pushed
the
add-catalyst-and-adios
branch
from
4a96262 to
ff57a33
Compare
* downgrade fmt 10.0.0 -> 9.1.0 * patch raja for stdexcept and cstdlib
julienfausty
force-pushed
the
add-catalyst-and-adios
branch
from
26b0f75 to
6e1dad0
Compare
julienfausty
force-pushed
the
add-catalyst-and-adios
branch
from
6e1dad0 to
b1d57d6
Compare
CharlesGueunet
left a comment
CharlesGueunet
left a comment
There was a problem hiding this comment.
LGTM after small questions / remarks
| if( ENABLE_VTK ) | ||
| set( VTK_DIR "${CMAKE_INSTALL_PREFIX}/vtk" ) | ||
| set( VTK_URL "${TPL_MIRROR_DIR}/VTK-9.2.6.tar.gz" ) | ||
| set( VTK_URL "${TPL_MIRROR_DIR}/VTK-59d89108f4.tar.gz" ) |
There was a problem hiding this comment.
you do not need to change, but a think a nightly (with a date as a version) is slightly more readable.
Can you comment that this is between 9.2.6 and 9.3.0 ?
There was a problem hiding this comment.
yep, I was not aware of the nightly VTK downloads, I will use that and update the repo
CMakeLists.txt
Outdated
| ################################ | ||
| set(FMT_DIR "${CMAKE_INSTALL_PREFIX}/fmt") | ||
| set(FMT_URL "${TPL_MIRROR_DIR}/fmt-10.0.0.tar.gz") | ||
| set(FMT_URL "${TPL_MIRROR_DIR}/fmt-9.1.0.zip") |
There was a problem hiding this comment.
was a compiler issue with gcc14
| PATCH_COMMAND patch -p0 < ${TPL_MIRROR_DIR}/vtkXMLReader-fpe.patch | ||
| BUILD_COMMAND ${TPL_BUILD_COMMAND} | ||
| INSTALL_COMMAND "${TPL_INSTALL_COMMAND}" | ||
| PATCH_COMMAND patch -p1 < ${TPL_MIRROR_DIR}/VTK-ABI.patch |
There was a problem hiding this comment.
why is this a patch ? seems like it should be updated upstream
There was a problem hiding this comment.
This has been updated upstream, but to avoid wasting time with the merge I made this patch and then forgot about it. I will update VTK with a nightly build and take out the patch
There was a problem hiding this comment.
the 9.3.0-rc1 version has a broken ABI, let's wait for the release before making the changes
3 participants
This pull request comes in support of this one in GEOSX: GEOS-DEV/GEOS#2250
It performs the following operations
Add new dependencies into
thirdPartyLibsrepository:catalystitself version 2.0.0-rc3adios/catalystimplementation on commit af3b35fadios2v2.8.3conduitfrom0.8.2to 0.8.6VTKto 49361a2 for mangling capabilities