clean up intel dep, no parmetis, and newer openmpi

nasa · Jun 23, 2022 · 255aecd · 255aecd
1 parent 37e8b95
commit 255aecd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/misc/module-builder/cfdlab/common.sh b/misc/module-builder/cfdlab/common.sh
@@ -4,14 +4,14 @@
 GROUP='fun3d_users'
 
 GCC_VERSION='6.2.0'
-OPENMPI_VERSION='2.1.1'
-INTEL_VERSION='2017.2.174'
+OPENMPI_VERSION='4.1.0'
+INTEL_VERSION='2020.4.304'
 PARMETIS_VERSION='4.0.3'
-ESP_VERSION='119-beta.2021.05.05.1543'
+ESP_VERSION='120'
 
 GCC_MODULE="gcc_${GCC_VERSION}"
 INTEL_MODULE="intel.${INTEL_VERSION}"
-OPENMPI_MODULE="openmpi_${OPENMPI_VERSION}_intel_2017"
+OPENMPI_MODULE="openmpi_${OPENMPI_VERSION}_intel_2020"
 ESP_MODULE="ESP/${ESP_VERSION}"
 
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

diff --git a/misc/module-builder/cfdlab/refine-openmpi.sh b/misc/module-builder/cfdlab/refine-openmpi.sh
@@ -10,7 +10,7 @@ else
 fi
 
 TOPDIR='../../..'
-PARMETIS="ParMETIS/${PARMETIS_VERSION}-${OPENMPI_VERSION}_intel_2017-${INTEL_VERSION}_CentOS7"
+# PARMETIS="ParMETIS/${PARMETIS_VERSION}-${OPENMPI_VERSION}_intel_2017-${INTEL_VERSION}_CentOS7"
 
 echo Build ${PACKAGE} ${VERSION}
 
@@ -27,12 +27,13 @@ cd       _build_$VERSION
 
 ../${TOPDIR}/configure \
  --prefix=${MODULE_DEST} \
- --with-metis=${MODULE_ROOT}/${PARMETIS} \
- --with-parmetis=${MODULE_ROOT}/${PARMETIS} \
  CC=mpicc \
  CFLAGS='-DHAVE_MPI -g -O2 -traceback -Wall -w3 -wd1418,2259,2547,981,11074,11076,1572,49,1419 -ftrapuv' \
  LIBS=-lmpi
 
+# --with-metis=${MODULE_ROOT}/${PARMETIS} \
+# --with-parmetis=${MODULE_ROOT}/${PARMETIS} \
+
  make -j 12 
  make install
 
@@ -55,7 +56,6 @@ set modmode  [module-info mode]
 set base    $MODULE_BASE
 set version $VERSION
 
-prereq ${INTEL_MODULE}
 prereq ${OPENMPI_MODULE}
 
 set logr "/bin"

diff --git a/misc/module-builder/cfdlab/refine.sh b/misc/module-builder/cfdlab/refine.sh
@@ -11,7 +11,7 @@ fi
 
 TOPDIR='../../..'
 ESP="ESP/${ESP_VERSION}"
-PARMETIS="ParMETIS/${PARMETIS_VERSION}-${OPENMPI_VERSION}_intel_2017-${INTEL_VERSION}_CentOS7"
+# PARMETIS="ParMETIS/${PARMETIS_VERSION}-${OPENMPI_VERSION}_intel_2017-${INTEL_VERSION}_CentOS7"
 OPENMPI_MODULE="openmpi_${OPENMPI_VERSION}_intel_2017"
 
 echo Build ${PACKAGE} ${VERSION}
@@ -30,12 +30,13 @@ cd       _build_$VERSION
  --prefix=${MODULE_DEST} \
  --with-EGADS=${MODULE_ROOT}/${ESP}/EngSketchPad \
  --with-OpenCASCADE=${MODULE_ROOT}/${ESP}/OpenCASCADE-7.3.1 \
- --with-metis=${MODULE_ROOT}/${PARMETIS} \
- --with-parmetis=${MODULE_ROOT}/${PARMETIS} \
  --with-mpi=/usr/local/pkgs-modules/${OPENMPI_MODULE} \
  CC=icc \
  CFLAGS='-g -O2'
 
+# --with-metis=${MODULE_ROOT}/${PARMETIS} \
+# --with-parmetis=${MODULE_ROOT}/${PARMETIS} \
+
  make -j 12 
  make install
 
@@ -58,7 +59,6 @@ set modmode  [module-info mode]
 set base    $MODULE_BASE
 set version $VERSION
 
-prereq ${INTEL_MODULE}
 prereq ${OPENMPI_MODULE}
 
 set logr "/bin"