Merge Pull Request #7368 from gsjaardema/Trilinos/seacas-parallel-net…

…cdf-detect Automatically Merged using Trilinos Pull Request AutoTester PR Title: Seacas parallel netcdf detect PR Author: gsjaardema
trilinos · May 14, 2020 · 1724a8a · 1724a8a
2 parents 281edf0 + 794c5ce
commit 1724a8a
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 14 deletions.
diff --git a/cmake/tribits/common_tpls/FindTPLNetcdf.cmake b/cmake/tribits/common_tpls/FindTPLNetcdf.cmake
@@ -75,7 +75,7 @@ IF (Netcdf_ALLOW_PREFIND)
       "True if netcdf enables netcdf-4")
     set(TPL_Netcdf_Enables_PNetcdf ${NetCDF_NEEDS_PNetCDF} CACHE BOOL
       "True if netcdf enables pnetcdf")
-    set(TPL_Netcdf_PARALLEL ${NetCDF_PARALLEL} CACHE BOOL
+    set(TPL_Netcdf_PARALLEL ${NetCDF_PARALLEL} CACHE INTERNAL
       "True if netcdf compiled with parallel enabled")
     set(TPL_Netcdf_LIBRARY_DIRS ${_hdf5_LIBRARY_SEARCH_DIRS} CACHE PATH
       "${DOCSTR} library files")
@@ -103,3 +103,30 @@ TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( Netcdf
 # variables TPL_Netcdf_INCLUDE_DIRS and TPL_Netcdf_LIBRARIES and then print
 # them out (and set some other standard variables as well).  This is the final
 # "hook" into the TriBITS TPL system.
+
+# If the `find_package(NetCDF)` is not run, then this may not be set
+# Need to determine how this is set in the library that is being used...
+
+if ("${TPL_Netcdf_PARALLEL}" STREQUAL "")  
+   ASSERT_DEFINED(TPL_Netcdf_INCLUDE_DIRS)
+   find_path(meta_path
+      NAMES "netcdf_meta.h"
+      HINTS ${TPL_Netcdf_INCLUDE_DIRS}
+      NO_DEFAULT_PATH)
+
+   if (meta_path)
+      # Search meta for NC_HAS_PARALLEL setting...
+      # Note that there is both NC_HAS_PARALLEL and NC_HAS_PARALLEL4, only want first...
+      file(STRINGS "${meta_path}/netcdf_meta.h" netcdf_par_string REGEX "NC_HAS_PARALLEL ")
+      string(REGEX MATCH "[01]" netcdf_par_val "${netcdf_par_string}")
+      if (netcdf_par_val EQUAL 1)
+         set(TPL_Netcdf_PARALLEL True CACHE INTERNAL 
+	     "True if netcdf compiled with parallel enabled")
+      endif()
+   endif()
+   if ("${TPL_Netcdf_PARALLEL}" STREQUAL "")  
+      set(TPL_Netcdf_PARALLEL False CACHE INTERNAL 
+          "True if netcdf compiled with parallel enabled")
+   endif()
+endif()
+message(STATUS "TPL_Netcdf_PARALLEL is ${TPL_Netcdf_PARALLEL}")
diff --git a/packages/seacas/applications/epu/pepu.C b/packages/seacas/applications/epu/pepu.C
@@ -9,7 +9,7 @@
 // concatenates EXODUS/GENESIS output from parallel processors to a single file
 
 #include <exodusII.h>
-#ifdef PARALLEL_AWARE_EXODUS
+#ifdef SEACAS_HAVE_MPI
 #ifndef DISABLE_PARALLEL_EPU
 #define ENABLE_PARALLEL_EPU 1
 #endif

diff --git a/packages/seacas/libraries/exodus/CMakeLists.txt b/packages/seacas/libraries/exodus/CMakeLists.txt
@@ -10,7 +10,7 @@ INCLUDE_DIRECTORIES(
 
 FILE(GLOB SOURCES src/ex_*.c)
 
-if (${TPL_Netcdf_PARALLEL})
+if (TPL_Netcdf_PARALLEL)
    SET(PARALLEL_AWARE_EXODUS ON)
 endif()
 

diff --git a/packages/seacas/libraries/ioss/src/CMakeLists.txt b/packages/seacas/libraries/ioss/src/CMakeLists.txt
@@ -7,15 +7,15 @@ IF (${PROJECT_NAME}_ENABLE_Pamgen)
   SET(SEACAS_HAVE_PAMGEN ON)
 ENDIF()
 
-IF (${TPL_ENABLE_MPI})
+IF (TPL_ENABLE_MPI)
   SET(SEACAS_HAVE_MPI ON)
 ENDIF()
 
 IF (TPL_ENABLE_DataWarp)
   SET(SEACAS_HAVE_DATAWARP ON)
 ENDIF()
 
-IF (${TPL_ENABLE_CGNS})
+IF (TPL_ENABLE_CGNS)
   SET(SEACAS_HAVE_CGNS ON)
 ENDIF()
 

diff --git a/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h b/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h
@@ -72,12 +72,6 @@ inline const std::string IOSS_SYM_TENSOR() { return std::string("sym_tensor_33")
 #include <SEACASIoss_config.h>
 #endif
 
-#if defined(PARALLEL_AWARE_EXODUS)
-#ifndef SEACAS_HAVE_MPI
-#define SEACAS_HAVE_MPI
-#endif
-#endif
-
 #if defined(IOSS_THREADSAFE)
 #include <mutex>
 #endif

diff --git a/packages/seacas/libraries/ioss/src/exodus/CMakeLists.txt b/packages/seacas/libraries/ioss/src/exodus/CMakeLists.txt
@@ -6,7 +6,7 @@ SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.h)
 APPEND_GLOB(SOURCES ${DIR}/*.C)
 
-IF (NOT TPL_ENABLE_MPI)
+IF (NOT TPL_Netcdf_PARALLEL)
   LIST(REMOVE_ITEM SOURCES ${DIR}/Ioex_ParallelDatabaseIO.C ${DIR}/Ioex_DecompositionData.C)
   LIST(REMOVE_ITEM HEADERS ${DIR}/Ioex_ParallelDatabaseIO.h ${DIR}/Ioex_DecompositionData.h)
 ENDIF()

diff --git a/packages/seacas/libraries/ioss/src/main/CMakeLists.txt b/packages/seacas/libraries/ioss/src/main/CMakeLists.txt
@@ -160,7 +160,7 @@ IF (SEACASIoss_ENABLE_THREADSAFE)
     )
 
   SET(IOSHELL_ARG --in_type generated 10x10x10+shell:xXyYzZ+sideset:xXyY+times:2+variables:element,2,nodal,3,sideset,4)
-IF ($(TPL_ENABLE_MPI))
+IF (TPL_ENABLE_MPI)
   TRIBITS_ADD_ADVANCED_TEST(
     io_shell_ts
     TEST_0 NOEXEPREFIX NOEXESUFFIX EXEC io_shell_ts ARGS ${IOSHELL_ARG} gen-shell-ts.g
@@ -374,7 +374,7 @@ TRIBITS_ADD_ADVANCED_TEST(unstructured_cgns_to_exodus
   XHOSTTYPE Windows
   )
 
-IF ($(TPL_ENABLE_MPI))
+IF (TPL_ENABLE_MPI)
 TRIBITS_ADD_ADVANCED_TEST(structured_cgns_to_unstructured
    TEST_0 EXEC struc_to_unstruc ARGS ${CMAKE_CURRENT_SOURCE_DIR}/test/sparc1.cgns exodus_struc.e
      NOEXEPREFIX NOEXESUFFIX