From c082abfb6574c1bd2610990aeb799ff6d7c853a0 Mon Sep 17 00:00:00 2001 From: Kevin Huck Date: Wed, 21 Oct 2015 18:32:57 -0700 Subject: [PATCH 1/6] Modified the binutils package to use --enable-shared. Required by tools that use binutils and get this error (or equivalent): "relocation R_X86_64_32S against `bfd_errmsgs' can not be used when making a shared object; recompile with -fPIC" --- var/spack/packages/binutils/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/packages/binutils/package.py b/var/spack/packages/binutils/package.py index 0c33bf04260..cac0a0407f9 100644 --- a/var/spack/packages/binutils/package.py +++ b/var/spack/packages/binutils/package.py @@ -18,6 +18,7 @@ def install(self, spec, prefix): '--disable-dependency-tracking', '--enable-interwork', '--enable-multilib', + '--enable-shared', '--enable-64-bit-bfd', '--enable-targets=all'] From fb9eca4226e1026b3dae1c43c2190bf6ea2c56ec Mon Sep 17 00:00:00 2001 From: Kevin Huck Date: Wed, 21 Oct 2015 19:35:31 -0700 Subject: [PATCH 2/6] Added an APEX package, but it is still using the git master instead of a release. --- var/spack/packages/apex/package.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 var/spack/packages/apex/package.py diff --git a/var/spack/packages/apex/package.py b/var/spack/packages/apex/package.py new file mode 100644 index 00000000000..086694044ef --- /dev/null +++ b/var/spack/packages/apex/package.py @@ -0,0 +1,30 @@ +from spack import * +from spack.util.environment import * + +class Apex(Package): + homepage = "http://github.com/khuck/xpress-apex" + #url = "http://github.com/khuck/xpress-apex/archive/v0.1-release-candidate.tar.gz" + url = "http://github.com/khuck/xpress-apex" + + #version('0.1', '6e039c224387348296739f6bf360d081') + version('master', branch='master', git='https://github.com/khuck/xpress-apex.git') + + depends_on("binutils+libiberty") + depends_on("boost@1.54:") + depends_on("cmake@2.8.12:") + depends_on("activeharmony@4.5:") + + def install(self, spec, prefix): + + path=get_path("PATH") + path.remove(spec["binutils"].prefix.bin) + path_set("PATH", path) + with working_dir("build", create=True): + cmake('-DBOOST_ROOT=%s' % spec['boost'].prefix, + '-DUSE_BFD=TRUE', + '-DBFD_ROOT=%s' % spec['binutils'].prefix, + '-DUSE_ACTIVEHARMONY=TRUE', + '-DACTIVEHARMONY_ROOT=%s' % spec['activeharmony'].prefix, + '..', *std_cmake_args) + make() + make("install") From 2a61ff07948701ce681c02377e3e5bae58e25b74 Mon Sep 17 00:00:00 2001 From: Kevin Huck Date: Thu, 22 Oct 2015 03:57:33 -0700 Subject: [PATCH 3/6] Changing git checkout from "master" to commit d2e66ddde689120472fc57fc546d8cd80aab745c --- var/spack/packages/apex/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/var/spack/packages/apex/package.py b/var/spack/packages/apex/package.py index 086694044ef..7cd4cad1686 100644 --- a/var/spack/packages/apex/package.py +++ b/var/spack/packages/apex/package.py @@ -7,7 +7,8 @@ class Apex(Package): url = "http://github.com/khuck/xpress-apex" #version('0.1', '6e039c224387348296739f6bf360d081') - version('master', branch='master', git='https://github.com/khuck/xpress-apex.git') + #version('master', branch='master', git='https://github.com/khuck/xpress-apex.git') + version('10-21-2015', git='https://github.com/khuck/xpress-apex.git', commit='d2e66ddde689120472fc57fc546d8cd80aab745c') depends_on("binutils+libiberty") depends_on("boost@1.54:") From 24838a62b44110fa386e404e0e41689a5182e911 Mon Sep 17 00:00:00 2001 From: Kevin Huck Date: Thu, 22 Oct 2015 06:02:56 -0700 Subject: [PATCH 4/6] Changed date formatting. --- var/spack/packages/apex/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/packages/apex/package.py b/var/spack/packages/apex/package.py index 7cd4cad1686..08fecade69c 100644 --- a/var/spack/packages/apex/package.py +++ b/var/spack/packages/apex/package.py @@ -8,7 +8,7 @@ class Apex(Package): #version('0.1', '6e039c224387348296739f6bf360d081') #version('master', branch='master', git='https://github.com/khuck/xpress-apex.git') - version('10-21-2015', git='https://github.com/khuck/xpress-apex.git', commit='d2e66ddde689120472fc57fc546d8cd80aab745c') + version('2015-10-21', git='https://github.com/khuck/xpress-apex.git', commit='d2e66ddde689120472fc57fc546d8cd80aab745c') depends_on("binutils+libiberty") depends_on("boost@1.54:") From caf93cc4080703b80d5c622370b8094c37bf014f Mon Sep 17 00:00:00 2001 From: Kevin Huck Date: Thu, 22 Oct 2015 08:03:50 -0700 Subject: [PATCH 5/6] Adding package for OMPT support in the LLVM/Clang OpenMP runtime, which gives OMPT support for applications built with GCC, Intel or LLVM/Clang. --- var/spack/packages/ompt-openmp/package.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 var/spack/packages/ompt-openmp/package.py diff --git a/var/spack/packages/ompt-openmp/package.py b/var/spack/packages/ompt-openmp/package.py new file mode 100644 index 00000000000..5d380ebd775 --- /dev/null +++ b/var/spack/packages/ompt-openmp/package.py @@ -0,0 +1,23 @@ +from spack import * + +class OmptOpenmp(Package): + """LLVM/Clang OpenMP runtime with OMPT support. This is a fork of the OpenMPToolsInterface/LLVM-openmp fork of the official LLVM OpenMP mirror. This library provides a drop-in replacement of the OpenMP runtimes for GCC, Intel and LLVM/Clang.""" + homepage = "https://github.com/OpenMPToolsInterface/LLVM-openmp" + url = "http://github.com/khuck/LLVM-openmp/archive/v0.1-spack.tar.gz" + + version('spack', '35227b2726e377faa433fc841226e036') + + # depends_on("foo") + + def install(self, spec, prefix): + with working_dir("runtime/build", create=True): + + # FIXME: Modify the configure line to suit your build system here. + cmake('-DCMAKE_C_COMPILER=%s' % self.compiler.cc, + '-DCMAKE_CXX_COMPILER=%s' % self.compiler.cxx, + '-DCMAKE_INSTALL_PREFIX=%s' % prefix, + '..', *std_cmake_args) + + # FIXME: Add logic to build and install here + make() + make("install") From 7cb557cba77e637ac528205865688af9fe350494 Mon Sep 17 00:00:00 2001 From: Kevin Huck Date: Thu, 22 Oct 2015 08:06:31 -0700 Subject: [PATCH 6/6] Adding dependency on ompt-openmp, now that it is a package. --- var/spack/packages/apex/package.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/var/spack/packages/apex/package.py b/var/spack/packages/apex/package.py index 08fecade69c..6404d5208aa 100644 --- a/var/spack/packages/apex/package.py +++ b/var/spack/packages/apex/package.py @@ -14,6 +14,7 @@ class Apex(Package): depends_on("boost@1.54:") depends_on("cmake@2.8.12:") depends_on("activeharmony@4.5:") + depends_on("ompt-openmp") def install(self, spec, prefix): @@ -26,6 +27,8 @@ def install(self, spec, prefix): '-DBFD_ROOT=%s' % spec['binutils'].prefix, '-DUSE_ACTIVEHARMONY=TRUE', '-DACTIVEHARMONY_ROOT=%s' % spec['activeharmony'].prefix, + '-DUSE_OMPT=TRUE', + '-DOMPT_ROOT=%s' % spec['ompt-openmp'].prefix, '..', *std_cmake_args) make() make("install")