Merge pull request #149 in CON/conduit from task/2016_07_uberenv_upda…

…te to master * commit '0f7a257846ef1a20a4750381a63c8e2e930b6a02': enh: updated uberenv for osx 10.11
LLNL · Jul 28, 2016 · 85e1e05 · 85e1e05
2 parents a30ffac + 0f7a257
commit 85e1e05
Show file tree

Hide file tree

Showing 40 changed files with 672 additions and 90 deletions.
diff --git a/host-configs/naples-darwin-x86_64-clang@3.4svn.cmake b/host-configs/naples-darwin-x86_64-clang@3.4svn.cmake
@@ -5,56 +5,54 @@
 ##################################
 
 # cmake from uberenv
-# cmake exectuable path: /Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/cmake-3.3.1-4u3hrpeigz5i5u5tzbqwlcfyc2vskauh/bin/cmake
+# cmake exectuable path: /Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/cmake-3.3.1-derruj5rkiqrvcxmzh7bwiycyi2kidte/bin/cmake
 
 #######
 # using clang@3.4svn compiler spec
 #######
 
 # c compiler used by spack
-set(CMAKE_C_COMPILER "/usr/bin/clang" CACHE PATH "")
+set("CMAKE_C_COMPILER" "/usr/bin/clang" CACHE PATH "")
 
 # cpp compiler used by spack
-set(CMAKE_CXX_COMPILER "/usr/bin/clang++" CACHE PATH "")
+set("CMAKE_CXX_COMPILER" "/usr/bin/clang++" CACHE PATH "")
 
 # fortran compiler used by spack
-set(ENABLE_FORTRAN ON CACHE PATH "")
+# no fortran compiler found
 
-set(CMAKE_Fortran_COMPILER  "/sw/bin/gfortran" CACHE PATH "")
+set("ENABLE_FORTRAN" "OFF" CACHE PATH "")
 
 # Enable python module builds
-set(ENABLE_PYTHON ON CACHE PATH "")
+set("ENABLE_PYTHON" "ON" CACHE PATH "")
 
 # python from uberenv
-set(PYTHON_EXECUTABLE "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/python-2.7.11-jswmndoc7h6ruppd6atok7hvx4dn7h6j/bin/python" CACHE PATH "")
+set("PYTHON_EXECUTABLE" "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/python-2.7.11-fmwboy225dowlzykfvloodfx2nuuskd5/bin/python" CACHE PATH "")
 
 # sphinx from uberenv
-set(SPHINX_EXECUTABLE "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/python-2.7.11-jswmndoc7h6ruppd6atok7hvx4dn7h6j/bin/sphinx-build" CACHE PATH "")
+set("SPHINX_EXECUTABLE" "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/python-2.7.11-fmwboy225dowlzykfvloodfx2nuuskd5/bin/sphinx-build" CACHE PATH "")
 
 # python3 from uberenv
-#set(PYTHON_EXECUTABLE "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/python3-3.5.1-d4u6mvmabzpv2zw6icqp55awuuxiib6b/bin/python3" CACHE PATH "")
+#set("PYTHON_EXECUTABLE" "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/python3-3.5.1-wgiw7dyijzienqtorbsmfyz7xgtvrsnz/bin/python3" CACHE PATH "")
 
 # sphinx from uberenv
-#set(SPHINX_EXECUTABLE "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/python3-3.5.1-d4u6mvmabzpv2zw6icqp55awuuxiib6b/bin/sphinx-build" CACHE PATH "")
+#set("SPHINX_EXECUTABLE" "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/python3-3.5.1-wgiw7dyijzienqtorbsmfyz7xgtvrsnz/bin/sphinx-build" CACHE PATH "")
 
 # MPI Support
-set(ENABLE_MPI ON CACHE PATH "")
+set("ENABLE_MPI" "ON" CACHE PATH "")
 
-set(MPI_C_COMPILER  "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/mpich-3.2-5m2s3c3ugo6jqt4bz7nci3nfh4aamzfu/bin/mpicc" CACHE PATH "")
+set("MPI_C_COMPILER" "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/mpich-3.2-5m2s3c3ugo6jqt4bz7nci3nfh4aamzfu/bin/mpicc" CACHE PATH "")
 
-set(MPI_CXX_COMPILER "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/mpich-3.2-5m2s3c3ugo6jqt4bz7nci3nfh4aamzfu/bin/mpicc" CACHE PATH "")
+set("MPI_CXX_COMPILER" "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/mpich-3.2-5m2s3c3ugo6jqt4bz7nci3nfh4aamzfu/bin/mpicc" CACHE PATH "")
 
