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

Catalyst: Add Tag to Catalyst2 TPL + Cleaning #448

Merged
merged 4 commits into from
Apr 1, 2024
Merged

Catalyst: Add Tag to Catalyst2 TPL + Cleaning #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3bbe78
Cleaned up Catalyst API 2 per Greg S suggestions in previous merge req
ajpelle Mar 15, 2024
6293058
Removed unnecessary cmake option: cmake_export_commands
ajpelle Mar 18, 2024
cd98698
Merge branch 'sandialabs:master' into catalyst_add_phactori_hook
Naapple Mar 28, 2024
97e99f6
Updated catalyst2 TPL to point to v2.0.0 tag
ajpelle Apr 1, 2024
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
1 change: 1 addition & 0 deletions TPL/catalyst2/runcmake.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ ${RPATH} \
-D CATALYST_BUILD_STUB_IMPLEMENTATION:BOOL=ON \
-D CATALYST_USE_MPI:BOOL=${MPI} \
-D CATALYST_BUILD_TESTING:BOOL=OFF \
-D CATALYST_WRAP_PYTHON:BOOL=OFF \
$EXTRA_ARGS \
..

Expand Down
1 change: 0 additions & 1 deletion cmake-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,6 @@ ${FAODEL_SYMBOLS} \
-D ParMETIS_ROOT:PATH=${PARMETIS_PATH} \
-D PNetCDF_ROOT:PATH=${PNETCDF_PATH} \
-D fmt_ROOT:PATH=${FMT_PATH} \
-D CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON \
$EXTRA_ARGS \
${ACCESS}

Expand Down
3 changes: 2 additions & 1 deletion install-tpl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,6 +901,7 @@ if [ "$CATALYST2" == "YES" ]
then
if [ "$FORCE" == "YES" ] || ! [ -e $INSTALL_PATH/lib/libcatalyst.${LD_EXT} ]
then
catalyst2_version="v2.0.0"
echo "${txtgrn}+++ Catalyst2${txtrst}"
cd $ACCESS || exit
cd TPL/catalyst2 || exit
Expand All @@ -915,7 +916,7 @@ then
then
echo "${txtgrn}+++ Configuring, Building, and Installing...${txtrst}"
cd catalyst || exit
git checkout master #todo: a specific version
git checkout ${catalyst2_version}
rm -rf build
mkdir build
cd build || exit
Expand Down
12 changes: 6 additions & 6 deletions packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_CatalystManager.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ namespace Iocatalyst {
errmsg << "Catalyst pipeline is not a multi-input pipeline";
IOSS_ERROR(errmsg);
}
auto name = p.catalystMultiInputPipelineName;
const auto name = p.catalystMultiInputPipelineName;
Copy link
Member

Choose a reason for hiding this comment

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

Could this be const auto &name

for (auto cp : catPipes) {
Copy link
Member

Choose a reason for hiding this comment

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

Should this be auto &cp similar to line 284 or maybe even const auto &cp?

if (cp.second.enableCatalystMultiInputPipeline &&
cp.second.catalystMultiInputPipelineName == name) {
Expand All @@ -280,7 +280,7 @@ namespace Iocatalyst {
errmsg << "Catalyst pipeline is not a multi-input pipeline";
IOSS_ERROR(errmsg);
}
auto name = p.catalystMultiInputPipelineName;
const auto name = p.catalystMultiInputPipelineName;
Copy link
Member

Choose a reason for hiding this comment

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

Same as above.

for (auto &cp : catPipes) {
if (cp.second.enableCatalystMultiInputPipeline &&
cp.second.catalystMultiInputPipelineName == name) {
Expand All @@ -295,8 +295,8 @@ namespace Iocatalyst {
void CatalystManager::broadCastString(IOSS_MAYBE_UNUSED std::string &s,
IOSS_MAYBE_UNUSED const Ioss::ParallelUtils &putils)
{
IOSS_PAR_UNUSED(s);
IOSS_PAR_UNUSED(putils);
IOSS_MAYBE_UNUSED(s);
IOSS_MAYBE_UNUSED(putils);
#ifdef SEACAS_HAVE_MPI
int size = s.size();
putils.broadcast(size);
Expand All @@ -310,8 +310,8 @@ namespace Iocatalyst {
void CatalystManager::broadCastStatusCode(IOSS_MAYBE_UNUSED bool &statusCode,
IOSS_MAYBE_UNUSED const Ioss::ParallelUtils &putils)
{
IOSS_PAR_UNUSED(statusCode);
IOSS_PAR_UNUSED(putils);
IOSS_MAYBE_UNUSED(statusCode);
IOSS_MAYBE_UNUSED(putils);
#ifdef SEACAS_HAVE_MPI

int code = statusCode;
Expand Down
Loading