update installers

Author: plavin

scripts/env.sh

@@ -1,10 +1,15 @@
 #!/usr/bin/env bash
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
 export SST_INSTALL=${SCRIPT_DIR}/install
 export SST_ELEMENTS_ROOT=${SCRIPT_DIR}/sst-elements
-export INTEL_PIN_DIRECTORY=${SCRIPT_DIR}/pin-3.28
+
+export INTEL_PIN_DIRECTORY=${HOME}/pin-3.28
 export INTEL_PIN_DIR=${INTEL_PIN_DIRECTORY}
 export PIN_HOME=${INTEL_PIN_DIRECTORY}
+
 export PATH=${SST_INSTALL}/bin:$PATH
 export LD_LIBRARY_PATH=${SST_INSTALL}/lib:${SST_INSTALL}/lib64:${SST_ELEMENTS_ROOT}/src/sst/elements/ariel/api:$LD_LIBRARY_PATH
-module load mpi/openmpi-x86_64
+
+module load gcc
+module load mpi/openmpi-4.1.4

scripts/init-sst.sh

@@ -3,10 +3,8 @@ set -euo pipefail
 set -x
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-# USING A COMMIT INSTEAD OF A BRANCH RIGHT NOW
-#CORE_BRANCH=devel
-CORE_COMMIT=a4dbc4ae575dc9bf6f6cac42d011a1ac0d496aa8
-ELEMENTS_BRANCH=ariel-mpi-rebase
+CORE_BRANCH=devel
+ELEMENTS_BRANCH=devel
 
 M4_VER=1.4.19
 AC_VER=2.72
@@ -84,13 +82,12 @@ if [ ! -d "./sst-core" ];
 then
     git clone git@github.com:sstsimulator/sst-core.git
     cd sst-core
-    #git switch $CORE_BRANCH
-    git checkout $CORE_COMMIT
+    git switch $CORE_BRANCH
+    #git checkout $CORE_COMMIT
     ./autogen.sh
-    #./configure --prefix=$SST_INSTALL --enable-perf-tracking
-    ./configure --prefix=$SST_INSTALL --disable-mpi --enable-perf-tracking
+    ./configure --prefix=$SST_INSTALL
     #./configure --prefix=$SST_INSTALL --disable-mpi --enable-perf-tracking --enable-debug
-    make -j8 install
+    make -j32 install
 else
     echo "The sst-core directory already exists. Skipping."
 fi
@@ -121,8 +118,9 @@ then
     echo "*.so"  >> .git/info/exclude
 
     ./autogen.sh
-    ./configure --prefix=$SST_INSTALL --with-pin=$INTEL_PIN_DIRECTORY --enable-ariel-mpi
-    make -j8 install
+    ./configure --prefix=$SST_INSTALL --with-pin=$INTEL_PIN_DIRECTORY
+    #./configure --prefix=$SST_INSTALL --with-pin=$INTEL_PIN_DIRECTORY --enable-ariel-mpi
+    make -j32 install
 else
     echo "The sst-elements directory already exists. Skipping."
 fi