-set(MPI_Fortran_COMPILER "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/mpich-3.2-5m2s3c3ugo6jqt4bz7nci3nfh4aamzfu/bin/mpif90" CACHE PATH "")
-
-set(MPIEXEC "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/mpich-3.2-5m2s3c3ugo6jqt4bz7nci3nfh4aamzfu/bin/mpiexec" CACHE PATH "")
+set("MPIEXEC" "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/mpich-3.2-5m2s3c3ugo6jqt4bz7nci3nfh4aamzfu/bin/mpiexec" CACHE PATH "")
 
 # I/O Packages
 
 # hdf5 from uberenv
-set(HDF5_DIR "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/hdf5-1.8.17-pzxksxsggtm6ab72nbymwokfybp66boh" CACHE PATH "")
+set("HDF5_DIR" "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/hdf5-1.8.17-pzxksxsggtm6ab72nbymwokfybp66boh" CACHE PATH "")
 
 # silo from uberenv
-set(SILO_DIR "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/silo-4.10.1-5rka7esxmogsporir2fkg5dkrkgnywtj" CACHE PATH "")
+set("SILO_DIR" "/Users/harrison37/Work/conduit/uberenv_libs/spack/opt/spack/darwin-x86_64/clang-3.4svn/silo-4.10.1-5rka7esxmogsporir2fkg5dkrkgnywtj" CACHE PATH "")
 
 ##################################
 # end uberenv host-config

diff --git a/scripts/uberenv/packages/cmake/package.py b/scripts/uberenv/packages/cmake/package.py
@@ -1,26 +1,26 @@
 ##############################################################################
-# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
 # Produced at the Lawrence Livermore National Laboratory.
 #
 # This file is part of Spack.
-# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
 # LLNL-CODE-647188
 #
 # For details, see https://github.com/llnl/spack
 # Please also see the LICENSE file for our notice and the LGPL.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License (as published by
-# the Free Software Foundation) version 2.1 dated February 1999.
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
-# conditions of the GNU General Public License for more details.
+# conditions of the GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
 from spack import *
 
@@ -30,20 +30,23 @@ class Cmake(Package):
     homepage  = 'https://www.cmake.org'
     url       = 'https://cmake.org/files/v3.4/cmake-3.4.3.tar.gz'
 
+    version('3.6.0',    'aa40fbecf49d99c083415c2411d12db9')
+    version('3.5.2',    '701386a1b5ec95f8d1075ecf96383e02')
+    version('3.5.1',    'ca051f4a66375c89d1a524e726da0296')
     version('3.5.0',    '33c5d09d4c33d4ffcc63578a6ba8777e')
     version('3.4.3',    '4cb3ff35b2472aae70f542116d616e63')
     version('3.4.0',    'cd3034e0a44256a0917e254167217fc8')
     version('3.3.1',    '52638576f4e1e621fed6c3410d3a1b12')
     version('3.0.2',    'db4c687a31444a929d2fdc36c4dfb95f')
     version('2.8.10.2', '097278785da7182ec0aea8769d06860c')
-    
+
     variant('ncurses', default=True, description='Enables the build of the ncurses gui')
     variant('openssl', default=True, description="Enables CMake's OpenSSL features")
     variant('qt', default=False, description='Enables the build of cmake-gui')
     variant('doc', default=False, description='Enables the generation of html and man page documentation')
 
-
     depends_on('ncurses', when='+ncurses')
+    depends_on('openssl', when='+openssl')
     depends_on('qt', when='+qt')
     depends_on('python@2.7.11:', when='+doc')
     depends_on('py-sphinx', when='+doc')

diff --git a/scripts/uberenv/packages/mpich/package.py b/scripts/uberenv/packages/mpich/package.py
@@ -72,12 +72,20 @@ def install(self, spec, prefix):
         # TODO: Spack should make it so that you can't actually find
         # these compilers if they're "disabled" for the current
         # compiler configuration.
-        if not self.compiler.f77:
+        found_fortran = False;
+        if self.compiler.f77 and os.path.isfile(self.compiler.f77):
+            found_fortran = True;
+        else:
             config_args.append("--disable-f77")
-
-        if not self.compiler.fc:
+
+        if self.compiler.fc and os.path.isfile(self.compiler.fc):
+            found_fortran = True;
+        else:
             config_args.append("--disable-fc")
 
+        if not found_fortran:
+            config_args.append("--disable-fortran")
+
         configure(*config_args)
         make()
         make("install")

diff --git a/scripts/uberenv/packages/package.py b/scripts/uberenv/packages/package.py
@@ -0,0 +1,20 @@
+from spack import *
+
+class PySphinxRtdTheme(Package):
+    """ReadTheDocs.org theme for Sphinx, 2013 version."""
+    homepage = "https://pypi.python.org/pypi/sphinx_rtd_theme"
+    url      = "https://pypi.python.org/packages/source/s/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.tar.gz"
+
+    version('0.1.9', '86a25c8d47147c872e42dc84cc66f97b')
+
+    extends('python')
+
+    # sphinx-rtd-theme requires sphinx which requires sphinx-rtd-theme
+    # remove the recursion with this patch
+    patch('remove_requirements.patch', level=0)
+
+    def install(self, spec, prefix):
+        # simply install to the spack python
+        python('setup.py', 'install') 
+
+
diff --git a/scripts/uberenv/packages/py-alabaster/package.py b/scripts/uberenv/packages/py-alabaster/package.py
@@ -0,0 +1,16 @@
+from spack import *
+
+class PyAlabaster(Package):
+    """A configurable sidebar-enabled Sphinx theme"""
+    homepage = "https://github.com/bitprophet/alabaster"
+    url      = "https://pypi.python.org/packages/source/a/alabaster/alabaster-0.7.7.tar.gz"
+
+    version('0.7.7', '957c665d7126dea8121f98038debcba7')
+
+    extends('python')
+
+    def install(self, spec, prefix):
+        # simply install to the spack python
+        python('setup.py', 'install') 
+
+
diff --git a/scripts/uberenv/packages/py-babel/package.py b/scripts/uberenv/packages/py-babel/package.py
@@ -0,0 +1,18 @@
+from spack import *
+
+class PyBabel(Package):
+    """Internationalization utilities"""
+    homepage = "http://babel.pocoo.org/"
+    url      = "https://pypi.python.org/packages/source/B/Babel/Babel-1.3.tar.gz"
+
+    version('1.3', '5264ceb02717843cbc9ffce8e6e06bdb')
+
+    depends_on("py-tz")
+
+    extends('python')
+
+    def install(self, spec, prefix):
+        # simply install to the spack python
+        python('setup.py', 'install') 
+
+
diff --git a/scripts/uberenv/packages/py-docutils/package.py b/scripts/uberenv/packages/py-docutils/package.py
@@ -0,0 +1,16 @@
+from spack import *
+
+class PyDocutils(Package):
+    """Python Documentation Utilities"""
+    homepage = "http://docutils.sourceforge.net/"
+    url      = "https://pypi.python.org/packages/source/d/docutils/docutils-0.12.tar.gz"
+
+    version('0.12', '4622263b62c5c771c03502afa3157768')
+
+    extends('python')
+
+    def install(self, spec, prefix):
+        # simply install to the spack python
+        python('setup.py', 'install') 
+
+
diff --git a/scripts/uberenv/packages/py-imagesize/package.py b/scripts/uberenv/packages/py-imagesize/package.py
@@ -0,0 +1,16 @@
+from spack import *
+
+class PyImagesize(Package):
+    """Python pacage for getting image size from png/jpeg/jpeg2000/gif files"""
+    homepage = "https://github.com/shibukawa/imagesize_py"
+    url      = "https://pypi.python.org/packages/53/72/6c6f1e787d9cab2cc733cf042f125abec07209a58308831c9f292504e826/imagesize-0.7.1.tar.gz"
+
+    version('0.7.1', '976148283286a6ba5f69b0f81aef8052')
+
+    extends('python')
+
+    def install(self, spec, prefix):
+        # simply install to the spack python
+        python('setup.py', 'install') 
+
+
diff --git a/scripts/uberenv/packages/py-jinja2/package.py b/scripts/uberenv/packages/py-jinja2/package.py
@@ -0,0 +1,19 @@
+from spack import *
+
+class PyJinja2(Package):
+    """A small but fast and easy to use stand-alone template engine written in pure python."""
+    homepage = "http://jinja.pocoo.org/"
+    url      = "https://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.8.tar.gz"
+
+    version('2.8', 'edb51693fe22c53cee5403775c71a99e')
+
+    depends_on("py-markupsafe")
+    depends_on("py-babel")
+
+    extends('python')
+
+    def install(self, spec, prefix):
+        # simply install to the spack python
+        python('setup.py', 'install') 
+
+
diff --git a/scripts/uberenv/packages/py-markupsafe/package.py b/scripts/uberenv/packages/py-markupsafe/package.py
@@ -0,0 +1,16 @@
+from spack import *
+
+class PyMarkupsafe(Package):
+    """Implements a XML/HTML/XHTML Markup safe string for Python"""
+    homepage = "http://github.com/mitsuhiko/markupsafe"
+    url      = "https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-0.23.tar.gz"
+
+    version('0.23', 'f5ab3deee4c37cd6a922fb81e730da6e')
+
+    extends('python')
+
+    def install(self, spec, prefix):
+        # simply install to the spack python
+        python('setup.py', 'install') 
+
+
diff --git a/scripts/uberenv/packages/py-numpy/package.py b/scripts/uberenv/packages/py-numpy/package.py
@@ -52,6 +52,7 @@ class PyNumpy(Package):
     version('1.9.1',  '78842b73560ec378142665e712ae4ad9')
 
     extends('python')
