lightning.afrl changes

Author: Christopher Enochs Kees

examples/proteus.garnet.gnu.yaml

@@ -23,7 +23,7 @@ parameters:
   PATH: |
     /usr/bin:/bin:/usr/sbin:/sbin
   PROLOGUE: |
-    source /opt/modules/default/init/bash; export MODULEPATH=/opt/cray/gem/modulefiles:/opt/cray/xt-asyncpe/default/modulefiles:/opt/modulefiles:/opt/cray/modulefiles:/cm/local/modulefiles:/cm/shared/modulefiles:/usr/local/modulefiles/COTS:/usr/local/modulefiles/unsupported; export MODULESHOME=/opt/modules/3.2.6.7; export MODULE_VERSION=3.2.6.7; export MODULE_VERSION_STACK=3.2.6.7; echo "unloading modules"; module unload PrgEnv-pgi; echo "loading modules"; module load PrgEnv-gnu/4.2.34; module load cray-mpich/6.0.0; module unload cray-libsci; module load acml/5.3.1; echo "setting default compilers"; export CC=gcc; export CXX=g++; export FC=gfortran; export F77=gfortran; export F90=gfortran; export CPP=cpp;
+    unset RCLOCAL_PRGENV; source /etc/bash.bashrc; source  /etc/bash.bashrc.local; module swap PrgEnv-cray PrgEnv-gnu; module load cray-mpich; module list; echo "setting default compilers"; export CC=gcc; export CXX=g++; export FC=gfortran; export F77=gfortran; export F90=gfortran; export CPP=cpp;
   DYNAMIC_EXE_LINKER_FLAGS: -dynamic
 
 packages:
@@ -34,9 +34,9 @@ packages:
     build_with: |
       openssl,bzip2,sqlite
   blas:
-    use: host-acml-blas
+    use: host-libsci-blas
   lapack:
-    use: host-acml-lapack
+    use: host-libsci-lapack
   daetk:
   mpi:
     use: host-mpi

pkgs/numpy/numpy.yaml

@@ -38,8 +38,8 @@ build_stages:
     bash: |
       cat > site.cfg << EOF
       [DEFAULT]
-      library_dirs = ${ACML_DIR}/gfortran64/lib
-      libraries = acml
+      library_dirs = ${CRAY_LIBSCI_PREFIX_DIR}/lib
+      libraries = sci_gnu
       EOF
 
   - when: machine == 'CrayXE6'
@@ -48,9 +48,9 @@ build_stages:
     before: install
     handler: bash
     bash: |
-      export LDFLAGS="-shared -Wl,-rpath=${PYTHON_DIR}/lib -Wl,-rpath=${ACML_DIR}/gfortran64/lib $(${PYTHON_DIR}/bin/python-config --ldflags)"
-      export LAPACK=acml
-      export BLAS=acml
+      export LDFLAGS="-shared -Wl,-rpath=${PYTHON_DIR}/lib -Wl,-rpath=${CRAY_LIBSCI_PREFIX_DIR}/lib $(${PYTHON_DIR}/bin/python-config --ldflags)"
+      export LAPACK=sci_gnu
+      export BLAS=sci_gnu
       export ATLAS=None
 
   - when: platform == 'Cygwin'

pkgs/scipy/scipy-crayxe6.yaml

@@ -17,17 +17,17 @@ build_stages:
     bash: |
       cat > site.cfg << EOF
       [DEFAULT]
-      library_dirs = ${ACML_DIR}/gfortran64/lib
-      libraries = acml
+      library_dirs = ${CRAY_LIBSCI_PREFIX_DIR}/lib
+      libraries = sci_gnu
       EOF
 
   - name: set-LDFLAGS
     after: prologue
     before: install
     handler: bash
     bash: |
-      export LDFLAGS="-shared -Wl,-rpath=${PYTHON_DIR}/lib -Wl,-rpath=${ACML_DIR}/gfortran64/lib $(${PYTHON_DIR}/bin/python-config --ldflags)"
+      export LDFLAGS="-shared -Wl,-rpath=${PYTHON_DIR}/lib -Wl,-rpath=${CRAY_LIBSCI_PREFIX_DIR}/lib $(${PYTHON_DIR}/bin/python-config --ldflags)"
       export ATLAS=None
-      export LAPACK=acml
-      export BLAS=acml
+      export LAPACK=sci_gnu
+      export BLAS=sci_gnu