From 00fdbe81bcf322f93e90537bbe0b6bcf31863bf1 Mon Sep 17 00:00:00 2001
From: Brian Van Essen <vanessen1@llnl.gov>
Date: Mon, 24 Apr 2017 11:32:27 -0700
Subject: [PATCH] Caffe (#3948)
* Added a package for the MDAnalysis toolkit.
* Added the hash for the 1.0 release of caffe and put in a conflict
statemet indicating that protobuf requires a c++11 compiler.
* Changed minimum version number.
* Tweaked the minimum version number.
* Fixed flake8 error.
---
var/spack/repos/builtin/packages/caffe/package.py | 6 +++++-
var/spack/repos/builtin/packages/protobuf/package.py | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/var/spack/repos/builtin/packages/caffe/package.py b/var/spack/repos/builtin/packages/caffe/package.py
index 24bbe1ec6a..5d83b8e1a7 100644
--- a/var/spack/repos/builtin/packages/caffe/package.py
+++ b/var/spack/repos/builtin/packages/caffe/package.py
@@ -31,9 +31,13 @@ class Caffe(CMakePackage):
Center (BVLC) and by community contributors."""
homepage = "http://caffe.berkeleyvision.org"
- url = "https://github.com/BVLC/caffe/archive/rc5.tar.gz"
+ url = "https://github.com/BVLC/caffe/archive/1.0.tar.gz"
+ version('1.0', '5fbb0e32e7cd8de3de46e6fe6e4cd2b5')
version('rc5', '692bd3580b7576485cde6b1e03eb5a6d')
+ version('rc4', 'd86eeb38b1400097d32ffcabdec75b55')
+ version('rc3', '84e39223115753b48312a8bf48c31f59')
+ version('rc2', 'c331932e34b5e2f5022fcc34c419080f')
variant('gpu', default=False,
description='Builds with support for GPUs via CUDA and cuDNN')
diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py
index 14eaf3739e..0a073b837a 100644
--- a/var/spack/repos/builtin/packages/protobuf/package.py
+++ b/var/spack/repos/builtin/packages/protobuf/package.py
@@ -41,6 +41,8 @@ class Protobuf(AutotoolsPackage):
depends_on('libtool', type='build')
depends_on('m4', type='build')
+ conflicts('%gcc@:4.6') # Requires c++11
+
variant('shared', default=True, description='Build shared libraries.')
def configure_args(self):
--
GitLab