+    depends_on("py-setuptools")
 
     def install(self, spec, prefix):
         # don't

diff --git a/scripts/uberenv/packages/py-pygments/package.py b/scripts/uberenv/packages/py-pygments/package.py
@@ -0,0 +1,16 @@
+from spack import *
+
+class PyPygments(Package):
+    """Pygments is a syntax highlighting package written in Python."""
+    homepage = "http://pygments.org/"
+    url      = "https://pypi.python.org/packages/source/P/Pygments/Pygments-2.1.tar.gz"
+
+    version('2.1', '84533d22f72de894f6d3907c3ca9eddf')
+
+    extends('python')
+
+    def install(self, spec, prefix):
+        # simply install to the spack python
+        python('setup.py', 'install') 
+
+
diff --git a/scripts/uberenv/packages/py-setuptools/package.py b/scripts/uberenv/packages/py-setuptools/package.py
@@ -0,0 +1,27 @@
+from spack import *
+
+class PySetuptools(Package):
+    """Easily download, build, install, upgrade, and uninstall Python packages."""
+    homepage = "https://pypi.python.org/pypi/setuptools"
+    url      = "https://pypi.python.org/packages/source/s/setuptools/setuptools-11.3.tar.gz"
+
+    version('11.3.1', '01f69212e019a2420c1693fb43593930')
+    version('16.0', '0ace0b96233516fc5f7c857d086aa3ad')
+    version('18.1', 'f72e87f34fbf07f299f6cb46256a0b06')
+
+    extends('python')
+
+    def install(self, spec, prefix):
+        # python ctypes module doesn't build correctly
+        # with icc or clang, it is used by setuptools for
+        # windows support, which we don't need.
+        # remove use of windows_support in dist.py to avoid the issue
+        dist_src = open("setuptools/dist.py").read()
+        dist_src = dist_src.replace("from setuptools import windows_support",
+                                    "#from setuptools import windows_support")
+        dist_src = dist_src.replace("windows_support.hide_file(egg_cache_dir)",
+                                    "#windows_support.hide_file(egg_cache_dir)t")
+        open("setuptools/dist.py","w").write(dist_src)
+        # install into our python
+        python('setup.py', 'install')
+
diff --git a/scripts/uberenv/packages/py-six/package.py b/scripts/uberenv/packages/py-six/package.py
@@ -0,0 +1,18 @@
+from spack import *
+
+class PySix(Package):
+    """Python 2 and 3 compatibility utilities"""
+    homepage = "http://pypi.python.org/pypi/six/"
+    url      = "https://pypi.python.org/packages/source/s/six/six-1.9.0.tar.gz"
+
+    version('1.9.0', '476881ef4012262dfc8adc645ee786c4')
+
+    depends_on("py-tz")
+
+    extends('python')
+
+    def install(self, spec, prefix):
+        # simply install to the spack python
+        python('setup.py', 'install') 
+
+
diff --git a/scripts/uberenv/packages/py-snowballstemmer/package.py b/scripts/uberenv/packages/py-snowballstemmer/package.py
@@ -0,0 +1,16 @@
+from spack import *
+
+class PySnowballstemmer(Package):
+    """This package provides 16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms."""
+    homepage = "https://github.com/shibukawa/snowball_py"
+    url      = "https://pypi.python.org/packages/source/s/snowballstemmer/snowballstemmer-1.2.1.tar.gz"
+
+    version('1.2.1', '643b019667a708a922172e33a99bf2fa')
+
+    extends('python')
+
+    def install(self, spec, prefix):
+        # simply install to the spack python
+        python('setup.py', 'install') 
+
+
diff --git a/scripts/uberenv/packages/py-sphinx-rtd-theme/package.py b/scripts/uberenv/packages/py-sphinx-rtd-theme/package.py
@@ -0,0 +1,20 @@
+from spack import *
+
+class PySphinxRtdTheme(Package):
+    """ReadTheDocs.org theme for Sphinx, 2013 version."""
+    homepage = "https://pypi.python.org/pypi/sphinx_rtd_theme"
+    url      = "https://pypi.python.org/packages/source/s/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.tar.gz"
+
+    version('0.1.9', '86a25c8d47147c872e42dc84cc66f97b')
+
+    extends('python')
+
+    # sphinx-rtd-theme requires sphinx which requires sphinx-rtd-theme
+    # remove the recursion with this patch
+    patch('remove_requirements.patch', level=0)
+
+    def install(self, spec, prefix):
+        # simply install to the spack python
+        python('setup.py', 'install') 
+
+