[caffe-contrib] 196/362: d/*: switch to python2
Zhou Mo
cdluminate-guest at moszumanska.debian.org
Tue May 3 09:24:31 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 3465f0c981bdb61bda03e452cb1c66ccdb3f8022
Author: Zhou Mo <cdluminate at gmail.com>
Date: Thu Sep 3 03:27:14 2015 +0000
d/*: switch to python2
---
debian/control | 28 ++++++++--------
...-caffe-cpu.install => python-caffe-cpu.install} | 38 +++++++++++-----------
debian/python-caffe-cpu.links | 1 +
...affe-cuda.install => python-caffe-cuda.install} | 38 +++++++++++-----------
debian/python-caffe-cuda.links | 1 +
debian/python3-caffe-cpu.links | 1 -
debian/python3-caffe-cuda.links | 1 -
debian/rules | 12 +++----
8 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/debian/control b/debian/control
index 1402ff4..ef0a37e 100644
--- a/debian/control
+++ b/debian/control
@@ -16,9 +16,9 @@ Build-Depends: cmake, debhelper (>=9),
libgoogle-glog-dev,
liblmdb-dev,
protobuf-compiler,
- python3-all,
- python3-all-dev,
- python3-numpy,
+ python-all-dev,
+ python-all,
+ python-numpy,
dh-python,
bc,
# constrain CUDA from experimental (31 Aug, 2015).
@@ -27,7 +27,7 @@ Build-Depends: cmake, debhelper (>=9),
Standards-Version: 3.9.6
Homepage: http://caffe.berkeleyvision.org
Vcs-Git: https://github.com/BVLC/caffe.git
-X-Python-Version: >= 3.3
+X-Python-Version: >= 2.6
Package: caffe-cpu
Architecture: any
@@ -116,26 +116,26 @@ Description: Fast open framework for Deep Learning (Library Dev, CUDA)
.
This package contains the development files of CUDA caffe.
-Package: python3-caffe-cpu
+Package: python-caffe-cpu
Section: contrib/python
Architecture: any
-Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, libcaffe-cpu0
-Conflicts: python3-caffe-cuda
-Description: Fast open framework for Deep Learning (Python3 Interface, CPU_ONLY)
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, libcaffe-cpu0
+Conflicts: python-caffe-cuda
+Description: Fast open framework for Deep Learning (Python Interface, 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 python3 interface of CPU caffe.
+ This package contains the python2 interface of CPU caffe.
-Package: python3-caffe-cuda
+Package: python-caffe-cuda
Section: contrib/python
Architecture: i386 amd64
-Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, libcaffe-cuda0
-Conflicts: python3-caffe-cpu
-Description: Fast open framework for Deep Learning (Python3 Interface, CUDA)
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, libcaffe-cuda0
+Conflicts: python-caffe-cpu
+Description: Fast open framework for Deep Learning (Python Interface, 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 python3 interface of CUDA caffe.
+ This package contains the python2 interface of CUDA caffe.
diff --git a/debian/python3-caffe-cpu.install b/debian/python-caffe-cpu.install
similarity index 59%
rename from debian/python3-caffe-cpu.install
rename to debian/python-caffe-cpu.install
index 240d425..9910106 100644
--- a/debian/python3-caffe-cpu.install
+++ b/debian/python-caffe-cpu.install
@@ -1,19 +1,19 @@
-debian/tmp/caffe_cpu/python/requirements.txt usr/lib/python3/dist-packages/
-debian/tmp/caffe_cpu/python/classify.py usr/lib/python3/dist-packages/
-debian/tmp/caffe_cpu/python/caffe/pycaffe.py usr/lib/python3/dist-packages/caffe/
-debian/tmp/caffe_cpu/python/caffe/net_spec.py usr/lib/python3/dist-packages/caffe/
-debian/tmp/caffe_cpu/python/caffe/io.py usr/lib/python3/dist-packages/caffe/
-debian/tmp/caffe_cpu/python/caffe/imagenet/ilsvrc_2012_mean.npy usr/lib/python3/dist-packages/caffe/imagenet/
-debian/tmp/caffe_cpu/python/caffe/__init__.py usr/lib/python3/dist-packages/caffe/
-debian/tmp/caffe_cpu/python/caffe/classifier.py usr/lib/python3/dist-packages/caffe/
-debian/tmp/caffe_cpu/python/caffe/_caffe.so.0 usr/lib/python3/dist-packages/caffe/
-debian/tmp/caffe_cpu/python/caffe/test/test_net.py usr/lib/python3/dist-packages/caffe/test/
-debian/tmp/caffe_cpu/python/caffe/test/test_python_layer.py usr/lib/python3/dist-packages/caffe/test/
-debian/tmp/caffe_cpu/python/caffe/test/test_net_spec.py usr/lib/python3/dist-packages/caffe/test/
-debian/tmp/caffe_cpu/python/caffe/test/test_solver.py usr/lib/python3/dist-packages/caffe/test/
-debian/tmp/caffe_cpu/python/caffe/detector.py usr/lib/python3/dist-packages/caffe/
-debian/tmp/caffe_cpu/python/caffe/proto/caffe_pb2.py usr/lib/python3/dist-packages/caffe/proto/
-debian/tmp/caffe_cpu/python/caffe/proto/__init__.py usr/lib/python3/dist-packages/caffe/proto/
-debian/tmp/caffe_cpu/python/caffe/draw.py usr/lib/python3/dist-packages/caffe/
-debian/tmp/caffe_cpu/python/draw_net.py usr/lib/python3/dist-packages/
-debian/tmp/caffe_cpu/python/detect.py usr/lib/python3/dist-packages/
+debian/tmp/caffe_cpu/python/requirements.txt usr/lib/python2.7/dist-packages/
+debian/tmp/caffe_cpu/python/classify.py usr/lib/python2.7/dist-packages/
+debian/tmp/caffe_cpu/python/caffe/pycaffe.py usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/caffe_cpu/python/caffe/net_spec.py usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/caffe_cpu/python/caffe/io.py usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/caffe_cpu/python/caffe/imagenet/ilsvrc_2012_mean.npy usr/lib/python2.7/dist-packages/caffe/imagenet/
+debian/tmp/caffe_cpu/python/caffe/__init__.py usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/caffe_cpu/python/caffe/classifier.py usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/caffe_cpu/python/caffe/_caffe.so.0 usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/caffe_cpu/python/caffe/test/test_net.py usr/lib/python2.7/dist-packages/caffe/test/
+debian/tmp/caffe_cpu/python/caffe/test/test_python_layer.py usr/lib/python2.7/dist-packages/caffe/test/
+debian/tmp/caffe_cpu/python/caffe/test/test_net_spec.py usr/lib/python2.7/dist-packages/caffe/test/
+debian/tmp/caffe_cpu/python/caffe/test/test_solver.py usr/lib/python2.7/dist-packages/caffe/test/
+debian/tmp/caffe_cpu/python/caffe/detector.py usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/caffe_cpu/python/caffe/proto/caffe_pb2.py usr/lib/python2.7/dist-packages/caffe/proto/
+debian/tmp/caffe_cpu/python/caffe/proto/__init__.py usr/lib/python2.7/dist-packages/caffe/proto/
+debian/tmp/caffe_cpu/python/caffe/draw.py usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/caffe_cpu/python/draw_net.py usr/lib/python2.7/dist-packages/
+debian/tmp/caffe_cpu/python/detect.py usr/lib/python2.7/dist-packages/
diff --git a/debian/python-caffe-cpu.links b/debian/python-caffe-cpu.links
new file mode 100644
index 0000000..44df179
--- /dev/null
+++ b/debian/python-caffe-cpu.links
@@ -0,0 +1 @@
+usr/lib/python2.7/dist-packages/caffe/_caffe.so.0 usr/lib/python2.7/dist-packages/caffe/_caffe.so
diff --git a/debian/python3-caffe-cuda.install b/debian/python-caffe-cuda.install
similarity index 61%
rename from debian/python3-caffe-cuda.install
rename to debian/python-caffe-cuda.install
index 21dda65..0cbd147 100644
--- a/debian/python3-caffe-cuda.install
+++ b/debian/python-caffe-cuda.install
@@ -1,19 +1,19 @@
-debian/tmp/caffe_cuda/python/requirements.txt usr/lib/python3/dist-packages/
-debian/tmp/caffe_cuda/python/classify.py usr/lib/python3/dist-packages/
-debian/tmp/caffe_cuda/python/caffe/pycaffe.py usr/lib/python3/dist-packages/caffe/
-debian/tmp/caffe_cuda/python/caffe/net_spec.py usr/lib/python3/dist-packages/caffe/
-debian/tmp/caffe_cuda/python/caffe/io.py usr/lib/python3/dist-packages/caffe/
-debian/tmp/caffe_cuda/python/caffe/imagenet/ilsvrc_2012_mean.npy usr/lib/python3/dist-packages/caffe/imagenet/
-debian/tmp/caffe_cuda/python/caffe/__init__.py usr/lib/python3/dist-packages/caffe/
-debian/tmp/caffe_cuda/python/caffe/classifier.py usr/lib/python3/dist-packages/caffe/
-debian/tmp/caffe_cuda/python/caffe/_caffe.so.0 usr/lib/python3/dist-packages/caffe/
-debian/tmp/caffe_cuda/python/caffe/test/test_net.py usr/lib/python3/dist-packages/caffe/test/
-debian/tmp/caffe_cuda/python/caffe/test/test_python_layer.py usr/lib/python3/dist-packages/caffe/test/
-debian/tmp/caffe_cuda/python/caffe/test/test_net_spec.py usr/lib/python3/dist-packages/caffe/test/
-debian/tmp/caffe_cuda/python/caffe/test/test_solver.py usr/lib/python3/dist-packages/caffe/test/
-debian/tmp/caffe_cuda/python/caffe/detector.py usr/lib/python3/dist-packages/caffe/
-debian/tmp/caffe_cuda/python/caffe/proto/caffe_pb2.py usr/lib/python3/dist-packages/caffe/proto/
-debian/tmp/caffe_cuda/python/caffe/proto/__init__.py usr/lib/python3/dist-packages/caffe/proto/
-debian/tmp/caffe_cuda/python/caffe/draw.py usr/lib/python3/dist-packages/caffe/
-debian/tmp/caffe_cuda/python/draw_net.py usr/lib/python3/dist-packages/
-debian/tmp/caffe_cuda/python/detect.py usr/lib/python3/dist-packages/
+debian/tmp/caffe_cuda/python/requirements.txt usr/lib/python2.7/dist-packages/
+debian/tmp/caffe_cuda/python/classify.py usr/lib/python2.7/dist-packages/
+debian/tmp/caffe_cuda/python/caffe/pycaffe.py usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/caffe_cuda/python/caffe/net_spec.py usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/caffe_cuda/python/caffe/io.py usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/caffe_cuda/python/caffe/imagenet/ilsvrc_2012_mean.npy usr/lib/python2.7/dist-packages/caffe/imagenet/
+debian/tmp/caffe_cuda/python/caffe/__init__.py usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/caffe_cuda/python/caffe/classifier.py usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/caffe_cuda/python/caffe/_caffe.so.0 usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/caffe_cuda/python/caffe/test/test_net.py usr/lib/python2.7/dist-packages/caffe/test/
+debian/tmp/caffe_cuda/python/caffe/test/test_python_layer.py usr/lib/python2.7/dist-packages/caffe/test/
+debian/tmp/caffe_cuda/python/caffe/test/test_net_spec.py usr/lib/python2.7/dist-packages/caffe/test/
+debian/tmp/caffe_cuda/python/caffe/test/test_solver.py usr/lib/python2.7/dist-packages/caffe/test/
+debian/tmp/caffe_cuda/python/caffe/detector.py usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/caffe_cuda/python/caffe/proto/caffe_pb2.py usr/lib/python2.7/dist-packages/caffe/proto/
+debian/tmp/caffe_cuda/python/caffe/proto/__init__.py usr/lib/python2.7/dist-packages/caffe/proto/
+debian/tmp/caffe_cuda/python/caffe/draw.py usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/caffe_cuda/python/draw_net.py usr/lib/python2.7/dist-packages/
+debian/tmp/caffe_cuda/python/detect.py usr/lib/python2.7/dist-packages/
diff --git a/debian/python-caffe-cuda.links b/debian/python-caffe-cuda.links
new file mode 100644
index 0000000..44df179
--- /dev/null
+++ b/debian/python-caffe-cuda.links
@@ -0,0 +1 @@
+usr/lib/python2.7/dist-packages/caffe/_caffe.so.0 usr/lib/python2.7/dist-packages/caffe/_caffe.so
diff --git a/debian/python3-caffe-cpu.links b/debian/python3-caffe-cpu.links
deleted file mode 100644
index 5b070d8..0000000
--- a/debian/python3-caffe-cpu.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python3/dist-packages/caffe/_caffe.so.0 usr/lib/python3/dist-packages/caffe/_caffe.so
diff --git a/debian/python3-caffe-cuda.links b/debian/python3-caffe-cuda.links
deleted file mode 100644
index 5b070d8..0000000
--- a/debian/python3-caffe-cuda.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python3/dist-packages/caffe/_caffe.so.0 usr/lib/python3/dist-packages/caffe/_caffe.so
diff --git a/debian/rules b/debian/rules
index 893cfd8..5c247a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ CONFFLAG_CPU = \
-DUSE_CUDNN=OFF \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_python=ON \
- -Dpython_version="3" \
+ -Dpython_version="2" \
-DBUILD_matlab=OFF \
-DBUILD_docs=OFF \
-DBUILD_python_layer=ON \
@@ -39,7 +39,7 @@ CONFFLAG_CUDA = \
-DUSE_CUDNN=OFF \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_python=ON \
- -Dpython_version="3" \
+ -Dpython_version="2" \
-DBUILD_matlab=OFF \
-DBUILD_docs=OFF \
-DBUILD_python_layer=ON \
@@ -54,7 +54,7 @@ CONFFLAG_CUDA = \
dh $@ \
--parallel \
--buildsystem=cmake \
- --with python3
+ --with python2
override_dh_auto_configure:
dh_auto_configure \
@@ -94,7 +94,7 @@ ifeq (y, $(flag_build_caffe_cuda))
endif
override_dh_pysupport:
- dh_python3
+ dh_python2
override_dh_auto_install:
dh_auto_install --builddirectory=${CAFFE_CPU_BUILDDIR} \
@@ -118,7 +118,7 @@ CONFFLAG_CPU_CUSTOM = \
-DUSE_CUDNN=OFF \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_python=ON \
- -Dpython_version="3" \
+ -Dpython_version="2" \
-DBUILD_matlab=OFF \
-DBUILD_docs=OFF \
-DBUILD_python_layer=ON \
@@ -132,7 +132,7 @@ CONFFLAG_CUDA_CUSTOM = \
-DUSE_CUDNN=OFF \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_python=ON \
- -Dpython_version="3" \
+ -Dpython_version="2" \
-DBUILD_matlab=OFF \
-DBUILD_docs=OFF \
-DBUILD_python_layer=ON \
--
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