Merge pull request #17 from lanl/rm_metis

Remove Parmetis and just use Metis

README.md

@@ -48,7 +48,6 @@ Installing Branson:
   - MPI 3.0+ ([OpenMPI 1.10+](https://www.open-mpi.org/software/ompi/),
     [mpich](http://www.mpich.org), etc.)
   - [Metis](http://glaros.dtc.umn.edu/gkhome/metis/metis/overview)
-  - [Parmetis](http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview)
 - Optional dependencies (needed for visualization)
   - [HDF5](https://support.hdfgroup.org/HDF5/)
   - [Silo](http://wci.llnl.gov/simulation/computer-codes/silo)

scripts/Dockerfile

@@ -17,7 +17,7 @@ MAINTAINER KineticTheory "https://github.com/KineticTheory"
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBCONF_NONINTERACTIVE_SEEN true
 ENV SPACK_ROOT=/vendors/spack
-ENV DRACO_TPL="[email protected] [email protected] [email protected] [email protected] [email protected] [email protected]"
+ENV DRACO_TPL="[email protected] [email protected] [email protected] [email protected] [email protected]"
 ENV FORCE_UNSAFE_CONFIGURE=1
 ENV DISTRO=bionic
 ENV CLANG_FORMAT_VER=6.0

src/CMakeLists.txt

@@ -3,7 +3,7 @@
 ################################################################################
 
 # Load the modules for each libary and the environment variables will be set
-# correctly (load cmake, compiler, mpi, metis, parmetis and optionally
+# correctly (load cmake, compiler, mpi, metis, and optionally
 # hdf5 and silo)
 
 # Enbable debug mode by passing -DCMAKE_BUILD_TYPE=Debug to CMake, default is
@@ -89,7 +89,7 @@ elseif( CMAKE_CXX_COMPILER_ID STREQUAL "Cray" )
 endif()
 
 #------------------------------------------------------------------------------#
-# Look for Third Party Libraries (metis, parmetis, etc.)
+# Look for Third Party Libraries (metis, etc.)
 add_subdirectory(pugixml)
 
 include(find_tpls)
@@ -143,10 +143,9 @@ add_executable(BRANSON main.cc)
 target_include_directories( BRANSON PRIVATE
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}> ${PROJECT_SOURCE_DIR}/pugixml/src/)
 set( branson_deps
-  ParMETIS::parmetis
   MPI::MPI_CXX
   MPI::MPI_C
-  METIS::metis 
+  METIS::metis
   pugixml)
 if( VIZ_LIBRARIES_FOUND )
   set( branson_deps "Silo::silo;${HDF5_LIBRARIES};${branson_deps}" )

src/config/find_tpls.cmake

@@ -42,8 +42,8 @@ macro(setupTPLs)
   #link_directories(${CALIPER_INSTALL_DIR}/lib)
 
   ##############################################################################
-  # metis and parmetis
-  # Load modules for metis and parmetis to get correct environment variables
+  # metis
+  # Load modules for metis to get correct environment variables
   ##############################################################################
   if( NOT TARGET METIS::metis )
 
@@ -65,26 +65,6 @@ macro(setupTPLs)
 
   endif()
 
-  if( NOT TARGET ParMETIS::parmetis )
-
-    message( STATUS "Looking for ParMETIS..." )
-    find_package( ParMETIS QUIET REQUIRED )
-    if( ParMETIS_FOUND )
-      message( STATUS "Looking for ParMETIS..found ${ParMETIS_LIBRARY}" )
-    else()
-      message( STATUS "Looking for ParMETIS..not found" )
-    endif()
-
-    set_package_properties( ParMETIS PROPERTIES
-      DESCRIPTION "MPI Parallel METIS"
-      TYPE REQUIRED
-      URL "http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview"
-      PURPOSE "ParMETIS is an MPI-based parallel library that implements a
-   variety of algorithms for partitioning unstructured graphs, meshes, and for
-   computing fill-reducing orderings of sparse matrices." )
-
-endif()
-
   ##############################################################################
   # Silo and HDF5 libraries
   # Load modules for hdf5 and solo to get correct environment variables

src/constants.h

@@ -31,7 +31,7 @@ enum {
   CELL_PASS_RMA,
   REPLICATED
 };                                 //!< Parallel types
-enum { PARMETIS, CUBE };           //!< Mesh decomposition method
+enum { METIS, CUBE };              //!< Mesh decomposition method
 enum { EMISSION, INITIAL_CENSUS }; //!< Particle type for work packets
 const int grip_id_tag(1);          //!< MPI tag for grip ID messages
 const int cell_id_tag(2);          //!< MPI tag for requested cell ID messages