Merge c3db704 into 0226f44

.travis.yml

@@ -58,7 +58,7 @@ env:
     # test:
     #  static vs shared libs
     #  python 2 vs 3
-    #  cmake 3.9.4
+    #  cmake 3.14.2
     #  silo vs no silo
     #  adios vs no adios
     #  coverage of unit tests
@@ -72,8 +72,11 @@ env:
       ENABLE_SILO=ON
       ENABLE_ADIOS=OFF
       ENABLE_PYTHON=ON
-      PYTHON_VERSION=2.7.14
-      CMAKE_VERSION=3.9.4
+      ENABLE_PYTHON2=ON
+      PYTHON_VERSION=2.7.18
+      PYTHON2_CONSTRAINTS=" ^py-setuptools@44.1.0 "
+      PYTHON2_DOCS_CONSTRAINTS=" ^py-pygments@2.4.2 "
+      CMAKE_VERSION=3.14.2
       BLT_CXX_STD=c++11
     # mpi on, docs off, static libs, python 2.7, adios off
     - BUILD_SHARED_LIBS=OFF
@@ -83,8 +86,11 @@ env:
       ENABLE_SILO=ON
       ENABLE_ADIOS=OFF
       ENABLE_PYTHON=ON
-      PYTHON_VERSION=2.7.14
-      CMAKE_VERSION=3.9.4
+      ENABLE_PYTHON2=ON
+      PYTHON_VERSION=2.7.18
+      PYTHON2_CONSTRAINTS=" ^py-setuptools@44.1.0 "
+      PYTHON2_DOCS_CONSTRAINTS=" ^py-pygments@2.4.2 "
+      CMAKE_VERSION=3.14.2
       BLT_CXX_STD=c++11
     # mpi on, docs off, shared libs, python 3.6, adios off
     - BUILD_SHARED_LIBS=ON
@@ -94,8 +100,9 @@ env:
       ENABLE_SILO=ON
       ENABLE_ADIOS=OFF
       ENABLE_PYTHON=ON
+      ENABLE_PYTHON2=OFF
       PYTHON_VERSION=3.6.3
-      CMAKE_VERSION=3.9.4
+      CMAKE_VERSION=3.14.2
       BLT_CXX_STD=c++11
     # mpi on, docs off, static libs, python 3.6, adios off
     - BUILD_SHARED_LIBS=OFF
@@ -105,8 +112,9 @@ env:
       ENABLE_SILO=ON
       ENABLE_ADIOS=OFF
       ENABLE_PYTHON=ON
+      ENABLE_PYTHON2=OFF
       PYTHON_VERSION=3.6.3
-      CMAKE_VERSION=3.9.4
+      CMAKE_VERSION=3.14.2
       BLT_CXX_STD=c++11
     # mpi on, docs off, static libs, python 2.7, adios on
     - BUILD_SHARED_LIBS=OFF
@@ -116,8 +124,11 @@ env:
       ENABLE_SILO=ON
       ENABLE_ADIOS=ON
       ENABLE_PYTHON=ON
-      PYTHON_VERSION=2.7.14
-      CMAKE_VERSION=3.9.4
+      ENABLE_PYTHON2=ON
+      PYTHON_VERSION=2.7.18
+      PYTHON2_CONSTRAINTS=" ^py-setuptools@44.1.0 "
+      PYTHON2_DOCS_CONSTRAINTS=" ^py-pygments@2.4.2 "
+      CMAKE_VERSION=3.14.2
       BLT_CXX_STD=c++11
 
 addons:
@@ -172,7 +183,12 @@ script:
   # versions and package selections
   - export SPACK_SPEC="${SPACK_SPEC} ^cmake@${CMAKE_VERSION}"
   - export SPACK_SPEC="${SPACK_SPEC} ^python@${PYTHON_VERSION}"
