From 48f0e9592e67c29606e4167ba8d9cd503df8b64a Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Tue, 8 Aug 2017 08:23:04 -0700 Subject: Krell spack updates: Add Argo Navis/Krell new gui support library (#4964) * Update the krell institute products to use the latest features of spack for building on cluster platforms. * Address travis error messages and resubmit the pull request. * Update the contents of openspeedshop package.py so it passes the flake8 tests. * Fix flake8 error-whitespack issue in mrnet package.py file. * Add updates based on spack reviewer feedback. * More fixes based on comments from reviewers. Switch using extend to using append, remove additional setting of PATH and LD_LIBRARY_PATH that should not be required due to RPATH. * More review related changes. Update MPIOption.append lines and take out xercesc references. * Create a base options function for common openspeedshop base cmake options to reduce redundencies. * Add libxml2+python depends on to get around issues with the libxml2 package file. * Using boost over 1.60.0 causes compile errors. This is a known boost bug. Also, dyninst-9.2.0 is set to be the vesrion of dyninst to use with OSS, as of now. The newer version fails to build. * Fix bad syntax in specifying the boost version range. * Update the version numbers for the krell institute components and tools: cbtf and openspeedshop. * Do not build glib for qt3, it is not needed and causes build problems at this time anyway. * A fix was added for setting LD_LIBRARY_PATH in the qt3 build, but if LD_LIBRARY_PATH is not set the qt build fails. So so check and set LD_LIBRARY_PATH if not set, update if it is set. * Update the fix for qt3 build by setting LD_LIBRARY_PATH instead of checking for whether it is set or not per Adams comment that spack clears LD_LIBRARY_PATH. * A fix was added for setting LD_LIBRARY_PATH in the qt3 build, but if LD_LIBRARY_PATH is not set the qt build fails. So so check and set LD_LIBRARY_PATH if not set, update if it is set. * Trim comments to fit more concisely. * Fix tabs versus spaces and swap if and else clause check from a negative to a positive check. * Fix issues with the cbtf-argonavis build, update to use dyninst-9.3.2, fixes to openspeedshop package build. * Fix issues with the cbtf-argonavis package.py files related to comments. * Add changes for changing the krell packages from Package to CMakePackage. * Add better changes for changing the krell packages from Package to CMakePackage. * Add more modifications for changing the krell packages from Package to CMakePackage. * Add additional modifications for changing the krell packages from Package to CMakePackage and fixing Travis erros * Fix new travis errors. * Fix new travis errors. * Add more changes for PR 4765. * Add more refinements to the conversion from Package to CMakePackage. * Fix new travis errors. * Add dependencies for MPI to be passed to cbtf-krell, so it can build the MPI collectors requested by the builder of openspeedshop. * Remove extra unnecessary routine to adjust build arguments. Fix if-else clause issue. * Fix more flake issues caused by last changes. * Fix a bug where openspeedshop will not build when no mpi variants are specified. Also switch to a multiple level variant for building the gui(s). Use none, qt3, and qt4 as the variants with qt3 being the default. * Add fix for spack issue #4843, where LTDL include files were not found. * Add the build_type variant back into the openspeedshop package file. * Add new package for the Argo Navis/Krell new graphical user support library: QtGraph. * Revert "Add new package for the Argo Navis/Krell new graphical user support library: QtGraph." This reverts commit f8883de446c404e46d4c33fe497ae1e9ab2f04a6. * Add new package for the Argo Navis/Krell new graphical user support library: qtgraph. * Fix flake8 errors. * Fix flake8 errors. * Fix flake8 errors. * Fix flake8 errors. * Fix flake8 errors. * Add changes to support QMakePackage class instead of Package class for qtgraph. * Update change for suggested reviewer improvements. * Fix flake8 errors. * Fix flake8 errors. --- .../repos/builtin/packages/qtgraph/package.py | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 var/spack/repos/builtin/packages/qtgraph/package.py diff --git a/var/spack/repos/builtin/packages/qtgraph/package.py b/var/spack/repos/builtin/packages/qtgraph/package.py new file mode 100644 index 0000000000..d80ee59bdd --- /dev/null +++ b/var/spack/repos/builtin/packages/qtgraph/package.py @@ -0,0 +1,73 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# 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 NOTICE and LICENSE files 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 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 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 +############################################################################## +############################################################################## +# Copyright (c) 2015-2017 Krell Institute. All Rights Reserved. +# +# 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; either version 2 of the License, or (at your option) +# any later version. +# +# 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 GNU General Public License for +# more details. +# +# You should have received a copy of the GNU 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 * + + +class Qtgraph(QMakePackage): + """The baseline library used in the CUDA-centric Open|SpeedShop Graphical + User Interface (GUI) which allows Graphviz DOT formatted data to be + imported into a Qt application by wrapping the Graphviz libcgraph and + libgvc within the Qt Graphics View Framework.""" + + homepage = "https://github.com/OpenSpeedShop/QtGraph" + + url = "https://github.com/OpenSpeedShop/QtGraph.git" + version('1.0.0', branch='master', + git='https://github.com/OpenSpeedShop/QtGraph.git') + + # qtgraph depends on these packages + depends_on('qt@4.8.6:') + depends_on('graphviz') + + def setup_environment(self, spack_env, run_env): + """Set up the compile and runtime environments for a package.""" + spack_env.set('GRAPHVIZ_ROOT', self.spec['graphviz'].prefix) + spack_env.set('INSTALL_ROOT', self.prefix) + + # The implementor has set up the library and include paths in + # a non-conventional way. We reflect that here. + run_env.prepend_path( + 'LD_LIBRARY_PATH', join_path( + self.prefix.lib64, + '{0}'.format(self.spec['qt'].version.up_to(3)))) + + run_env.prepend_path('CPATH', self.prefix.include.QtGraph) -- cgit v1.2.3-70-g09d2