Catalyst: Add Tag to Catalyst2 TPL + Cleaning (#448)

* Cleaned up Catalyst API 2 per Greg S suggestions in previous merge req * Removed unnecessary cmake option: cmake_export_commands * Updated catalyst2 TPL to point to v2.0.0 tag --------- Co-authored-by: Alex J. Pelletier <[email protected]>
sandialabs · Apr 1, 2024 · 395c1d3 · 395c1d3
1 parent dfb32ee
commit 395c1d3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/TPL/catalyst2/runcmake.sh b/TPL/catalyst2/runcmake.sh
@@ -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 \
 ..
 

diff --git a/cmake-config b/cmake-config
@@ -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}
 

diff --git a/install-tpl.sh b/install-tpl.sh
@@ -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
@@ -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

diff --git a/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_CatalystManager.C b/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_CatalystManager.C
@@ -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;
     for (auto cp : catPipes) {
       if (cp.second.enableCatalystMultiInputPipeline &&
           cp.second.catalystMultiInputPipelineName == name) {
@@ -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;
     for (auto &cp : catPipes) {
       if (cp.second.enableCatalystMultiInputPipeline &&
           cp.second.catalystMultiInputPipelineName == name) {
@@ -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);
@@ -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;