+  # fix constraint issue for python 2
+  - if [ $ENABLE_PYTHON2 = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ${PYTHON2_CONSTRAINTS}"; fi
+  - if [ $ENABLE_PYTHON2 = 'ON' -a $ENABLE_DOCS = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ${PYTHON2_DOCS_CONSTRAINTS}"; fi
   - if [ $ENABLE_SILO = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^silo~mpi"; fi
+  # turn off hdf5 mpi support
+  - export SPACK_SPEC="${SPACK_SPEC} ^hdf5~mpi"
   - echo $SPACK_SPEC
   # Output something every 10 minutes or Travis kills the job
   - while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &

azure-pipelines.yml

@@ -51,10 +51,10 @@ stages:
       vmImage: 'ubuntu-16.04'
     timeoutInMinutes: 0
     variables:
-      COMPILER_CC: gcc-5
-      COMPILER_CXX: g++-5
-      COMPILER_FC: gfortran-5
-      COMPILER_SPEC: gcc@5
+      COMPILER_CC: gcc
+      COMPILER_CXX: g++
+      COMPILER_FC: gfortran
+      COMPILER_SPEC: gcc
     strategy:
       matrix:
         shared_minimal:
@@ -66,7 +66,8 @@ stages:
           ENABLE_SILO: OFF
           ENABLE_ADIOS: OFF
           ENABLE_PYTHON: OFF
-          CMAKE_VERSION: 3.9.4
+          ENABLE_PYTHON2: OFF
+          CMAKE_VERSION: 3.14.2
           BLT_CXX_STD: c++11
 
         shared_py27:
@@ -78,8 +79,10 @@ stages:
           ENABLE_SILO: ON
           ENABLE_ADIOS: OFF
           ENABLE_PYTHON: ON
-          PYTHON_VERSION: 2.7.14
-          CMAKE_VERSION: 3.9.4
+          PYTHON_VERSION: 2.7.18
+          ENABLE_PYTHON2: ON
+          PYTHON2_CONSTRAINTS: " ^py-setuptools@44.1.0 ^py-pygments@2.4.2 "
+          CMAKE_VERSION: 3.14.2
           BLT_CXX_STD: c++11
 
         shared_py36:
@@ -91,8 +94,9 @@ stages:
           ENABLE_SILO: ON
           ENABLE_ADIOS: OFF
           ENABLE_PYTHON: ON
+          ENABLE_PYTHON2: OFF
           PYTHON_VERSION: 3.6.3
-          CMAKE_VERSION: 3.9.4
+          CMAKE_VERSION: 3.14.2
           BLT_CXX_STD: c++11
 
         shared_py37:
@@ -104,8 +108,9 @@ stages:
           ENABLE_SILO: ON
           ENABLE_ADIOS: OFF
           ENABLE_PYTHON: ON
+          ENABLE_PYTHON2: OFF
           PYTHON_VERSION: 3.7.6
-          CMAKE_VERSION: 3.9.4
+          CMAKE_VERSION: 3.14.2
           BLT_CXX_STD: c++11
 
         static_py27:
@@ -117,8 +122,10 @@ stages:
           ENABLE_SILO: ON
           ENABLE_ADIOS: OFF
           ENABLE_PYTHON: ON
-          PYTHON_VERSION: 2.7.14
-          CMAKE_VERSION: 3.9.4
+          ENABLE_PYTHON2: ON
+          PYTHON_VERSION: 2.7.18
+          PYTHON2_CONSTRAINTS: " ^py-setuptools@44.1.0 ^py-pygments@2.4.2 "
+          CMAKE_VERSION: 3.14.2
           BLT_CXX_STD: c++11
     steps:
       - checkout: self
@@ -187,7 +194,11 @@ stages:
            # package ver selections and extra tweaks
            export SPACK_SPEC="${SPACK_SPEC} ^cmake@${CMAKE_VERSION}"
            if [ $ENABLE_PYTHON = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^python@${PYTHON_VERSION}"; fi
+           # fix constraint issue for python 2
+           if [ $ENABLE_PYTHON2 = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ${PYTHON2_CONSTRAINTS}"; fi
            if [ $ENABLE_SILO = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^silo~mpi"; fi
+           # turn off hdf5 mpi support
+           export SPACK_SPEC="${SPACK_SPEC} ^hdf5~mpi"
            # show final spec
            echo $SPACK_SPEC
            # run uber to build tpls
@@ -339,7 +350,7 @@ stages:
           ENABLE_ADIOS: OFF
           ENABLE_PYTHON: ON
           PYTHON_VERSION: 3.6.3
-          CMAKE_VERSION: 3.9.4
+          CMAKE_VERSION: 3.14.2
           BLT_CXX_STD: c++11
     steps:
       - checkout: self
@@ -409,7 +420,11 @@ stages:
            # package ver selections and extra tweaks
            export SPACK_SPEC="${SPACK_SPEC} ^cmake@${CMAKE_VERSION}"
            if [ $ENABLE_PYTHON = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^python@${PYTHON_VERSION}"; fi
+           # fix constraint issue for python 2
+           if [ $ENABLE_PYTHON2 = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ${PYTHON2_CONSTRAINTS}"; fi
            if [ $ENABLE_SILO = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^silo~mpi"; fi
+           # turn off hdf5 mpi support
+           export SPACK_SPEC="${SPACK_SPEC} ^hdf5~mpi"
            # show final spec
            echo $SPACK_SPEC
            # run uber to build tpls

scripts/uberenv/packages/uberenv-conduit/package.py

@@ -46,9 +46,7 @@ class UberenvConduit(Conduit):
     variant("adios", default=False, description="Build Conduit ADIOS support")
 
 
-    # stick with cmake 3.8 or 3.9 until we use MPIEXEC_EXECUTABLE for 3.10+
-    # in upstream spack package
-    depends_on("cmake@3.8.2:3.9.999", when="+cmake")
+    depends_on("cmake@3.14.2:", when="+cmake")
 
     # Try some basic ADIOS configurations. NOTE: these are more extensively
     # covered in the Conduit Spack base class. These seem necessary here too.

scripts/uberenv/project.json

@@ -2,7 +2,7 @@
 "package_name" : "conduit",
 "uberenv_package_name" : "uberenv-conduit",
 "spack_url": "https://github.com/alpine-DAV/spack",
-"spack_branch": "task/2019_11_update_ascent",
+"spack_branch": "task/2020_11_conduit_uberenv",
 "mirror_url": "https://www.ascent-dav.org/mirror/conduit/latest/",
 "spack_activate" : {"py-numpy" : ["+python"], 
                     "py-sphinx": ["+python","+doc"], 

scripts/uberenv/spack_configs/alcf/cooley/packages.yaml

@@ -1,19 +1,3 @@
-
-# -------------------------------------------------------------------------
-# This file controls default concretization preferences for Spack.
-#
-# Settings here are versioned with Spack and are intended to provide
-# sensible defaults out of the box. Spack maintainers should edit this
-# file to keep it current.
-#
-# Users can override these settings by editing the following files.
-#
-# Per-spack-instance settings (overrides defaults):
-#   $SPACK_ROOT/etc/spack/packages.yaml
-#
-# Per-user settings (overrides default and site settings):
-#   ~/.spack/packages.yaml
-# -------------------------------------------------------------------------
 packages:
   all:
     compiler: [gcc, intel, pgi, clang, xl, nag]
@@ -40,11 +24,13 @@ packages:
     version: [develop]
 # Cooley Cuda
   cuda:
-    paths:
-      cuda@9.1: /soft/visualization/cuda-9.1/
-    buildable: False
+    buildable: false
+    externals:
+    - prefix: /soft/visualization/cuda-9.1/
+      spec: cuda@9.1
 # Cooley mvapich2
   mvapich2:
-    paths:
-      mvapich2@2.2: /soft/libraries/mpi/mvapich2/gcc/
-    buildable: False
+    buildable: false
+    externals:
+    - prefix: /soft/libraries/mpi/mvapich2/gcc/
+      spec: mvapich2@2.2

scripts/uberenv/spack_configs/alcf/theta/packages.yaml

@@ -1,64 +1,56 @@
-
-# -------------------------------------------------------------------------
-# This file controls default concretization preferences for Spack.
-#
-# Settings here are versioned with Spack and are intended to provide
-# sensible defaults out of the box. Spack maintainers should edit this
-# file to keep it current.
-#
-# Users can override these settings by editing the following files.
-#
-# Per-spack-instance settings (overrides defaults):
-#   $SPACK_ROOT/etc/spack/packages.yaml
-#
-# Per-user settings (overrides default and site settings):
-#   ~/.spack/packages.yaml
-# -------------------------------------------------------------------------
-
 packages:
-    all:
-        providers:
-          mpi: [mpich]
-          blas: [intel-mkl]
-          lapack: [intel-mkl]
-        compiler: [gcc@7.3.0]
-        variants: +mpi~shared~python  
-    openssl:
-        buildable: False
-        paths:
-            openssl: /usr
-    python:
-        paths:
-            python@2.7.13: /usr
-        buildable: False
-    pkg-config:
-        paths:
-             pkg-config: /usr
-        buildable: False
-    autoconf:
-        paths:
-            autoconf: /usr
-        buildable: False
-    automake:
-        paths:
-            automake: /usr
-        buildable: False
-    libtool:
-        paths:
-            libtool: /usr
-        buildable: False
-    m4:
-        paths:
-            m4: /usr
-        buildable: False
-    intel-mkl:
-        paths:
-            intel-mkl: /opt/intel
-        buildable: False
-    mpich:
-        modules:
-            # requires 'module load cce' otherwise gives parsing error
-            mpich@7.6.3: cray-mpich/7.6.3
-        buildable: False
-    conduit:
-        version: [develop]
+  all:
+    providers:
+      mpi: [mpich]
+      blas: [intel-mkl]
+      lapack: [intel-mkl]
+    compiler: [gcc@7.3.0]
+    variants: +mpi~shared~python
+  openssl:
+    buildable: false
+    externals:
+    - prefix: /usr
+      spec: openssl
+  python:
+    buildable: false
+    externals:
+    - prefix: /usr
+      spec: python@2.7.13
+  pkg-config:
+    buildable: false
+    externals:
+    - prefix: /usr
+      spec: pkg-config
+  autoconf:
+    buildable: false
+    externals:
+    - prefix: /usr
+      spec: autoconf
+  automake:
+    buildable: false
+    externals:
+    - prefix: /usr
+      spec: automake
+  libtool:
+    buildable: false
+    externals:
+    - prefix: /usr
+      spec: libtool
+  m4:
+    buildable: false
+    externals:
+    - prefix: /usr
+      spec: m4
+  intel-mkl:
+    buildable: false
+    externals:
+    - prefix: /opt/intel
+      spec: intel-mkl
+  mpich:
+    buildable: false
+    externals:
+    - modules:
+      - cray-mpich/7.6.3
+      spec: mpich@7.6.3
+  conduit:
+    version: [develop]