GitLab maintenance scheduled form Friday, 2021-06-18 5:00pm to Satursday, 2021-06-19 10:00pm CT - Services will be unavailable during this time.

Commit 97415790 authored by Matthieu Dorier's avatar Matthieu Dorier

Merge branch 'master' of xgitlab.cels.anl.gov:sds/sds-repo

parents 6d6f4b76 03cb950b
from spack import *
class LibpmemobjCpp(CMakePackage):
"""C++ bindings for libpmemobj (https://github.com/pmem/pmdk)"""
homepage = "https://github.com/pmem/libpmemobj-cpp"
url = "https://github.com/pmem/libpmemobj-cpp.git"
version('master', git='https://github.com/pmem/libpmemobj-cpp.git')
depends_on('pmem@1.4')
def cmake_args(self):
# Add arguments other than
# CMAKE_INSTALL_PREFIX and CMAKE_BUILD_TYPE
args = []
return args
...@@ -37,6 +37,4 @@ class Margo(AutotoolsPackage): ...@@ -37,6 +37,4 @@ class Margo(AutotoolsPackage):
depends_on('autoconf@2.65:', type=("build")) depends_on('autoconf@2.65:', type=("build"))
depends_on('automake', type=("build")) depends_on('automake', type=("build"))
depends_on('libtool', type=("build")) depends_on('libtool', type=("build"))
# 'timeout' is part of coreutils
depends_on('coreutils')
depends_on('pkg-config', type=("build")) depends_on('pkg-config', type=("build"))
...@@ -44,6 +44,7 @@ class Mercury(CMakePackage): ...@@ -44,6 +44,7 @@ class Mercury(CMakePackage):
depends_on('cci@master', when="+cci", type=("build", "link", "run")) depends_on('cci@master', when="+cci", type=("build", "link", "run"))
depends_on('libfabric', when="+fabric", type=("build", "link", "run")) depends_on('libfabric', when="+fabric", type=("build", "link", "run"))
depends_on('bmi', when="+bmi", type=("build", "link", "run")) depends_on('bmi', when="+bmi", type=("build", "link", "run"))
depends_on('openpa', type=("build", "link", "run"))
def cmake_args(self): def cmake_args(self):
# as of mercury commit 662423eb360b, the boost preprocessor macros are # as of mercury commit 662423eb360b, the boost preprocessor macros are
......
...@@ -29,5 +29,5 @@ class Openpa(AutotoolsPackage): ...@@ -29,5 +29,5 @@ class Openpa(AutotoolsPackage):
(and related constructs) for high performance, concurrent software""" (and related constructs) for high performance, concurrent software"""
homepage = "https://trac.mpich.org/projects/openpa" homepage = "https://trac.mpich.org/projects/openpa"
url = "https://trac.mpich.org/projects/openpa/raw-attachment/wiki/Downloads/openpa-1.0.4.tar.gz" url = "https://github.com/pmodels/openpa/releases/download/v1.0.4/openpa-1.0.4.tar.gz"
version('1.0.4', '3ad998bb26ac84ee7de262db94dd7656') version('1.0.4', '3ad998bb26ac84ee7de262db94dd7656')
...@@ -33,12 +33,12 @@ class Pmem(Package): ...@@ -33,12 +33,12 @@ class Pmem(Package):
url = "https://github.com/pmem/nvml/archive/1.4.tar.gz" url = "https://github.com/pmem/nvml/archive/1.4.tar.gz"
# in the nvml -> pmdk name change, these hashes needed to be updated # in the nvml -> pmdk name change, these hashes needed to be updated
version('1.4.2', sha256='df7e658e75d28cd80f6d2ff7b9fc9ae2885d52f8923fdbacecfd46215115fb4c')
version('1.4', '8813455d9518b8d7e0c296a706314940') version('1.4', '8813455d9518b8d7e0c296a706314940')
version('1.3', '32c41d0d7f1c855b7d2b9622631a6bc3') version('1.3', '32c41d0d7f1c855b7d2b9622631a6bc3')
# experimental rpmem # experimental rpmem
depends_on('libfabric@1.4.2:') depends_on('libfabric@1.4.2:')
depends_on('coreutils@8.15:')
# documentation requires doxygen and a bunch of other depenedncies that # documentation requires doxygen and a bunch of other depenedncies that
# were not working properly on our contianers # were not working properly on our contianers
...@@ -46,4 +46,4 @@ class Pmem(Package): ...@@ -46,4 +46,4 @@ class Pmem(Package):
patch('0002-remove-secure-getenv.patch', when='@1.4') patch('0002-remove-secure-getenv.patch', when='@1.4')
def install(self, spec, prefix): def install(self, spec, prefix):
make("install", "prefix=%s" % prefix) make("install", "prefix=%s" % prefix, "NDCTL_ENABLE=n")
From f6883b2c19f9e35ee90e923d6e4ac0b00c16d1bf Mon Sep 17 00:00:00 2001
From: Rob Latham <robl@mcs.anl.gov>
Date: Thu, 23 Aug 2018 16:35:54 -0500
Subject: [PATCH] hack make install for spack
---
Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 4671d580..230dc327 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,9 @@ sharedlib:
cd ./bin && make pmemkv
install:
- cp ./bin/libpmemkv.so $(prefix)/lib
+ mkdir -p $(prefix)/lib
+ mkdir -p $(prefix)/include
+ cp spack-build/libpmemkv.so $(prefix)/lib
cp ./src/pmemkv.h $(prefix)/include/libpmemkv.h
uninstall:
--
2.17.1
from spack import *
class Pmemkv(CMakePackage):
"""Key/Value Datastore for Persistent Memory"""
homepage = "https://github.com/pmem/pmemkv"
url = "https://github.com/pmem/pmemkv.git"
version('master', git='https://github.com/pmem/pmemkv.git')
depends_on('libpmemobj-cpp')
patch('0001-hack-make-install-for-spack.patch')
def cmake_args(self):
# Add arguments other than
# CMAKE_INSTALL_PREFIX and CMAKE_BUILD_TYPE
args = []
return args
def install(self, spec, prefix):
make("install", "prefix=%s" % prefix)
...@@ -59,4 +59,3 @@ class Poesie(AutotoolsPackage): ...@@ -59,4 +59,3 @@ class Poesie(AutotoolsPackage):
]) ])
return extra_args return extra_args
...@@ -17,6 +17,7 @@ class Ssg(AutotoolsPackage): ...@@ -17,6 +17,7 @@ class Ssg(AutotoolsPackage):
depends_on('mpi', when='+mpi') depends_on('mpi', when='+mpi')
depends_on('margo') depends_on('margo')
depends_on('autoconf@2.69', type='build')
def configure_args(self): def configure_args(self):
spec = self.spec spec = self.spec
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment