[caffe-contrib] 02/02: control: update control, bump to python3
Zhou Mo
cdluminate-guest at moszumanska.debian.org
Mon Jul 4 13:20:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
cdluminate-guest pushed a commit to branch master
in repository caffe-contrib.
commit b8d044c0e825dba448dd409b2df3d6e8d4218942
Author: Zhou Mo <cdluminate at gmail.com>
Date: Mon Jul 4 13:19:41 2016 +0000
control: update control, bump to python3
---
debian/control | 144 +++++++++++++++++++++++++++------------------------------
1 file changed, 68 insertions(+), 76 deletions(-)
diff --git a/debian/control b/debian/control
index 176ee0b..8e9d976 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: caffe
+Source: caffe-contrib
Section: contrib/science
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
@@ -8,10 +8,7 @@ Build-Depends: bc,
bash-completion,
debhelper (>=9),
dh-python,
-# require GCC-5, being prepared for the GCC-6 transition
- gcc-5,
- g++-5,
-# libboost-all-dev (>= 1.55) - we pull boost stack partially.
+# libboost-all-dev (>= 1.55) - we merely pull partial boost stack, the really needed part.
libboost-filesystem-dev,
libboost-system-dev,
libboost-thread-dev,
@@ -21,77 +18,88 @@ Build-Depends: bc,
libhdf5-dev,
libleveldb-dev,
liblmdb-dev,
- libopenblas-dev,
+# switch libblas.so.3 between Atlas and OpenBLAS with update-alternatives
+ libblas-dev | libblas.so,
libopencv-dev (>= 2.4),
libprotobuf-dev,
libprotoc-dev,
libsnappy-dev,
-# CUDA >= 7.5 is required for compiling with GCC-5
- nvidia-cuda-toolkit (>= 7.5.18) [amd64 ppc64el],
protobuf-compiler,
- python-all-dev,
- python-numpy,
-# python3 is only for automatic template generation
+# python3 depssome of them are not B-D but we need them as runtime-deps to pass the testsuite
+ python3-dev,
+ python3-numpy,
+ cython3,
+ ipython3,
python3,
+ python3-skimage,
+# python3-protobuf, # not available yet, FIXME before upload
+ python3-dateutil,
+ python3-gflags,
+ python3-h5py,
+ python3-leveldb,
+ python3-matplotlib,
+ python3-networkx,
+ python3-nose,
+# python3-opencv, # this is recommended if available but it doesn't block
+ python3-pandas,
+ python3-pil,
+ python3-scipy,
+ python3-six,
+ python3-yaml,
+# The above part is synced with main/caffe
+# The following part is CUDA related B-D
+ nvidia-cuda-toolkit (>= 7.5.18) [amd64 ppc64el],
+ gcc-5,
+ g++-5,
Standards-Version: 3.9.8
Homepage: http://caffe.berkeleyvision.org
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/caffe.git
-Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/caffe.git
-X-Python-Version: >= 2.7
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/caffe-contrib.git
+Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/caffe-contrib.git
+X-Python-Version: >= 3.3
-Package: caffe-cpu
-Architecture: any
-Depends: libcaffe-cpu1 (= ${binary:Version}),
+Package: caffe-cuda
+Section: metapackages
+Architecture: amd64 ppc64el
+Depends: caffe-tools-cuda (= ${binary:Version}),
+ python3-caffe-cuda (= ${binary:Version}),
+ libcaffe-cuda1 (= ${binary:Version}),
${misc:Depends},
- ${shlibs:Depends}
-Conflicts: caffe-cuda
-Description: Fast, open framework for Deep Learning (CPU_ONLY)
+Suggests: libcaffe-cpu-dev (= ${binary:Version}),
+ caffe-doc,
+Conflicts: caffe-cpu
+Description: Fast, open framework for Deep Learning (Meta)
Caffe is a deep learning framework made with expression, speed,
and modularity in mind. It is developed by the Berkeley Vision
and Learning Center (BVLC) and community contributors.
.
- This package contains caffe executables, configured as CPU_ONLY.
-
-Package: libcaffe-cpu1
-Section: contrib/libs
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libcaffe-cuda1
-Description: library of Caffe, a deep learning framework (CPU_ONLY)
- Caffe is a deep learning framework made with expression, speed,
- and modularity in mind. It is developed by the Berkeley Vision
- and Learning Center (BVLC) and community contributors.
+ This metapackage pulls CUDA version of caffe:
+ * caffe-tools-cuda
+ * libcaffe-cuda*
+ * python3-caffe-cuda
+ And suggests these packages:
+ * libcaffe-cuda-dev
+ * caffe-doc
.
- This package contains caffe shared library, configured as CPU_ONLY.
+ Note, this CUDA version cannot co-exist with the CPU_ONLY version.
-Package: libcaffe-cpu-dev
-Section: contrib/libdevel
-Architecture: any
-Conflicts: libcaffe-cuda-dev
-Depends: libcaffe-cpu1 (= ${binary:Version}), ${misc:Depends}
-Description: development files for Caffe (CPU_ONLY)
- Caffe is a deep learning framework made with expression, speed,
- and modularity in mind. It is developed by the Berkeley Vision
- and Learning Center (BVLC) and community contributors.
- .
- This package contains development files of caffe.
-
-Package: caffe-cuda
+Package: caffe-tools-cuda
Architecture: amd64 ppc64el
+Multi-Arch: foreign
Depends: libcaffe-cuda1 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Conflicts: caffe-cpu
-Description: Fast, open framework for Deep Learning (CUDA)
+Conflicts: caffe-tools-cpu
+Description: Tools for fast, open framework for Deep Learning (CUDA)
Caffe is a deep learning framework made with expression, speed,
and modularity in mind. It is developed by the Berkeley Vision
and Learning Center (BVLC) and community contributors.
.
- This package contains caffe executables, configured with CUDA.
+ It contains caffe executables, configured with CUDA.
Package: libcaffe-cuda1
Section: contrib/libs
Architecture: amd64 ppc64el
+Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
Conflicts: libcaffe-cpu1
Description: library of Caffe, a deep leanring framework (CUDA)
@@ -99,52 +107,36 @@ Description: library of Caffe, a deep leanring framework (CUDA)
and modularity in mind. It is developed by the Berkeley Vision
and Learning Center (BVLC) and community contributors.
.
- This package contains caffe shared library, configured with CUDA.
+ It contains caffe shared library, configured with CUDA.
Package: libcaffe-cuda-dev
Section: contrib/libdevel
Architecture: amd64 ppc64el
+Multi-Arch: foreign
Depends: libcaffe-cuda1 (= ${binary:Version}), ${misc:Depends}
Conflicts: libcaffe-cpu-dev
+Suggests: caffe-doc
Description: development files for Caffe (CUDA)
Caffe is a deep learning framework made with expression, speed,
and modularity in mind. It is developed by the Berkeley Vision
and Learning Center (BVLC) and community contributors.
.
- This package contains the development files of caffe.
-
-Package: python-caffe-cpu
-Section: contrib/python
-Architecture: any
-Depends: libcaffe-cpu1 (= ${binary:Version}),
- python-skimage,
- python-protobuf,
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
-Conflicts: python-caffe-cuda
-Description: Python2 interface of Caffe (CPU_ONLY)
- Caffe is a deep learning framework made with expression, speed,
- and modularity in mind. It is developed by the Berkeley Vision
- and Learning Center (BVLC) and community contributors.
- .
- This package contains the python2 interface of caffe, and is configured
- as CPU_ONLY.
+ It contains the development files of caffe.
-Package: python-caffe-cuda
+Package: python3-caffe-cuda
Section: contrib/python
Architecture: amd64 ppc64el
+Multi-Arch: foreign
Depends: libcaffe-cuda1 (= ${binary:Version}),
- python-skimage,
- python-protobuf,
${misc:Depends},
- ${python:Depends},
${shlibs:Depends}
-Conflicts: python-caffe-cpu
-Description: Python2 interface of Caffe (CUDA)
+ ${python3:Depends},
+Conflicts: python3-caffe-cpu
+Description: Python3 interface of Caffe (CUDA)
Caffe is a deep learning framework made with expression, speed,
and modularity in mind. It is developed by the Berkeley Vision
and Learning Center (BVLC) and community contributors.
.
- This package contains the python2 interface of caffe, and is configured
- with CUDA.
+ It contains the CUDA version of python3 Caffe interface.
+
+# caffe-doc is built by main/caffe, the CPU version.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe-contrib.git
More information about the debian-science-commits
mailing list